From 8e8d112c0b42c75e7fe57d10492502fba1f9910e Mon Sep 17 00:00:00 2001
From: Alain Schlesser <alain.schlesser@gmail.com>
Date: Fri, 8 Dec 2023 10:23:53 +0000
Subject: [PATCH] Fix compatibility with newer Composer versions

---
 composer.json                                 | 140 +++++++++---------
 features/package-install.feature              |   2 +-
 phpcs.xml.dist                                |   2 +
 src/Package_Command.php                       |   8 +-
 .../Min_Composer_1_10/NullIOMethodsTrait.php  |  36 +++++
 .../Min_Composer_2_3/NullIOMethodsTrait.php   |  36 +++++
 .../Package/Compat/NullIOMethodsTrait.php     |  29 ++++
 src/WP_CLI/Package/ComposerIO.php             |  18 +++
 8 files changed, 193 insertions(+), 78 deletions(-)
 create mode 100644 src/WP_CLI/Package/Compat/Min_Composer_1_10/NullIOMethodsTrait.php
 create mode 100644 src/WP_CLI/Package/Compat/Min_Composer_2_3/NullIOMethodsTrait.php
 create mode 100644 src/WP_CLI/Package/Compat/NullIOMethodsTrait.php
 create mode 100644 src/WP_CLI/Package/ComposerIO.php

diff --git a/composer.json b/composer.json
index 3867ea73b..8d88cc832 100644
--- a/composer.json
+++ b/composer.json
@@ -1,73 +1,73 @@
 {
-    "name": "wp-cli/package-command",
-    "type": "wp-cli-package",
-    "description": "Lists, installs, and removes WP-CLI packages.",
-    "homepage": "https://github.com/wp-cli/package-command",
-    "license": "MIT",
-    "authors": [
-        {
-            "name": "Daniel Bachhuber",
-            "email": "daniel@runcommand.io",
-            "homepage": "https://runcommand.io"
-        }
-    ],
-    "require": {
-        "ext-json": "*",
-        "composer/composer": "^1.10.23 || ~2.2.17",
-        "wp-cli/wp-cli": "^2.8"
-    },
-    "require-dev": {
-        "wp-cli/scaffold-command": "^1 || ^2",
-        "wp-cli/wp-cli-tests": "^4"
-    },
-    "config": {
-        "process-timeout": 7200,
-        "sort-packages": true,
-        "allow-plugins": {
-            "dealerdirect/phpcodesniffer-composer-installer": true,
-            "johnpbloch/wordpress-core-installer": true
-        }
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-main": "2.x-dev"
-        },
-        "bundled": true,
-        "commands": [
-            "package",
-            "package browse",
-            "package install",
-            "package list",
-            "package update",
-            "package uninstall"
-        ]
-    },
-    "autoload": {
-        "classmap": [
-            "src/"
-        ],
-        "files": [
-            "package-command.php"
-        ]
-    },
-    "minimum-stability": "dev",
-    "prefer-stable": true,
-    "scripts": {
-        "behat": "run-behat-tests",
-        "behat-rerun": "rerun-behat-tests",
-        "lint": "run-linter-tests",
-        "phpcs": "run-phpcs-tests",
-        "phpcbf": "run-phpcbf-cleanup",
-        "phpunit": "run-php-unit-tests",
-        "prepare-tests": "install-package-tests",
-        "test": [
-            "@lint",
-            "@phpcs",
-            "@phpunit",
-            "@behat"
-        ]
-    },
-    "support": {
-        "issues": "https://github.com/wp-cli/package-command/issues"
+  "name": "wp-cli/package-command",
+  "type": "wp-cli-package",
+  "description": "Lists, installs, and removes WP-CLI packages.",
+  "homepage": "https://github.com/wp-cli/package-command",
+  "license": "MIT",
+  "authors": [
+    {
+      "name": "Daniel Bachhuber",
+      "email": "daniel@runcommand.io",
+      "homepage": "https://runcommand.io"
+    }
+  ],
+  "require": {
+    "ext-json": "*",
+    "composer/composer": "^1.10.23 || ^2.2.17",
+    "wp-cli/wp-cli": "^2.8"
+  },
+  "require-dev": {
+    "wp-cli/scaffold-command": "^1 || ^2",
+    "wp-cli/wp-cli-tests": "^4"
+  },
+  "config": {
+    "process-timeout": 7200,
+    "sort-packages": true,
+    "allow-plugins": {
+      "dealerdirect/phpcodesniffer-composer-installer": true,
+      "johnpbloch/wordpress-core-installer": true
     }
+  },
+  "extra": {
+    "branch-alias": {
+      "dev-main": "2.x-dev"
+    },
+    "bundled": true,
+    "commands": [
+      "package",
+      "package browse",
+      "package install",
+      "package list",
+      "package update",
+      "package uninstall"
+    ]
+  },
+  "autoload": {
+    "classmap": [
+      "src/"
+    ],
+    "files": [
+      "package-command.php"
+    ]
+  },
+  "minimum-stability": "dev",
+  "prefer-stable": true,
+  "scripts": {
+    "behat": "run-behat-tests",
+    "behat-rerun": "rerun-behat-tests",
+    "lint": "run-linter-tests",
+    "phpcs": "run-phpcs-tests",
+    "phpcbf": "run-phpcbf-cleanup",
+    "phpunit": "run-php-unit-tests",
+    "prepare-tests": "install-package-tests",
+    "test": [
+      "@lint",
+      "@phpcs",
+      "@phpunit",
+      "@behat"
+    ]
+  },
+  "support": {
+    "issues": "https://github.com/wp-cli/package-command/issues"
+  }
 }
