Merge branch 'main' into feature/wp-version-resolve

Author: swissspidy

.gitignore

@@ -12,4 +12,5 @@ phpunit.xml
 phpcs.xml
 .phpcs.xml
 .phpunit.result.cache
+.phpunit.cache
 build/logs

AGENTS.md

@@ -0,0 +1,121 @@
+# Instructions
+
+This package is part of WP-CLI, the official command line interface for WordPress. For a detailed explanation of the project structure and development workflow, please refer to the main @README.md file.
+
+## Best Practices for Code Contributions
+
+When contributing to this package, please adhere to the following guidelines:
+
+* **Follow Existing Conventions:** Before writing any code, analyze the existing codebase in this package to understand the coding style, naming conventions, and architectural patterns.
+* **Focus on the Package's Scope:** All changes should be relevant to the functionality of the package.
+* **Write Tests:** All new features and bug fixes must be accompanied by acceptance tests using Behat. You can find the existing tests in the `features/` directory. There may be PHPUnit unit tests as well in the `tests/` directory.
+* **Update Documentation:** If your changes affect the user-facing functionality, please update the relevant inline code documentation.
+
+### Building and running
+
+Before submitting any changes, it is crucial to validate them by running the full suite of static code analysis and tests. To run the full suite of checks, execute the following command: `composer test`.
+
+This single command ensures that your changes meet all the quality gates of the project. While you can run the individual steps separately, it is highly recommended to use this single command to ensure a comprehensive validation.
+
+### Useful Composer Commands
+
+The project uses Composer to manage dependencies and run scripts. The following commands are available:
+
+* `composer install`: Install dependencies.
+* `composer test`: Run the full test suite, including linting, code style checks, static analysis, and unit/behavior tests.
+* `composer lint`: Check for syntax errors.
+* `composer phpcs`: Check for code style violations.
+* `composer phpcbf`: Automatically fix code style violations.
+* `composer phpstan`: Run static analysis.
+* `composer phpunit`: Run unit tests.
+* `composer behat`: Run behavior-driven tests.
+
+### Coding Style
+
+The project follows the `WP_CLI_CS` coding standard, which is enforced by PHP_CodeSniffer. The configuration can be found in `phpcs.xml.dist`. Before submitting any code, please run `composer phpcs` to check for violations and `composer phpcbf` to automatically fix them.
+
+## Documentation
+
+The `README.md` file might be generated dynamically from the project's codebase using `wp scaffold package-readme` ([doc](https://github.com/wp-cli/scaffold-package-command#wp-scaffold-package-readme)). In that case, changes need to be made against the corresponding part of the codebase.
+
+### Inline Documentation
+
+Only write high-value comments if at all. Avoid talking to the user through comments.
+
+## Testing
+
+The project has a comprehensive test suite that includes unit tests, behavior-driven tests, and static analysis.
+
+* **Unit tests** are written with PHPUnit and can be found in the `tests/` directory. The configuration is in `phpunit.xml.dist`.
+* **Behavior-driven tests** are written with Behat and can be found in the `features/` directory. The configuration is in `behat.yml`.
+* **Static analysis** is performed with PHPStan.
+
+All tests are run on GitHub Actions for every pull request.
+
+When writing tests, aim to follow existing patterns. Key conventions include:
+
+* When adding tests, first examine existing tests to understand and conform to established conventions.
+* For unit tests, extend the base `WP_CLI\Tests\TestCase` test class.
+* For Behat tests, only WP-CLI commands installed in `composer.json` can be run.
+
+### Behat Steps
+
+WP-CLI makes use of a Behat-based testing framework and provides a set of custom step definitions to write feature tests.
+
+> **Note:** If you are expecting an error output in a test, you need to use `When I try ...` instead of `When I run ...` .
+
+#### Given
+
+* `Given an empty directory` - Creates an empty directory.
+* `Given /^an? (empty|non-existent) ([^\s]+) directory$/` - Creates or deletes a specific directory.
+* `Given an empty cache` - Clears the WP-CLI cache directory.
+* `Given /^an? ([^\s]+) (file|cache file):$/` - Creates a file with the given contents.
+* `Given /^"([^"]+)" replaced with "([^"]+)" in the ([^\s]+) file$/` - Search and replace a string in a file using regex.
+* `Given /^that HTTP requests to (.*?) will respond with:$/` - Mock HTTP requests to a given URL.
+* `Given WP files` - Download WordPress files without installing.
+* `Given wp-config.php` - Create a wp-config.php file using `wp config create`.
+* `Given a database` - Creates an empty database.
+* `Given a WP install(ation)` - Installs WordPress.
+* `Given a WP install(ation) in :subdir` - Installs WordPress in a given directory.
+* `Given a WP install(ation) with Composer` - Installs WordPress with Composer.
+* `Given a WP install(ation) with Composer and a custom vendor directory :vendor_directory` - Installs WordPress with Composer and a custom vendor directory.
+* `Given /^a WP multisite (subdirectory|subdomain)?\s?(install|installation)$/` - Installs WordPress Multisite.
+* `Given these installed and active plugins:` - Installs and activates one or more plugins.
+* `Given a custom wp-content directory` - Configure a custom `wp-content` directory.
+* `Given download:` - Download multiple files into the given destinations.
+* `Given /^save (STDOUT|STDERR) ([\'].+[^\'])?\s?as \{(\w+)\}$/` - Store STDOUT or STDERR contents in a variable.
+* `Given /^a new Phar with (?:the same version|version "([^"]+)")$/` - Build a new WP-CLI Phar file with a given version.
+* `Given /^a downloaded Phar with (?:the same version|version "([^"]+)")$/` - Download a specific WP-CLI Phar version from GitHub.
+* `Given /^save the (.+) file ([\'].+[^\'])? as \{(\w+)\}$/` - Stores the contents of the given file in a variable.
+* `Given a misconfigured WP_CONTENT_DIR constant directory` - Modify wp-config.php to set `WP_CONTENT_DIR` to an empty string.
+* `Given a dependency on current wp-cli` - Add `wp-cli/wp-cli` as a Composer dependency.
+* `Given a PHP built-in web server` - Start a PHP built-in web server in the current directory.
+* `Given a PHP built-in web server to serve :subdir` - Start a PHP built-in web server in the given subdirectory.
+
+#### When
+
+* ``When /^I launch in the background `([^`]+)`$/`` - Launch a given command in the background.
+* ``When /^I (run|try) `([^`]+)`$/`` - Run or try a given command.
+* ``When /^I (run|try) `([^`]+)` from '([^\s]+)'$/`` - Run or try a given command in a subdirectory.
+* `When /^I (run|try) the previous command again$/` - Run or try the previous command again.
+
+#### Then
+
+* `Then /^the return code should( not)? be (\d+)$/` - Expect a specific exit code of the previous command.
+* `Then /^(STDOUT|STDERR) should( strictly)? (be|contain|not contain):$/` - Check the contents of STDOUT or STDERR.
+* `Then /^(STDOUT|STDERR) should be a number$/` - Expect STDOUT or STDERR to be a numeric value.
+* `Then /^(STDOUT|STDERR) should not be a number$/` - Expect STDOUT or STDERR to not be a numeric value.
+* `Then /^STDOUT should be a table containing rows:$/` - Expect STDOUT to be a table containing the given rows.
+* `Then /^STDOUT should end with a table containing rows:$/` - Expect STDOUT to end with a table containing the given rows.
+* `Then /^STDOUT should be JSON containing:$/` - Expect valid JSON output in STDOUT.
+* `Then /^STDOUT should be a JSON array containing:$/` - Expect valid JSON array output in STDOUT.
+* `Then /^STDOUT should be CSV containing:$/` - Expect STDOUT to be CSV containing certain values.
+* `Then /^STDOUT should be YAML containing:$/` - Expect STDOUT to be YAML containing certain content.
+* `Then /^(STDOUT|STDERR) should be empty$/` - Expect STDOUT or STDERR to be empty.
+* `Then /^(STDOUT|STDERR) should not be empty$/` - Expect STDOUT or STDERR not to be empty.
+* `Then /^(STDOUT|STDERR) should be a version string (<|<=|>|>=|==|=|<>) ([+\w.{}-]+)$/` - Expect STDOUT or STDERR to be a version string comparing to the given version.
+* `Then /^the (.+) (file|directory) should( strictly)? (exist|not exist|be:|contain:|not contain):$/` - Expect a certain file or directory to (not) exist or (not) contain certain contents.
+* `Then /^the contents of the (.+) file should( not)? match (((\/.*\/)|(#.#))([a-z]+)?)$/` - Match file contents against a regex.
+* `Then /^(STDOUT|STDERR) should( not)? match (((\/.*\/)|(#.#))([a-z]+)?)$/` - Match STDOUT or STDERR against a regex.
+* `Then /^an email should (be sent|not be sent)$/` - Expect an email to be sent (or not).
+* `Then the HTTP status code should be :code` - Expect the HTTP status code for visiting `http://localhost:8080`.

bin/install-package-tests

@@ -12,9 +12,13 @@
 is_numeric() {
     case $1 in
         ''|*[!0-9]*) return 1;;  # returns 1 if not numeric
-        *) return 0;;           # returns 0 if numeric
+        *) return 0;;            # returns 0 if numeric
     esac
 }
