Update composer to 2.3.5 (#23908)

Automattic · May 19, 2022 · 5823923 · 5823923
1 parent e5e0ad5
commit 5823923
Show file tree

Hide file tree

Showing 27 changed files with 75 additions and 14 deletions.
diff --git a/.github/actions/tool-setup/action.yml b/.github/actions/tool-setup/action.yml
@@ -21,6 +21,11 @@ runs:
         # Read tool versions
         . .github/versions.sh
 
+        if [[ "${INPUT_PHP:-$PHP_VERSION}" == 5.6 || "${INPUT_PHP:-$PHP_VERSION}" == 7.[01] ]]; then
+          printf "Downgrading composer for PHP %s\n\n" "${INPUT_PHP:-$PHP_VERSION}"
+          COMPOSER_VERSION=2.2.12
+        fi
+
         printf "\n\e[1mSelected tool versions\e[0m\n"
         echo " PHP: ${INPUT_PHP:-$PHP_VERSION}"
         echo "::set-output name=php-version::${INPUT_PHP:-$PHP_VERSION}"

diff --git a/.github/versions.sh b/.github/versions.sh
@@ -1,6 +1,6 @@
 # Versions of tools to use in CI.
 PHP_VERSION=8.0
-COMPOSER_VERSION=2.2.6
+COMPOSER_VERSION=2.3.5
 NODE_VERSION=16.13.2
 PNPM_VERSION=6.32.3
 

diff --git a/composer.lock b/composer.lock
diff --git a/docs/development-environment.md b/docs/development-environment.md
@@ -114,7 +114,7 @@ You'll need all the tools below to work in the Jetpack monorepo.
 
 	Composer is a PHP package manager and it's used to install packages that are required to run development tools and build projects.
 
-	The monorepo requires version 2.2.x.
+	The monorepo requires version 2.3.x.
 
 	 * ##### Installing Composer on macOS
 

diff --git a/projects/plugins/always-use-jetpack-open-graph/changelog/update-composer-2.3 b/projects/plugins/always-use-jetpack-open-graph/changelog/update-composer-2.3
@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Updated composer.lock.
+
+
diff --git a/projects/plugins/always-use-jetpack-open-graph/composer.lock b/projects/plugins/always-use-jetpack-open-graph/composer.lock
diff --git a/projects/plugins/backup/changelog/update-composer-2.3 b/projects/plugins/backup/changelog/update-composer-2.3
@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Updated composer.lock.
+
+
diff --git a/projects/plugins/backup/composer.lock b/projects/plugins/backup/composer.lock
diff --git a/projects/plugins/beta/changelog/update-composer-2.3 b/projects/plugins/beta/changelog/update-composer-2.3
@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Updated composer.lock.
+
+
diff --git a/projects/plugins/beta/composer.lock b/projects/plugins/beta/composer.lock
diff --git a/projects/plugins/boost/changelog/update-composer-2.3 b/projects/plugins/boost/changelog/update-composer-2.3
@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Updated composer.lock.
+
+
diff --git a/projects/plugins/boost/composer.lock b/projects/plugins/boost/composer.lock
diff --git a/projects/plugins/debug-helper/changelog/update-composer-2.3 b/projects/plugins/debug-helper/changelog/update-composer-2.3
@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Updated composer.lock.
+
+
diff --git a/projects/plugins/debug-helper/composer.lock b/projects/plugins/debug-helper/composer.lock
diff --git a/projects/plugins/jetpack/changelog/update-composer-2.3 b/projects/plugins/jetpack/changelog/update-composer-2.3
@@ -0,0 +1,5 @@
+Significance: patch
+Type: other
+Comment: Updated composer.lock.
+
+
diff --git a/projects/plugins/jetpack/composer.lock b/projects/plugins/jetpack/composer.lock
diff --git a/projects/plugins/protect/changelog/update-composer-2.3 b/projects/plugins/protect/changelog/update-composer-2.3
@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Updated composer.lock.
+
+
diff --git a/projects/plugins/protect/composer.lock b/projects/plugins/protect/composer.lock
diff --git a/projects/plugins/search/changelog/update-composer-2.3 b/projects/plugins/search/changelog/update-composer-2.3
@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Updated composer.lock.
+
+
diff --git a/projects/plugins/search/composer.lock b/projects/plugins/search/composer.lock
diff --git a/projects/plugins/social/changelog/update-composer-2.3 b/projects/plugins/social/changelog/update-composer-2.3
@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Updated composer.lock.
+
+
diff --git a/projects/plugins/social/composer.lock b/projects/plugins/social/composer.lock
diff --git a/projects/plugins/starter-plugin/changelog/update-composer-2.3 b/projects/plugins/starter-plugin/changelog/update-composer-2.3
@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Updated composer.lock.
+
+
diff --git a/projects/plugins/starter-plugin/composer.lock b/projects/plugins/starter-plugin/composer.lock
diff --git a/projects/plugins/vaultpress/changelog/update-composer-2.3 b/projects/plugins/vaultpress/changelog/update-composer-2.3
@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Updated composer.lock.
+
+
diff --git a/projects/plugins/vaultpress/composer.lock b/projects/plugins/vaultpress/composer.lock
diff --git a/tools/cli/helpers/checkEnvironment.js b/tools/cli/helpers/checkEnvironment.js
@@ -40,6 +40,7 @@ export async function compareComposerVersion() {
 	const currentComposerVersion = await getComposerVersion();
 	const monorepoComposerVersion = getVersions().COMPOSER_VERSION;
 	if (
+		! process.env.CI &&
 		currentComposerVersion &&
 		! semver.satisfies( currentComposerVersion, '~' + monorepoComposerVersion )
 	) {