Merge branch 'main' into try/os

Author: swissspidy

.github/workflows/copilot-setup-steps.yml

@@ -21,13 +21,11 @@ jobs:
 
       - name: Check existence of composer.json file
         id: check_composer_file
-        uses: andstor/file-existence-action@076e0072799f4942c8bc574a82233e1e4d13e9d6 # v3
-        with:
-          files: "composer.json"
+        run: echo "files_exists=$(test -f composer.json && echo true || echo false)" >> "$GITHUB_OUTPUT"
 
       - name: Set up PHP environment
         if: steps.check_composer_file.outputs.files_exists == 'true'
-        uses: shivammathur/setup-php@44454db4f0199b8b9685a5d763dc37cbf79108e1 # v2
+        uses: shivammathur/setup-php@accd6127cb78bee3e8082180cb391013d204ef9f # v2
         with:
           php-version: 'latest'
           ini-values: zend.assertions=1, error_reporting=-1, display_errors=On
@@ -38,7 +36,7 @@ jobs:
 
       - name: Install Composer dependencies & cache dependencies
         if: steps.check_composer_file.outputs.files_exists == 'true'
-        uses: ramsey/composer-install@3cf229dc2919194e9e36783941438d17239e8520 # v3
+        uses: ramsey/composer-install@65e4f84970763564f46a70b8a54b90d033b3bdda # v3
         env:
           COMPOSER_ROOT_VERSION: dev-${{ github.event.repository.default_branch }}
         with:

WP_CLI_CS/ruleset.xml

@@ -84,6 +84,26 @@
 	</rule>
 
 
+	<!--
+	#############################################################################
+	USE THE SLEVOMATCODINGSTANDARD RULESET
+
+	This checks code for unused `use` statements.
+	See: https://github.com/slevomat/coding-standard
+	#############################################################################
+	-->
+
+	<rule ref="SlevomatCodingStandard.Namespaces.UnusedUses">
+		<properties>
+			<property name="searchAnnotations" value="true"/>
+		</properties>
+		<!-- Exclude case-sensitivity check: PHPUnit's @dataProvider annotation uses a
+			 lowercase method name which can cause false positives with the DataProvider
+			 attribute class import (PHPUnit\Framework\Attributes\DataProvider). -->
+		<exclude name="SlevomatCodingStandard.Namespaces.UnusedUses.MismatchingCaseSensitivity"/>
+	</rule>
+
+
 	<!--
 	#############################################################################
 	SPECIFIC CONFIGURATION FOR SNIFFS

bin/run-behat-tests

