Merge branch 'main' into try/os

Author: swissspidy

.gemini/settings.json

@@ -0,0 +1,10 @@
+{
+  "context": {
+    "fileName": "AGENTS.md"
+  },
+  "advanced": {
+    "bugCommand": {
+      "urlTemplate": "https://github.com/wp-cli/wp-cli-tests/issues/new?template=1-BUG_REPORT.md&title={title}"
+    }
+  }
+}

.gemini/settings.json.orig

@@ -0,0 +1 @@
+{ "contextFileName": "AGENTS.md", "advanced": { "bugCommand": { "urlTemplate": "https://github.com/wp-cli/wp-cli-tests/issues/new?template=1-BUG_REPORT.md&title={title}" } } }

.github/workflows/check-branch-alias.yml

@@ -0,0 +1,14 @@
+name: Check Branch Alias
+
+on:
+  release:
+    types: [released]
+  workflow_dispatch:
+
+permissions:
+  contents: write
+  pull-requests: write
+
+jobs:
+  check-branch-alias:
+    uses: wp-cli/.github/.github/workflows/reusable-check-branch-alias.yml@main

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

@@ -0,0 +1,46 @@
+name: "Copilot Setup Steps"
+
+on:
+  workflow_dispatch:
+  push:
+    paths:
+      - .github/workflows/copilot-setup-steps.yml
+  pull_request:
+    paths:
+      - .github/workflows/copilot-setup-steps.yml
+
+jobs:
+  copilot-setup-steps:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v6
+
+      - name: Check existence of composer.json file
+        id: check_composer_file
+        uses: andstor/file-existence-action@v3
+        with:
+          files: "composer.json"
+
+      - name: Set up PHP environment
+        if: steps.check_composer_file.outputs.files_exists == 'true'
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: 'latest'
+          ini-values: zend.assertions=1, error_reporting=-1, display_errors=On
+          coverage: 'none'
+          tools: composer,cs2pr
+        env:
+          COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Install Composer dependencies & cache dependencies
+        if: steps.check_composer_file.outputs.files_exists == 'true'
+        uses: ramsey/composer-install@v3
+        env:
+          COMPOSER_ROOT_VERSION: dev-${{ github.event.repository.default_branch }}
+        with:
+          # Bust the cache at least once a month - output format: YYYY-MM.
+          custom-cache-suffix: $(date -u "+%Y-%m")

.github/workflows/issue-triage.yml

@@ -0,0 +1,26 @@
+---
+name: Issue and PR Triage
+
+'on':
+  issues:
+    types: [opened]
+  pull_request_target:
+    types: [opened]
+  workflow_dispatch:
+    inputs:
+      issue_number:
+        description: 'Issue/PR number to triage (leave empty to process all)'
+        required: false
+        type: string
+
+jobs:
+  issue-triage:
+    uses: wp-cli/.github/.github/workflows/reusable-issue-triage.yml@main
+    with:
+      issue_number: >-
+        ${{
+          (github.event_name == 'workflow_dispatch' && inputs.issue_number) ||
+          (github.event_name == 'pull_request_target' && github.event.pull_request.number) ||
+          (github.event_name == 'issues' && github.event.issue.number) ||
+          ''
+        }}

.github/workflows/manage-labels.yml

@@ -0,0 +1,19 @@
+---
+name: Manage Labels
+
+'on':
+  workflow_dispatch:
+  push:
+    branches:
+      - main
+      - master
+    paths:
+      - 'composer.json'
+
+permissions:
+  issues: write
+  contents: read
+
+jobs:
+  manage-labels:
+    uses: wp-cli/.github/.github/workflows/reusable-manage-labels.yml@main

.github/workflows/welcome-new-contributors.yml

@@ -0,0 +1,12 @@
+name: Welcome New Contributors
+
+on:
+  pull_request_target:
+    types: [opened]
+    branches:
+      - main
+      - master
+
+jobs:
+  welcome:
+    uses: wp-cli/.github/.github/workflows/reusable-welcome-new-contributors.yml@main

bin/run-behat-tests

@@ -120,4 +120,4 @@ if [[ "${WP_CLI_TEST_COVERAGE}" == "true" ]] && vendor/bin/behat --help 2>/dev/n
 fi
 
 # Run the functional tests.
-vendor/bin/behat --format progress "$BEHAT_TAGS" --strict "${BEHAT_EXTRA_ARGS[@]}" "$@"
+vendor/bin/behat --snippets-for="WP_CLI\Tests\Context\FeatureContext" --format progress "$BEHAT_TAGS" --strict "${BEHAT_EXTRA_ARGS[@]}" "$@"

