Composer 2 + AMP Plugin 2.1 / AMP PHP Toolbox (#5344)

.github/workflows/continuous-integration-build.yml

@@ -42,7 +42,7 @@ jobs:
         with:
           php-version: '7.4'
           coverage: none
-          tools: composer:v1
+          tools: composer
 
       - name: Get Composer cache directory
         id: composer-cache

.github/workflows/continuous-integration-e2e.yml

@@ -62,7 +62,7 @@ jobs:
         with:
           php-version: '7.4'
           coverage: none
-          tools: composer:v1
+          tools: composer
 
       - name: Get Composer cache directory
         id: composer-cache

.github/workflows/continuous-integration-lint-php.yml

@@ -19,7 +19,7 @@ jobs:
         with:
           php-version: '7.4'
           coverage: none
-          tools: composer:v1, cs2pr
+          tools: composer, cs2pr
 
       - name: Get Composer cache directory
         id: composer-cache

.github/workflows/continuous-integration-unit-php.yml

@@ -67,7 +67,7 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           php-version: 7.4
-          tools: composer:v1
+          tools: composer
 
       - name: Install prefixed dependencies
         run: |
@@ -80,7 +80,7 @@ jobs:
           php-version: ${{ matrix.php }}
           extensions: mysql
           coverage: xdebug
-          tools: composer:v1, cs2pr
+          tools: composer, cs2pr
 
       - name: Install dependencies
         run: |

bin/local-env/install-composer.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-COMPOSER_VERSION='1.10.17'
+COMPOSER_VERSION=$(curl -Ls -w %{url_effective} -o /dev/null https://github.com/composer/composer/releases/latest | rev | cut -d '/' -f 1 | rev)
 
 # Exit if any command fails
 set -e

composer.json

@@ -11,7 +11,8 @@
     "ext-json": "*",
     "ext-libxml": "*",
     "ext-mbstring": "*",
-    "ampproject/amp-wp": "^2.0.10",
+    "ampproject/amp-toolbox": "^0.1",
+    "ampproject/amp-wp": "dev-develop",
     "civicrm/composer-downloads-plugin": "^3.0",
     "cweagans/composer-patches": "^1.6",
     "enshrined/svg-sanitize": "^0.14.0",
@@ -44,19 +45,19 @@
   "extra": {
     "downloads": {
       "composer-normalize": {
-        "url": "https://github.com/ergebnis/composer-normalize/releases/download/2.9.0/composer-normalize.phar",
         "path": "vendor/bin/composer-normalize",
-        "type": "phar"
-      },
-      "phpstan": {
-        "url": "https://github.com/phpstan/phpstan/releases/download/0.12.52/phpstan.phar",
-        "path": "vendor/bin/phpstan",
-        "type": "phar"
+        "type": "phar",
+        "url": "https://github.com/ergebnis/composer-normalize/releases/download/2.13.2/composer-normalize.phar"
       },
       "php-scoper": {
-        "url": "https://github.com/humbug/php-scoper/releases/download/0.13.5/php-scoper.phar",
         "path": "vendor/bin/php-scoper",
-        "type": "phar"
+        "type": "phar",
+        "url": "https://github.com/humbug/php-scoper/releases/download/0.14.0/php-scoper.phar"
+      },
+      "phpstan": {
+        "path": "vendor/bin/phpstan",
+        "type": "phar",
+        "url": "https://github.com/phpstan/phpstan/releases/download/0.12.77/phpstan.phar"
       }
     },
     "enable-patching": true,