@@ -94,6 +94,20 @@ if [ "${WP_VERSION-latest}" = "latest" ]; then
 	export WP_VERSION=$(curl -s https://api.wordpress.org/core/version-check/1.7/ | jq -r ".offers[0].current")
 fi
 
+# Normalize WP_VERSION=X.Y.0 to X.Y (WordPress uses X.Y for the initial release, not X.Y.0).
+# If WP_VERSION=X.Y (major.minor only), resolve to the latest available patch release.
+if [[ "${WP_VERSION}" =~ ^([0-9]+\.[0-9]+)\.0$ ]]; then
+	export WP_VERSION="${BASH_REMATCH[1]}"
+elif [[ "${WP_VERSION}" =~ ^[0-9]+\.[0-9]+$ ]]; then
+	WP_VERSIONS_JSON=$(curl -s https://raw.githubusercontent.com/wp-cli/wp-cli-tests/artifacts/wp-versions.json)
+	if [ -n "${WP_VERSIONS_JSON}" ]; then
+		RESOLVED_VERSION=$(echo "${WP_VERSIONS_JSON}" | jq -r --arg prefix "${WP_VERSION}." 'keys | map(select(startswith($prefix))) | sort_by(split(".") | map(tonumber)) | last // empty')
+		if [ -n "${RESOLVED_VERSION}" ]; then
+			export WP_VERSION="${RESOLVED_VERSION}"
+		fi
+	fi
+fi
+
 # To retrieve the WP-CLI tests package root folder, we start with this scripts
 # location.
 SOURCE="${BASH_SOURCE[0]}"

composer.json

@@ -20,6 +20,7 @@
         "phpstan/phpstan-deprecation-rules": "^1.2 || ^2.0",
         "phpstan/phpstan-phpunit": "^1.4 || ^2.0",
         "phpstan/phpstan-strict-rules": "^1.6 || ^2.0",
+        "slevomat/coding-standard": "^7.0 || ^8.0",
         "swissspidy/phpstan-no-private": "^0.2.1 || ^1.0",
         "szepeviktor/phpstan-wordpress": "^1.3.5 || ^2.0.3",
         "wp-cli/config-command": "^1 || ^2",

phpstan.neon.dist

@@ -18,6 +18,5 @@ parameters:
     - WP_DEBUG
     - WP_DEBUG_LOG
     - WP_DEBUG_DISPLAY
-  ignoreErrors:
   strictRules:
     strictCalls: true

src/Context/Support.php

@@ -5,7 +5,6 @@
 
 namespace WP_CLI\Tests\Context;
 
-use Behat\Behat\Exception\PendingException;
 use Exception;
 use Mustangostang\Spyc;
 use SebastianBergmann\Diff\Differ;
@@ -123,6 +122,23 @@ protected function check_string( $output, $expected, $action, $message = false,
 				$message = $output;
 			}
 
+			$action_message = '';
+			switch ( $action ) {
+				case 'be':
+					$action_message = 'Output does not exactly match expected string:';
+					break;
+				case 'contain':
+					$action_message = 'Output does not contain expected string:';
+					break;
+				case 'not contain':
+					$action_message = 'Output unexpectedly contains string:';
+					break;
+				default:
+					throw new \Behat\Behat\Tester\Exception\PendingException();
+			}
+
+			$message .= "\n\n" . $action_message . "\n" . $expected;
+
 			$diff = $this->generate_diff( $expected, rtrim( $output, "\n" ) );
 			if ( ! empty( $diff ) ) {
 				$message .= "\n\n" . $diff;

src/Context/WhenStepDefinitions.php

@@ -19,7 +19,24 @@ public function wpcli_tests_invoke_proc( $proc, $mode ) {
 		);
 		$method = $map[ $mode ];
 
-		return $proc->$method();
+		try {
+			return $proc->$method();
+		} catch ( \RuntimeException $e ) {
+			if ( 'run' === $mode ) {
+				$message = $e->getMessage();
+				$status  = preg_match( '/exit status: (\d+)$/', $message, $matches ) ? $matches[1] : 'unknown';
+
+				if ( '0' === $status ) {
+					$message .= "\n\nThe command unexpectedly produced STDERR output. If you expect a non-zero exit status or STDERR output, use `When I try [...]`. Else, this may be a bug in your code or test.";
+				} else {
+					$message .= "\n\nThe command unexpectedly exited with status {$status}. If you expect a non-zero exit status, use `When I try [...]`. Else, this may be a bug in your code or test.";
+				}
+
+				throw new \RuntimeException( $message, $e->getCode(), $e );
+			}
+
+			throw $e;
+		}
 	}
 
 	/**

src/PHPStan/ParseUrlFunctionDynamicReturnTypeExtension.php

@@ -81,7 +81,7 @@ public function getTypeFromFunctionCall( FunctionReflection $functionReflection,
 			$types = [];
 			foreach ( $urlType->getConstantStrings() as $constantString ) {
 				try {
-                    // phpcs:ignore Generic.PHP.NoSilencedErrors.Discouraged
+					// phpcs:ignore WordPress.PHP.NoSilencedErrors.Discouraged
 					$result = @parse_url( $constantString->getValue(), $componentType->getValue() );
 				} catch ( \Error $e ) {
 					$types[] = new ConstantBooleanType( false );