+# Promt color vars.
+C_RED="\033[31m"
+C_BLUE="\033[34m"
+NO_FORMAT="\033[0m"
 
 HOST=localhost
 PORT=""
@@ -28,36 +32,57 @@ if [ -n "${WP_CLI_TEST_DBHOST}" ]; then
 	if [ -n "${PORT}" ]; then
 		# If the port is not numeric, then we assume it is a socket path.
 		if is_numeric "${PORT}"; then
+			echo "Connecting to custom host: ${C_BLUE}${HOST}${NO_FORMAT} on port ${C_BLUE}${PORT}${NO_FORMAT}"
 			HOST_STRING="${HOST_STRING} --port=${PORT} --protocol=tcp"
 		else
+			echo "Connecting to custom host: ${C_BLUE}${HOST}${NO_FORMAT} on socket ${C_BLUE}${PORT}${NO_FORMAT}"
 			HOST_STRING="${HOST_STRING} --socket=${PORT} --protocol=socket"
 		fi
+	else
+		echo "Connecting to custom host: ${C_BLUE}${HOST}${NO_FORMAT}"
 	fi
+else
+	echo "Connecting to default host: ${C_BLUE}${HOST}${NO_FORMAT}"
 fi
 
 USER=root
 if [ -n "${WP_CLI_TEST_DBROOTUSER}" ]; then
