Merge branch 'main' into try/os

Author: swissspidy

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

@@ -17,17 +17,17 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v6
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
 
       - name: Check existence of composer.json file
         id: check_composer_file
-        uses: andstor/file-existence-action@v3
+        uses: andstor/file-existence-action@076e0072799f4942c8bc574a82233e1e4d13e9d6 # v3
         with:
           files: "composer.json"
 
       - name: Set up PHP environment
         if: steps.check_composer_file.outputs.files_exists == 'true'
-        uses: shivammathur/setup-php@v2
+        uses: shivammathur/setup-php@44454db4f0199b8b9685a5d763dc37cbf79108e1 # v2
         with:
           php-version: 'latest'
           ini-values: zend.assertions=1, error_reporting=-1, display_errors=On
@@ -38,7 +38,7 @@ jobs:
 
       - name: Install Composer dependencies & cache dependencies
         if: steps.check_composer_file.outputs.files_exists == 'true'
-        uses: ramsey/composer-install@v3
+        uses: ramsey/composer-install@3cf229dc2919194e9e36783941438d17239e8520 # v3
         env:
           COMPOSER_ROOT_VERSION: dev-${{ github.event.repository.default_branch }}
         with:

.github/workflows/issue-triage.yml

@@ -13,6 +13,13 @@ name: Issue and PR Triage
         required: false
         type: string
 
+permissions:
+  issues: write
+  pull-requests: write
+  actions: write
+  contents: read
+  models: read
+
 jobs:
   issue-triage:
     uses: wp-cli/.github/.github/workflows/reusable-issue-triage.yml@main

.github/workflows/regenerate-readme.yml

@@ -10,6 +10,10 @@ on:
       - "features/**"
       - "README.md"
 
+permissions:
+  contents: write
+  pull-requests: write
+
 jobs:
   regenerate-readme:
     uses: wp-cli/.github/.github/workflows/reusable-regenerate-readme.yml@main

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

@@ -7,6 +7,9 @@ on:
       - main
       - master
 
+permissions:
+  pull-requests: write
+
 jobs:
   welcome:
     uses: wp-cli/.github/.github/workflows/reusable-welcome-new-contributors.yml@main

.typos.toml

@@ -0,0 +1,6 @@
+[default]
+extend-ignore-re = [
+	"(?Rm)^.*(#|//)\\s*spellchecker:disable-line$",
+	"(?s)(#|//)\\s*spellchecker:off.*?\\n\\s*(#|//)\\s*spellchecker:on",
+	"(#|//)\\s*spellchecker:ignore-next-line\\n.*"
+]

features/steps.feature

@@ -68,6 +68,15 @@ Feature: Make sure "Given", "When", "Then" steps work as expected
     Then STDOUT should match /\d\.\d/
     And STDERR should be empty
 
+  Scenario: Nested special variables
+    Given an empty directory
+    When I run `echo {INVOKE_WP_CLI_WITH_PHP_ARGS--dopen_basedir={RUN_DIR}} cli info`
+    Then STDOUT should match /^WP_CLI_PHP_ARGS=-dopen_basedir=.* ?wp cli info/
+    And STDERR should be empty
+
+    When I run `echo {INVOKE_WP_CLI_WITH_PHP_ARGS--dopen_basedir={RUN_DIR}} eval 'echo "{RUN_DIR}";'`
+    Then STDOUT should match /^WP_CLI_PHP_ARGS=-dopen_basedir=(.*)(.*) ?wp eval echo "\1";/
+
   @require-mysql-or-mariadb
   Scenario: SQL related variables
     When I run `echo {MYSQL_BINARY}`

phpcs.xml.dist

@@ -22,7 +22,7 @@
 	<!-- Strip the filepaths down to the relevant bit. -->
 	<arg name="basepath" value="./"/>
 
-	<!-- Check up to 8 files simultanously. -->
+	<!-- Check up to 8 files simultaneously. -->
 	<arg name="parallel" value="8"/>
 
 	<!--

src/Context/FeatureContext.php

@@ -785,15 +785,13 @@ private static function terminate_proc( $master_pid ): void {
 
 		$output = shell_exec( "ps -o ppid,pid,command | grep $master_pid" );
 
-		if ( is_string( $output ) ) {
-			foreach ( explode( PHP_EOL, $output ) as $line ) {
-				if ( preg_match( '/^\s*(\d+)\s+(\d+)/', $line, $matches ) ) {
-					$parent = $matches[1];
-					$child  = $matches[2];
-
-					if ( (int) $parent === (int) $master_pid ) {
-						self::terminate_proc( (int) $child );
-					}
+		foreach ( explode( PHP_EOL, $output ? $output : '' ) as $line ) {
+			if ( preg_match( '/^\s*(\d+)\s+(\d+)/', $line, $matches ) ) {
+				$parent = $matches[1];
+				$child  = $matches[2];
+
+				if ( (int) $parent === (int) $master_pid ) {
+					self::terminate_proc( (int) $child );
 				}
 			}
 		}
@@ -968,10 +966,10 @@ protected static function bootstrap_feature_context(): void {
 	 * @return string
 	 */
 	public function replace_variables( $str ) {
+		$str = preg_replace_callback( '/\{([A-Z_][A-Z_0-9]*)\}/', [ $this, 'replace_var' ], $str );
 		if ( false !== strpos( $str, '{INVOKE_WP_CLI_WITH_PHP_ARGS-' ) ) {
 			$str = $this->replace_invoke_wp_cli_with_php_args( $str );
 		}
-		$str = preg_replace_callback( '/\{([A-Z_][A-Z_0-9]*)\}/', [ $this, 'replace_var' ], $str );
 		if ( false !== strpos( $str, '{WP_VERSION-' ) ) {
 			$str = $this->replace_wp_versions( $str );
 		}
@@ -1010,7 +1008,7 @@ private function replace_invoke_wp_cli_with_php_args( $str ) {
 		}
 
 		$str = preg_replace_callback(
-			'/{INVOKE_WP_CLI_WITH_PHP_ARGS-([^}]*)}/',
+			'/{INVOKE_WP_CLI_WITH_PHP_ARGS-(.*)}/',
 			static function ( $matches ) use ( $phar_path, $shell_path ) {
 				return $phar_path ? "php {$matches[1]} {$phar_path}" : ( 'WP_CLI_PHP_ARGS=' . escapeshellarg( $matches[1] ) . ' ' . $shell_path );
 			},