diff --git a/features/package-install.feature b/features/package-install.feature
index 0e40d16f4..45a94a807 100644
--- a/features/package-install.feature
+++ b/features/package-install.feature
@@ -145,7 +145,7 @@ Feature: Install WP-CLI packages
     When I run `wp package install git@github.com:wp-cli/google-sitemap-generator-cli.git`
     Then STDOUT should contain:
       """
-      Installing package wp-cli/google-sitemap-generator-cli (dev-master)
+      Installing package wp-cli/google-sitemap-generator-cli (dev-main)
       """
     # This path is sometimes changed on Macs to prefix with /private
     And STDOUT should contain:
diff --git a/phpcs.xml.dist b/phpcs.xml.dist
index e4f8965b1..e82b67bcc 100644
--- a/phpcs.xml.dist
+++ b/phpcs.xml.dist
@@ -16,6 +16,8 @@
 	<!-- Ignoring select files/folders.
 		 https://github.com/squizlabs/PHP_CodeSniffer/wiki/Advanced-Usage#ignoring-files-and-folders -->
 	<exclude-pattern>*/src/WP_CLI/JsonManipulator\.php$</exclude-pattern>
+	<exclude-pattern>*/src/WP_CLI/Package/Compat/Min_Composer_1_10/NullIOMethodsTrait\.php$</exclude-pattern>
+	<exclude-pattern>*/src/WP_CLI/Package/Compat/Min_Composer_2_3/NullIOMethodsTrait\.php$</exclude-pattern>
 	<exclude-pattern>*/tests/test-json-manipulator\.php$</exclude-pattern>
 
 	<!-- Show progress. -->
diff --git a/src/Package_Command.php b/src/Package_Command.php
index 9d9522936..e86d1d894 100644
--- a/src/Package_Command.php
+++ b/src/Package_Command.php
@@ -4,24 +4,18 @@
 use Composer\Config;
 use Composer\Config\JsonConfigSource;
 use Composer\DependencyResolver\Pool;
-use Composer\DependencyResolver\Request;
-use Composer\EventDispatcher\Event;
 use Composer\Factory;
 use Composer\IO\NullIO;
 use Composer\Installer;
 use Composer\Json\JsonFile;
-use Composer\Package;
 use Composer\Package\BasePackage;
 use Composer\Package\PackageInterface;
-use Composer\Package\Version\VersionParser;
 use Composer\Package\Version\VersionSelector;
 use Composer\Repository;
 use Composer\Repository\CompositeRepository;
 use Composer\Repository\ComposerRepository;
-use Composer\Repository\RepositoryManager;
-use Composer\Util\Filesystem;
 use Composer\Util\HttpDownloader;
-use WP_CLI\ComposerIO;
+use WP_CLI\Package\ComposerIO;
 use WP_CLI\Extractor;
 use WP_CLI\Utils;
 use WP_CLI\JsonManipulator;