-  USER="${WP_CLI_TEST_DBROOTUSER}"
+	echo "Connecting with custom root user: ${C_BLUE}${WP_CLI_TEST_DBROOTUSER}${NO_FORMAT}"
+	USER="${WP_CLI_TEST_DBROOTUSER}"
+else
+	echo "Connecting with default root user: ${C_BLUE}${USER}${NO_FORMAT}"
 fi
 
 PASSWORD_STRING=""
 if [ -n "${WP_CLI_TEST_DBROOTPASS}" ]; then
-  PASSWORD_STRING="-p${WP_CLI_TEST_DBROOTPASS}"
+	echo "Connecting with custom root password: ${C_BLUE}${WP_CLI_TEST_DBROOTPASS}${NO_FORMAT}"
+	PASSWORD_STRING="-p${WP_CLI_TEST_DBROOTPASS}"
+else
+	echo "Connecting with default root password: ${C_BLUE}empty${NO_FORMAT}"
 fi
 
 TEST_DB=wp_cli_test
 if [ -n "${WP_CLI_TEST_DBNAME}" ]; then
-  TEST_DB="${WP_CLI_TEST_DBNAME}"
+	echo "Using custom test database: ${C_BLUE}${WP_CLI_TEST_DBNAME}${NO_FORMAT}"
+	TEST_DB="${WP_CLI_TEST_DBNAME}"
+else
+	echo "Using default test database: ${C_BLUE}${TEST_DB}${NO_FORMAT}"
 fi
 
 TEST_USER=wp_cli_test
 if [ -n "${WP_CLI_TEST_DBUSER}" ]; then
-  TEST_USER="${WP_CLI_TEST_DBUSER}"
+	echo "Using custom test user: ${C_BLUE}${WP_CLI_TEST_DBUSER}${NO_FORMAT}"
+	TEST_USER="${WP_CLI_TEST_DBUSER}"
+else
+	echo "Using default test user: ${C_BLUE}${TEST_USER}${NO_FORMAT}"
 fi
 
 TEST_PASSWORD=password1
 if [ -n "${WP_CLI_TEST_DBPASS}" ]; then
