Merge branch 'develop' into feature/7896-refactor-amp-preview-button

.github/workflows/build-test-measure.yml

@@ -150,11 +150,13 @@ jobs:
       - name: Setup PHP and Composer
         uses: ./.github/actions/setup-php-composer
         with:
-          tools: 'composer,phpstan'
+          tools: 'composer'
           php-version: '8.1'
 
       - name: Static Analysis (PHPStan)
-        run: phpstan analyze
+        run: |
+          vendor/bin/phpstan --version
+          vendor/bin/phpstan analyze
 
 #-----------------------------------------------------------------------------------------------------------------------
 

composer.json

@@ -21,13 +21,13 @@
   },
   "require-dev": {
     "automattic/vipwpcs": "^3.0",
-    "civicrm/composer-downloads-plugin": "^4.0",
     "google/cloud-storage": "^1.0",
     "mikey179/vfsstream": "1.6.12",
     "mustache/mustache": "^2",
     "php-stubs/wordpress-stubs": "^6.0",
     "phpcompatibility/phpcompatibility-wp": "2.1.5",
     "phpdocumentor/reflection": "^3.0",
+    "phpstan/phpstan": "^1.0",
     "roave/security-advisories": "dev-latest",
     "sirbrillig/phpcs-variable-analysis": "2.11.19",
     "wp-cli/export-command": "^2.0",
@@ -69,7 +69,6 @@
   },
   "config": {
     "allow-plugins": {
-      "civicrm/composer-downloads-plugin": true,
       "cweagans/composer-patches": true,
       "dealerdirect/phpcodesniffer-composer-installer": true
     },
@@ -80,13 +79,6 @@
   },
   "extra": {
     "composer-exit-on-patch-failure": true,
-    "downloads": {
-      "phpstan": {
-        "path": "vendor/bin/phpstan",
-        "type": "phar",
-        "url": "https://github.com/phpstan/phpstan/releases/latest/download/phpstan.phar"
-      }
-    },
     "patches": {
       "sabberworm/php-css-parser": {
         "1. Validate name-start code points for identifier <https://github.com/westonruter/PHP-CSS-Parser/pull/2>": "https://github.com/sabberworm/PHP-CSS-Parser/compare/cc791ad...westonruter:PHP-CSS-Parser:fix/malformed-identifier-without-tests.diff",

package.json

@@ -130,7 +130,7 @@
     "package:prod": "cross-env NODE_ENV=production npm-run-all build:prod 'package:!(dev|prod)'",
     "package:run": "grunt build",
     "package:zip": "grunt create-build-zip",
-    "prepare": "husky install",
+    "prepare": "husky",
     "start": "wp-scripts start",
     "test": "npm-run-all --parallel test:*",
     "test:e2e": "cross-env JEST_PUPPETEER_CONFIG=./tests/e2e/puppeteer.config.js wp-scripts test-e2e --config=tests/e2e/jest.config.js",