diff --git a/src/WP_CLI/Package/Compat/Min_Composer_1_10/NullIOMethodsTrait.php b/src/WP_CLI/Package/Compat/Min_Composer_1_10/NullIOMethodsTrait.php
new file mode 100644
index 000000000..2b59b4c72
--- /dev/null
+++ b/src/WP_CLI/Package/Compat/Min_Composer_1_10/NullIOMethodsTrait.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace WP_CLI\Package\Compat\Min_Composer_1_10;
+
+use WP_CLI;
+
+trait NullIOMethodsTrait {
+	/**
+	 * {@inheritDoc}
+	 */
+	public function isVerbose() {
+		return true;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function write( $messages, $newline = true, $verbosity = self::NORMAL ) {
+		self::output_clean_message( $messages );
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function writeError( $messages, $newline = true, $verbosity = self::NORMAL ) {
+		self::output_clean_message( $messages );
+	}
+
+	private static function output_clean_message( $messages ) {
+		$messages = (array) preg_replace( '#<(https?)([^>]+)>#', '$1$2', $messages );
+		foreach ( $messages as $message ) {
+			// phpcs:ignore WordPress.WP.AlternativeFunctions.strip_tags_strip_tags
+			WP_CLI::log( strip_tags( trim( $message ) ) );
+		}
+	}
+}
diff --git a/src/WP_CLI/Package/Compat/Min_Composer_2_3/NullIOMethodsTrait.php b/src/WP_CLI/Package/Compat/Min_Composer_2_3/NullIOMethodsTrait.php
new file mode 100644
index 000000000..27d21871f
--- /dev/null
+++ b/src/WP_CLI/Package/Compat/Min_Composer_2_3/NullIOMethodsTrait.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace WP_CLI\Package\Compat\Min_Composer_2_3;
+
+use WP_CLI;
+
+trait NullIOMethodsTrait {
+	/**
+	 * {@inheritDoc}
+	 */
+	public function isVerbose(): bool {
+		return true;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function write( $messages, bool $newline = true, int $verbosity = self::NORMAL ): void {
+		self::output_clean_message( $messages );
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function writeError( $messages, bool $newline = true, int $verbosity = self::NORMAL ): void {
+		self::output_clean_message( $messages );
+	}
+
+	private static function output_clean_message( $messages ) {
+		$messages = (array) preg_replace( '#<(https?)([^>]+)>#', '$1$2', $messages );
+		foreach ( $messages as $message ) {
+			// phpcs:ignore WordPress.WP.AlternativeFunctions.strip_tags_strip_tags
+			WP_CLI::log( strip_tags( trim( $message ) ) );
+		}
+	}
+}
diff --git a/src/WP_CLI/Package/Compat/NullIOMethodsTrait.php b/src/WP_CLI/Package/Compat/NullIOMethodsTrait.php
new file mode 100644
index 000000000..cfe1a71c3
--- /dev/null
+++ b/src/WP_CLI/Package/Compat/NullIOMethodsTrait.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace WP_CLI\Package\Compat;
+
+use Composer\InstalledVersions;
+use Composer\Semver\VersionParser;
+
+// phpcs:disable Generic.Files.OneObjectStructurePerFile.MultipleFound,Generic.Classes.DuplicateClassName.Found
+
+if (
+	class_exists( InstalledVersions::class )
+	&& InstalledVersions::satisfies( new VersionParser(), 'composer/composer', '^2.3' )
+) {
+	require_once __DIR__ . '/Min_Composer_2_3/NullIOMethodsTrait.php';
+
+	trait NullIOMethodsTrait {
+
+		use Min_Composer_2_3\NullIOMethodsTrait;
+	}
+
+	return;
+}
+
+require_once __DIR__ . '/Min_Composer_1_10/NullIOMethodsTrait.php';
+
+trait NullIOMethodsTrait {
+
+	use Min_Composer_1_10\NullIOMethodsTrait;
+}
diff --git a/src/WP_CLI/Package/ComposerIO.php b/src/WP_CLI/Package/ComposerIO.php
new file mode 100644
index 000000000..73a9e8fc8
--- /dev/null
+++ b/src/WP_CLI/Package/ComposerIO.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * A Composer IO class so we can provide some level of interactivity from WP-CLI.
+ *
+ * Due to PHP 5.6 compatibility, we have two different implementations of this class.
+ * This is implemented via traits to make static analysis easier.
+ *
+ * See https://github.com/wp-cli/package-command/issues/172.
+ */
+
+namespace WP_CLI\Package;
+
+use Composer\IO\NullIO;
+use WP_CLI\Package\Compat\NullIOMethodsTrait;
+
+class ComposerIO extends NullIO {
+	use NullIOMethodsTrait;
+}