-  TEST_PASSWORD="${WP_CLI_TEST_DBPASS}"
+	echo "Using custom test password: ${C_BLUE}${WP_CLI_TEST_DBPASS}${NO_FORMAT}"
+	TEST_PASSWORD="${WP_CLI_TEST_DBPASS}"
+else
+	echo "Using default test password: ${C_BLUE}${TEST_PASSWORD}${NO_FORMAT}"
 fi
 
 echo "Detecting database version..."
@@ -71,6 +96,15 @@ case "${CLIENT_VERSION}" in
 		;;
 esac
 
+if [ -z "$PS1" ]; then
+	# These vars are because github actions gave problems in the past.
+	MYSQL_TRIES=36
+	MYSQL_WAIT=5
+else
+	MYSQL_TRIES=1
+	MYSQL_WAIT=0
+fi
+
 if [ "${TYPE}" = "MySQL" ]; then
 	SERVER_VERSION=$(mysql -e "SELECT VERSION()" --skip-column-names ${HOST_STRING} -u"${USER}" "${PASSWORD_STRING}")
 else
@@ -88,42 +122,54 @@ echo 'Checking if database is ready...'
 if [ "${TYPE}" = "MySQL" ]; then
 	while ! mysql ${HOST_STRING} --user="${USER}" "${PASSWORD_STRING}" --execute="SHOW DATABASES;" | grep 'information_schema' >/dev/null;
 	do
-		echo 'Waiting for database...'
-		sleep 5
 		i=$((i+1))
-		if [ $i -gt 36 ]; then
-		echo 'Database failed to start. Aborting.'
-		exit 1
+		if [ "${MYSQL_TRIES}" -gt 1 ]; then
+			echo "Waiting for MySQL(${i}/${MYSQL_TRIES})..."
+			sleep ${MYSQL_WAIT}
+		fi
+
+		if [ $i -ge $MYSQL_TRIES ]; then
+			echo "${C_RED}MySQL failed to start. Aborting.${NO_FORMAT}"
+			echo "Cannot connect to MySQL server. For all available variables, check the documentation at:"
+			echo " ${C_BLUE}https://github.com/wp-cli/wp-cli-tests?tab=readme-ov-file#the-database-credentials${NO_FORMAT}"
+			exit 1
 		fi
 	done
 else
 	while ! mariadb ${HOST_STRING} --user="${USER}" "${PASSWORD_STRING}" --execute="SHOW DATABASES;" | grep 'information_schema' >/dev/null;
 	do
-		echo 'Waiting for database...'
-		sleep 5
 		i=$((i+1))
-		if [ $i -gt 36 ]; then
-		echo 'Database failed to start. Aborting.'
-		exit 1
+		if [ "${MYSQL_TRIES}" -gt 1 ]; then
+			echo "Waiting for MariaDB(${i}/${MYSQL_TRIES})..."
+			sleep ${MYSQL_WAIT}
+		fi
+
+		if [ $i -ge $MYSQL_TRIES ]; then
+			echo "${C_RED}MariaDB failed to start. Aborting.${NO_FORMAT}"
+			echo "Cannot connect to MariaDB server. For all available variables, check the documentation at:"
+			echo " ${C_BLUE}https://github.com/wp-cli/wp-cli-tests?tab=readme-ov-file#the-database-credentials${NO_FORMAT}"
+			exit 1
 		fi
 	done
 fi
 
 # Prepare the database for running the tests with a MySQL version 8.0 or higher.
 install_mysql_db_8_0_plus() {
-	set -ex
+	set -ex # print all the commands.
 	mysql -e "CREATE DATABASE IF NOT EXISTS \`${TEST_DB}\`;" ${HOST_STRING} -u"${USER}" "${PASSWORD_STRING}"
 	mysql -e "CREATE USER IF NOT EXISTS \`${TEST_USER}\`@'%' IDENTIFIED WITH caching_sha2_password BY '${TEST_PASSWORD}'" ${HOST_STRING} -u"${USER}" "${PASSWORD_STRING}"
 	mysql -e "GRANT ALL PRIVILEGES ON \`${TEST_DB}\`.* TO '${TEST_USER}'@'%'" ${HOST_STRING} -u"${USER}" "${PASSWORD_STRING}"
 	mysql -e "GRANT ALL PRIVILEGES ON \`${TEST_DB}_scaffold\`.* TO '${TEST_USER}'@'%'" ${HOST_STRING} -u"${USER}" "${PASSWORD_STRING}"
+	{ set +ex; } 2> /dev/null # stop printing the commands
 }
 
 # Prepare the database for running the tests with a MySQL version lower than 8.0.
 install_mysql_db_lower_than_8_0() {
-	set -ex
+	set -ex # print all the commands.
 	mysql -e "CREATE DATABASE IF NOT EXISTS \`${TEST_DB}\`;" ${HOST_STRING} -u"${USER}" "${PASSWORD_STRING}"
 	mysql -e "GRANT ALL ON \`${TEST_DB}\`.* TO '${TEST_USER}'@'%' IDENTIFIED BY '${TEST_PASSWORD}'" ${HOST_STRING} -u"${USER}" "${PASSWORD_STRING}"
 	mysql -e "GRANT ALL ON \`${TEST_DB}_scaffold\`.* TO '${TEST_USER}'@'%' IDENTIFIED BY '${TEST_PASSWORD}'" ${HOST_STRING} -u"${USER}" "${PASSWORD_STRING}"
+	{ set +ex; } 2> /dev/null # stop printing the commands
 }
 
 # Prepare the database for running the tests with MariaDB
