Merge branch 'main' into try/os

Author: swissspidy

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

@@ -17,7 +17,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
 
       - name: Check existence of composer.json file
         id: check_composer_file

composer.json

@@ -21,7 +21,7 @@
         "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",
+        "szepeviktor/phpstan-wordpress": "^1.3.5 || ^2.0.3",
         "wp-cli/config-command": "^1 || ^2",
         "wp-cli/core-command": "^1 || ^2",
         "wp-cli/eval-command": "^1 || ^2",

extension.neon

@@ -29,6 +29,14 @@ parameters:
     switchConditionsMatchingType: false
     noVariableVariables: false
     strictArrayFilter: false
+    booleansInLoopConditions: false
+    disallowedBacktick: false
+    disallowedEmpty: false
+    disallowedImplicitArrayCreation: false
+    disallowedShortTernary: false
+    strictFunctionCalls: false
+    dynamicCallOnStaticMethod: false
+    illegalConstructorMethodCall: false
 
 # Add the schema from phpstan-strict-rules so it's available without loading the extension
 # and the above configuration works.
@@ -48,4 +56,12 @@ parametersSchema:
     switchConditionsMatchingType: anyOf(bool(), arrayOf(bool()))
     noVariableVariables: anyOf(bool(), arrayOf(bool()))
     strictArrayFilter: anyOf(bool(), arrayOf(bool()))
+    booleansInLoopConditions: anyOf(bool(), arrayOf(bool()))
+    disallowedBacktick: anyOf(bool(), arrayOf(bool()))
+    disallowedEmpty: anyOf(bool(), arrayOf(bool()))
+    disallowedImplicitArrayCreation: anyOf(bool(), arrayOf(bool()))
+    disallowedShortTernary: anyOf(bool(), arrayOf(bool()))
+    strictFunctionCalls: anyOf(bool(), arrayOf(bool()))
+    dynamicCallOnStaticMethod: anyOf(bool(), arrayOf(bool()))
+    illegalConstructorMethodCall: anyOf(bool(), arrayOf(bool()))
   ])

phpstan.neon.dist

@@ -19,7 +19,5 @@ parameters:
     - WP_DEBUG_LOG
     - WP_DEBUG_DISPLAY
   ignoreErrors:
-    - message: '#Dynamic call to static method#'
-      path: 'tests/tests'
   strictRules:
     strictCalls: true

src/Context/FeatureContext.php