composer.json

@@ -43,7 +43,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-main": "5.0.x-dev"
+            "dev-main": "5.1.x-dev"
         },
         "phpstan": {
             "includes": [

src/Context/FeatureContext.php

@@ -2,7 +2,7 @@
 
 namespace WP_CLI\Tests\Context;
 
-use Behat\Behat\Context\SnippetAcceptingContext;
+use Behat\Behat\Context\Context;
 use Behat\Behat\EventDispatcher\Event\OutlineTested;
 use Behat\Behat\Hook\Scope\AfterScenarioScope;
 use Behat\Behat\Hook\Scope\BeforeScenarioScope;
@@ -28,10 +28,8 @@
 
 /**
  * Features context.
- *
- * @phpstan-ignore class.implementsDeprecatedInterface
  */
-class FeatureContext implements SnippetAcceptingContext {
+class FeatureContext implements Context {
 
 	use GivenStepDefinitions;
 	use ThenStepDefinitions;
@@ -280,9 +278,6 @@ private static function running_with_code_coverage() {
 		return \in_array( $with_code_coverage, [ 'true', '1' ], true );
 	}
 
-	/**
-	 * @AfterSuite
-	 */
 	public static function merge_coverage_reports(): void {
 		if ( ! self::running_with_code_coverage() ) {
 			return;
@@ -435,13 +430,13 @@ private static function get_process_env_variables(): array {
 			throw new RuntimeException( 'Could not find WP-CLI binary path.' );
 		}
 
-		wp_cli_behat_env_debug( "WP-CLI binary path: {$bin_path}" );
+		self::debug( "WP-CLI binary path: {$bin_path}" );
 
 		$bin           = Utils\is_windows() ? 'wp.bat' : 'wp';
 		$full_bin_path = $bin_path . DIRECTORY_SEPARATOR . $bin;
 
 		if ( ! is_executable( $full_bin_path ) ) {
-			wp_cli_behat_env_debug( "WARNING: File named '{$bin}' found in the provided/detected binary path is not executable." );
+			self::debug( "WARNING: File named '{$bin}' found in the provided/detected binary path is not executable." );
 		}
 
 		$path_separator  = Utils\is_windows() ? ';' : ':';
@@ -510,9 +505,9 @@ private static function get_process_env_variables(): array {
 		}
 
 		// Dump environment for debugging purposes, but before adding the GitHub token.
-		wp_cli_behat_env_debug( 'Environment:' );
+		self::debug( 'Environment:' );
 		foreach ( $env as $key => $value ) {
-			wp_cli_behat_env_debug( "   [{$key}] => {$value}" );
+			self::debug( "   [{$key}] => {$value}" );
 		}
 
 		$github_token = getenv( 'GITHUB_TOKEN' );
@@ -663,6 +658,8 @@ private static function cache_wp_files( $version = '' ): void {
 	 * @BeforeSuite
 	 */
 	public static function prepare( BeforeSuiteScope $scope ): void {
+		self::bootstrap_feature_context();
+
 		// Test performance statistics - useful for detecting slow tests.
 		self::$log_run_times = getenv( 'WP_CLI_TEST_LOG_RUN_TIMES' );
 		if ( false !== self::$log_run_times ) {
@@ -705,6 +702,8 @@ public static function afterSuite( AfterSuiteScope $scope ): void {
 		if ( self::$log_run_times ) {
 			self::log_run_times_after_suite( $scope );
 		}
+
+		self::merge_coverage_reports();
 	}
 
 	/**
@@ -893,6 +892,74 @@ public function __construct() {
 		$this->set_cache_dir();
 	}
 
+	/**
+	 * @param string $message
+	 */
+	protected static function debug( $message ): void { // phpcs:ignore Universal.Files.SeparateFunctionsFromOO.Mixed
+		if ( ! getenv( 'WP_CLI_TEST_DEBUG_BEHAT_ENV' ) ) {
+			return;
+		}
+
+		echo "{$message}\n";
+	}
+
+	/**
+	 * Load required support files as needed before heading into the Behat context.
+	 */
+	protected static function bootstrap_feature_context(): void {
+		$vendor_folder = self::get_vendor_dir();
+		self::debug( "Vendor folder location: {$vendor_folder}" );
+
+		// Didn't manage to detect a valid vendor folder.
+		if ( empty( $vendor_folder ) ) {
+			return;
+		}
+
+		// We assume the vendor folder is located in the project root folder.
+		$project_folder = dirname( $vendor_folder );
+
+		$framework_folder = self::get_framework_dir();
+		self::debug( "Framework folder location: {$framework_folder}" );
+
+		// Load helper functionality that is needed for the tests.
+		require_once "{$framework_folder}/php/utils.php";
+		require_once "{$framework_folder}/php/WP_CLI/Process.php";
+		require_once "{$framework_folder}/php/WP_CLI/ProcessRun.php";
+
+		// Manually load Composer file includes by generating a config with require:
+		// statements for each file.
+		$project_composer = "{$project_folder}/composer.json";
+		if ( ! file_exists( $project_composer ) ) {
+			return;
+		}
+
+		$composer = json_decode( (string) file_get_contents( $project_composer ) );
+		if ( empty( $composer->autoload->files ) ) {
+			return;
+		}
+
+		$contents = "require:\n";
+		foreach ( $composer->autoload->files as $file ) {
+			$contents .= "  - {$project_folder}/{$file}\n";
+		}
+
+		$temp_folder = sys_get_temp_dir() . '/wp-cli-package-test';
+		if (
+			! is_dir( $temp_folder )
+			&& ! mkdir( $temp_folder )
+			&& ! is_dir( $temp_folder )
+		) {
+			return;
+		}
+
+		$project_config = "{$temp_folder}/config.yml";
+		file_put_contents( $project_config, $contents );
+		putenv( 'WP_CLI_CONFIG_PATH=' . $project_config );
+
+		self::debug( "Project config file location: {$project_config}" );
+		self::debug( "Project config:\n{$contents}" );
+	}
+
 	/**
 	 * Replace standard {VARIABLE_NAME} variables and the special {INVOKE_WP_CLI_WITH_PHP_ARGS-args} and {WP_VERSION-version-latest} variables.
 	 * Note that standard variable names can only contain uppercase letters, digits and underscores and cannot begin with a digit.
@@ -1853,73 +1920,3 @@ private static function log_proc_method_run_time( $key, $start_time ): void {
 		++self::$proc_method_run_times[ $key ][1];
 	}
 }
-
-
-/**
- * @param string $message
- */
-function wp_cli_behat_env_debug( $message ): void { // phpcs:ignore Universal.Files.SeparateFunctionsFromOO.Mixed
-	if ( ! getenv( 'WP_CLI_TEST_DEBUG_BEHAT_ENV' ) ) {
-		return;
-	}
-
-	echo "{$message}\n";
-}
-
-/**
- * Load required support files as needed before heading into the Behat context.
- */
-function wpcli_bootstrap_behat_feature_context(): void {
-	$vendor_folder = FeatureContext::get_vendor_dir();
-	wp_cli_behat_env_debug( "Vendor folder location: {$vendor_folder}" );
-
-	// Didn't manage to detect a valid vendor folder.
-	if ( empty( $vendor_folder ) ) {
-		return;
-	}
-
-	// We assume the vendor folder is located in the project root folder.
-	$project_folder = dirname( $vendor_folder );
-
-	$framework_folder = FeatureContext::get_framework_dir();
-	wp_cli_behat_env_debug( "Framework folder location: {$framework_folder}" );
-
-	// Load helper functionality that is needed for the tests.
-	require_once "{$framework_folder}/php/utils.php";
-	require_once "{$framework_folder}/php/WP_CLI/ProcessRun.php";
-
-	// Manually load Composer file includes by generating a config with require:
-	// statements for each file.
-	$project_composer = "{$project_folder}/composer.json";
-	if ( ! file_exists( $project_composer ) ) {
-		return;
-	}
-
-	$composer = json_decode( (string) file_get_contents( $project_composer ) );
-	if ( empty( $composer->autoload->files ) ) {
-		return;
-	}
-
-	$contents = "require:\n";
-	foreach ( $composer->autoload->files as $file ) {
-		$contents .= "  - {$project_folder}/{$file}\n";
-	}
-
-	$temp_folder = sys_get_temp_dir() . '/wp-cli-package-test';
-	if (
-		! is_dir( $temp_folder )
-		&& ! mkdir( $temp_folder )
-		&& ! is_dir( $temp_folder )
-	) {
-		return;
-	}
-
-	$project_config = "{$temp_folder}/config.yml";
-	file_put_contents( $project_config, $contents );
-	putenv( 'WP_CLI_CONFIG_PATH=' . $project_config );
-
-	wp_cli_behat_env_debug( "Project config file location: {$project_config}" );
-	wp_cli_behat_env_debug( "Project config:\n{$contents}" );
-}
-
-wpcli_bootstrap_behat_feature_context();