@@ -142,3 +188,6 @@ elif [ "${MAJOR}" -ge 8 ]; then
 else
 	install_mysql_db_lower_than_8_0
 fi
+
+echo "Succesfully prepared the database for running tests."
+echo "This command does not have to be run again."

composer.json

@@ -10,21 +10,25 @@
     "type": "phpcodesniffer-standard",
     "require": {
         "php": ">=7.2.24",
-        "behat/behat": "^3.7",
+        "behat/behat": "^v3.15.0",
         "composer/semver": "^3.4",
         "dealerdirect/phpcodesniffer-composer-installer": "^0.4.3 || ^0.5 || ^0.6.2 || ^0.7.1 || ^1.0.0",
         "php-parallel-lint/php-console-highlighter": "^1.0",
         "php-parallel-lint/php-parallel-lint": "^1.3.1",
-        "phpcompatibility/php-compatibility": "dev-develop",
-        "phpstan/extension-installer": "^1.4.3",
-        "phpstan/phpstan": "^1.12.26",
+        "phpcompatibility/php-compatibility": "^10.0",
+        "phpstan/extension-installer": "^1.4",
+        "phpstan/phpstan": "^1.12.26 || ^2.0",
+        "phpstan/phpstan-deprecation-rules": "^1.2 || ^2.0",
+        "phpstan/phpstan-phpunit": "^1.4 || ^2.0",
+        "phpstan/phpstan-strict-rules": "^1.6 || ^2.0",
+        "swissspidy/phpstan-no-private": "^0.2.1 || ^1.0",
         "szepeviktor/phpstan-wordpress": "^v1.3.5",
         "wp-cli/config-command": "^1 || ^2",
         "wp-cli/core-command": "^1 || ^2",
         "wp-cli/eval-command": "^1 || ^2",
         "wp-cli/wp-cli": "^2.12",
-        "wp-coding-standards/wpcs": "^3",
-        "yoast/phpunit-polyfills": "^1.0.3 || ^2.0.1"
+        "wp-coding-standards/wpcs": "dev-develop",
+        "yoast/phpunit-polyfills": "^1.0 || ^2.0 || ^3.0 || ^4.0"
     },
     "require-dev": {
         "roave/security-advisories": "dev-latest"
@@ -40,7 +44,12 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-main": "4.0.x-dev"
+            "dev-main": "5.0.x-dev"
+        },
+        "phpstan": {
+            "includes": [
+                "extension.neon"
+            ]
         },
         "readme": {
             "sections": [
@@ -59,6 +68,11 @@
             "WP_CLI\\Tests\\": "src"
         }
     },
+    "autoload-dev": {
+        "psr-4": {
+            "WP_CLI\\Tests\\Tests\\": "tests/tests"
+        }
+    },
     "minimum-stability": "dev",
     "prefer-stable": true,
     "bin": [