@@ -872,7 +872,8 @@ public function __construct() {
 		if ( getenv( 'WP_CLI_TEST_DBTYPE' ) ) {
 			$this->variables['DB_TYPE'] = getenv( 'WP_CLI_TEST_DBTYPE' );
 		} else {
-			$this->variables['DB_TYPE'] = 'mysql';
+			// Auto-detect database type if not explicitly set
+			$this->variables['DB_TYPE'] = Utils\get_db_type();
 		}
 
 		if ( getenv( 'MYSQL_TCP_PORT' ) ) {
@@ -1210,7 +1211,7 @@ private function set_cache_dir(): void {
 	 * Run a MySQL command with `$db_settings`.
 	 *
 	 * @param string                $sql_cmd      Command to run.
-	 * @param array<string, string> $assoc_args   Optional. Associative array of options. Default empty.
+	 * @param array<string, string|bool> $assoc_args   Optional. Associative array of options. Default empty.
 	 * @param bool                  $add_database Optional. Whether to add dbname to the $sql_cmd. Default false.
 	 * @return array{stdout: string, stderr: string, exit_code: int}
 	 */
@@ -1243,8 +1244,9 @@ public function create_db(): void {
 			return;
 		}
 
-		$dbname = self::$db_settings['dbname'];
-		self::run_sql( self::$mysql_binary . ' --no-defaults', [ 'execute' => "CREATE DATABASE IF NOT EXISTS $dbname" ] );
+		$dbname   = self::$db_settings['dbname'];
+		$ssl_flag = 'mariadb' === self::$db_type ? ' --ssl-verify-server-cert' : '';
+		self::run_sql( self::$mysql_binary . ' --no-defaults' . $ssl_flag, [ 'execute' => "CREATE DATABASE IF NOT EXISTS $dbname" ] );
 	}
 
 	/**
@@ -1255,8 +1257,9 @@ public function test_connection(): void {
 			return;
 		}
 
+		$ssl_flag   = 'mariadb' === self::$db_type ? ' --ssl-verify-server-cert' : '';
 		$sql_result = self::run_sql(
-			self::$mysql_binary . ' --no-defaults',
+			self::$mysql_binary . ' --no-defaults' . $ssl_flag,
 			[
 				'execute'       => 'SELECT 1',
 				'send_to_shell' => false,
@@ -1282,13 +1285,14 @@ public function drop_db(): void {
 		if ( 'sqlite' === self::$db_type ) {
 			return;
 		}
-		$dbname = self::$db_settings['dbname'];
-		self::run_sql( self::$mysql_binary . ' --no-defaults', [ 'execute' => "DROP DATABASE IF EXISTS $dbname" ] );
+		$dbname   = self::$db_settings['dbname'];
+		$ssl_flag = 'mariadb' === self::$db_type ? ' --ssl-verify-server-cert' : '';
+		self::run_sql( self::$mysql_binary . ' --no-defaults' . $ssl_flag, [ 'execute' => "DROP DATABASE IF EXISTS $dbname" ] );
 	}
 
 	/**
 	 * @param string $command
-	 * @param array<string, string> $assoc_args
+	 * @param array<string, mixed> $assoc_args
 	 * @param string $path
 	 * @return Process
 	 */
@@ -1590,7 +1594,8 @@ public function install_wp( $subdir = '', $version = '' ): void {
 			if ( 'sqlite' === self::$db_type ) {
 				copy( "{$install_cache_path}.sqlite", "$run_dir/wp-content/database/.ht.sqlite" );
 			} else {
-				self::run_sql( self::$mysql_binary . ' --no-defaults', [ 'execute' => "source {$install_cache_path}.sql" ], true /*add_database*/ );
+				$ssl_flag = 'mariadb' === self::$db_type ? ' --ssl-verify-server-cert' : '';
+				self::run_sql( self::$mysql_binary . ' --no-defaults' . $ssl_flag, [ 'execute' => "source {$install_cache_path}.sql" ], true /*add_database*/ );
 			}
 		} else {
 			$this->proc( 'wp core install', $install_args, $subdir )->run_check();
@@ -1604,7 +1609,8 @@ public function install_wp( $subdir = '', $version = '' ): void {
 				$mysqldump_binary          = Utils\force_env_on_nix_systems( $mysqldump_binary );
 				$help_output               = shell_exec( "{$mysqldump_binary} --help" );
 				$support_column_statistics = false !== strpos( $help_output, 'column-statistics' );
-				$command                   = "{$mysqldump_binary} --no-defaults --no-tablespaces";
+				$ssl_flag                  = 'mariadb' === self::$db_type ? ' --ssl-verify-server-cert' : '';
+				$command                   = "{$mysqldump_binary} --no-defaults{$ssl_flag} --no-tablespaces";
 				if ( $support_column_statistics ) {
 					$command .= ' --skip-column-statistics';
 				}

src/PHPStan/WPCliRuncommandDynamicReturnTypeExtension.php

@@ -39,11 +39,8 @@ public function getTypeFromStaticMethodCall(
 	): Type {
 		$args = $methodCall->getArgs();
 
-		/** @var ConstantBooleanType|ConstantStringType $returnOption */
-		$returnOption = new ConstantBooleanType( true );
-		/** @var ConstantBooleanType|ConstantStringType $parseOption */
-		$parseOption = new ConstantBooleanType( false );
-		/** @var ConstantBooleanType $exitOnErrorOption */
+		$returnOption      = new ConstantBooleanType( true );
+		$parseOption       = new ConstantBooleanType( false );
 		$exitOnErrorOption = new ConstantBooleanType( true );
 
 		$optionsAreStaticallyKnown = true;