Merge branch 'main' into copilot/add-format-flag-to-update-commands

swissspidy · swissspidy · commit f293521fb160 · 2026-02-16T21:19:19.000+01:00
diff --git a/.github/workflows/code-quality.yml b/.github/workflows/code-quality.yml
@@ -6,6 +6,8 @@ on:
     branches:
       - main
       - master
+  schedule:
+     - cron: '17 2 * * *' # Run every day on a seemly random time.
 
 jobs:
   code-quality:
diff --git a/.github/workflows/copilot-setup-steps.yml b/.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
diff --git a/composer.json b/composer.json
@@ -12,7 +12,7 @@
         }
     ],
     "require": {
-        "wp-cli/wp-cli": "^2.12"
+        "wp-cli/wp-cli": "^2.13"
     },
     "require-dev": {
         "wp-cli/db-command": "^1.3 || ^2",
diff --git a/features/language-plugin.feature b/features/language-plugin.feature
@@ -19,7 +19,6 @@ Feature: Manage plugin translation files for a WordPress install
       | language  | english_name            | status        |
       | cs_CZ     | Czech                   | uninstalled   |
       | de_DE     | German                  | uninstalled   |
-      | en_US     | English (United States) | active        |
       | en_GB     | English (UK)            | uninstalled   |
 
     When I try `wp language plugin list not-a-plugin --format=json`
@@ -87,15 +86,13 @@ Feature: Manage plugin translation files for a WordPress install
       | language  | english_name            | status      |
       | cs_CZ     | Czech                   | installed   |
       | de_DE     | German                  | installed   |
-      | en_US     | English (United States) | active      |
       | en_GB     | English (UK)            | installed   |
 
     When I run `wp language plugin list hello-dolly --fields=language,english_name,update`
     Then STDOUT should be a table containing rows:
       | language  | english_name            | update   |
       | cs_CZ     | Czech                   | none     |
       | de_DE     | German                  | none     |
-      | en_US     | English (United States) | none     |
       | en_GB     | English (UK)            | none     |
 
     When I run `wp language plugin list hello-dolly --status=installed --format=count`
diff --git a/features/language-theme.feature b/features/language-theme.feature
@@ -16,7 +16,6 @@ Feature: Manage theme translation files for a WordPress install
       | language  | english_name            | status        |
       | cs_CZ     | Czech                   | uninstalled   |
       | de_DE     | German                  | uninstalled   |
-      | en_US     | English (United States) | active        |
       | en_GB     | English (UK)            | uninstalled   |
 
     When I try `wp language theme list not-a-theme --format=json`
@@ -85,7 +84,6 @@ Feature: Manage theme translation files for a WordPress install
       | cs_CZ     | Czech                   | installed   |
       | de_DE     | German                  | installed   |
       | en_GB     | English (UK)            | installed   |
-      | en_US     | English (United States) | active      |
 
     When I run `wp language theme list twentyten --fields=language,english_name,update`
     Then STDOUT should be a table containing rows:
@@ -119,7 +117,6 @@ Feature: Manage theme translation files for a WordPress install
       | language  | english_name            | status        |
       | cs_CZ     | Czech                   | installed     |
       | de_DE     | German                  | installed     |
-      | en_US     | English (United States) | installed     |
       | en_GB     | English (UK)            | active        |
 
     When I run `wp language theme uninstall twentyten cs_CZ de_DE`
diff --git a/phpcs.xml.dist b/phpcs.xml.dist
@@ -83,4 +83,7 @@
 		<exclude-pattern>*/src/Language_Namespace\.php$</exclude-pattern>
 	</rule>
 
+	<rule ref="WordPress.NamingConventions.PrefixAllGlobals">
+		<exclude-pattern>*/tests/phpstan</exclude-pattern>
+	</rule>
 </ruleset>
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -7,6 +7,7 @@ parameters:
     - vendor/wp-cli/wp-cli/php
   scanFiles:
     - vendor/php-stubs/wordpress-stubs/wordpress-stubs.php
+    - tests/phpstan/scan-files.php
   treatPhpDocTypesAsCertain: false
   strictRules:
     uselessCast: true
@@ -16,7 +17,4 @@ parameters:
     numericOperandsInArithmeticOperators: true
     switchConditionsMatchingType: true
   ignoreErrors:
-    - identifier: missingType.iterableValue
-    - identifier: missingType.property
-    - identifier: missingType.parameter
     - identifier: missingType.return
diff --git a/src/Core_Language_Command.php b/src/Core_Language_Command.php
@@ -398,6 +398,9 @@ public function activate( $args ) {
 		$this->activate_language( $language_code );
 	}
 
+	/**
+	 * @param string $language_code
+	 */
 	private function activate_language( $language_code ) {
 		$available = $this->get_installed_languages();
 
diff --git a/src/Plugin_Language_Command.php b/src/Plugin_Language_Command.php
@@ -263,15 +263,18 @@ public function install( $args, $assoc_args ) {
 		if ( $all ) {
 			$this->install_many( $args, $assoc_args );
 		} else {
+			/**
+			 * @var non-empty-list<string> $args
+			 */
 			$this->install_one( $args, $assoc_args );
 		}
 	}
 
 	/**
 	 * Installs translations for a plugin.
 	 *
-	 * @param array $args       Runtime arguments.
-	 * @param array $assoc_args Runtime arguments.
+	 * @param non-empty-list<string> $args Positional arguments.
+	 * @param array{all?: bool, format: string} $assoc_args Associative arguments.
 	 */
 	private function install_one( $args, $assoc_args ) {
 		$plugin         = array_shift( $args );
@@ -314,8 +317,8 @@ private function install_one( $args, $assoc_args ) {
 	/**
 	 * Installs translations for all installed plugins.
 	 *
-	 * @param array $args       Runtime arguments.
-	 * @param array $assoc_args Runtime arguments.
+	 * @param string[] $args Positional arguments.
+	 * @param array{all?: bool, format: string} $assoc_args Associative arguments.
 	 */
 	private function install_many( $args, $assoc_args ) {
 		$language_codes = (array) $args;
@@ -639,7 +642,7 @@ public function update( $args, $assoc_args ) {
 	 * Uses the same filter core uses in plugins.php to determine which plugins
 	 * should be available to manage through the WP_Plugins_List_Table class.
 	 *
-	 * @return array
+	 * @return array<string, array{Name: string}>
 	 */
 	private function get_all_plugins() {
 		// phpcs:ignore WordPress.NamingConventions.PrefixAllGlobals.NonPrefixedHooknameFound -- Using WP native hook.
diff --git a/src/Site_Switch_Language_Command.php b/src/Site_Switch_Language_Command.php
@@ -17,6 +17,9 @@ class Site_Switch_Language_Command extends WP_CLI\CommandWithTranslation {
 	 *     Success: Language activated.
 	 *
 	 * @throws WP_CLI\ExitException
+	 *
+	 * @param array{0: string} $args Positional arguments.
+	 * @param array<mixed> $assoc_args Associative arguments.
 	 */
 	public function __invoke( $args, $assoc_args ) {
 		list( $language_code ) = $args;
diff --git a/src/Theme_Language_Command.php b/src/Theme_Language_Command.php
@@ -268,15 +268,18 @@ public function install( $args, $assoc_args ) {
 		if ( $all ) {
 			$this->install_many( $args, $assoc_args );
 		} else {
+			/**
+			 * @var non-empty-list<string> $args
+			 */
 			$this->install_one( $args, $assoc_args );
 		}
 	}
 
 	/**
 	 * Installs translations for a theme.
 	 *
-	 * @param array $args       Runtime arguments.
-	 * @param array $assoc_args Runtime arguments.
+	 * @param non-empty-list<string> $args Positional arguments.
+	 * @param array{all?: bool, format: string} $assoc_args Associative arguments.
 	 */
 	private function install_one( $args, $assoc_args ) {
 		$theme          = array_shift( $args );
@@ -318,8 +321,8 @@ private function install_one( $args, $assoc_args ) {
 	/**
 	 * Installs translations for all installed themes.
 	 *
-	 * @param array $args       Runtime arguments.
-	 * @param array $assoc_args Runtime arguments.
+	 * @param string[] $args Positional arguments.
+	 * @param array{all?: bool, format: string} $assoc_args Associative arguments.
 	 */
 	private function install_many( $args, $assoc_args ) {
 		$language_codes = (array) $args;
diff --git a/src/WP_CLI/CommandWithTranslation.php b/src/WP_CLI/CommandWithTranslation.php
@@ -11,12 +11,21 @@
  * @package wp-cli
  */
 abstract class CommandWithTranslation extends WP_CLI_Command {
+	/**
+	 * @var string
+	 */
 	protected $obj_type;
 
+	/**
+	 * @var string[]
+	 */
 	protected $obj_fields;
 
 	/**
 	 * Callback to sort array by a 'language' key.
+	 *
+	 * @param array{language: string, english_name: string, native_name: string, updated: string} $a
+	 * @param array{language: string, english_name: string, native_name: string, updated: string} $b
 	 */
 	protected function sort_translations_callback( $a, $b ) {
 		return strnatcasecmp( $a['language'], $b['language'] );
@@ -129,6 +138,8 @@ public function update( $args, $assoc_args ) {
 					 */
 					$upgrader_instance = Utils\get_upgrader( $upgrader );
 
+					// Wrong docblock in core.
+					// @phpstan-ignore argument.type
 					$result = $upgrader_instance->upgrade( $update );
 
 					$results[] = $result;
@@ -195,7 +206,7 @@ public function update( $args, $assoc_args ) {
 	 *
 	 * @see wp_get_translation_updates()
 	 *
-	 * @return array
+	 * @return array<object{type: string, slug: string, language: string}&\stdClass>
 	 */
 	protected function get_translation_updates() {
 		$available = $this->get_installed_languages();
@@ -240,7 +251,7 @@ protected function get_translation_updates() {
 		$updates = array();
 
 		/**
-		 * @var object{translations: array} $transient
+		 * @var object{translations: list<array{type: string, slug: string, language: string}>} $transient
 		 */
 		$transient = get_site_transient( $transient );
 
@@ -252,6 +263,10 @@ protected function get_translation_updates() {
 			$updates[] = (object) $translation;
 		}
 
+		/**
+		 * @var array<object{type: string, slug: string, language: string}&\stdClass> $updates
+		 */
+
 		return $updates;
 	}
 
@@ -347,8 +362,12 @@ protected function get_installed_languages( $slug = 'default' ) {
 			}
 		}
 
-		$available   = ! empty( $available[ $text_domain ] ) ? array_keys( $available[ $text_domain ] ) : array();
-		$available[] = 'en_US';
+		$available = ! empty( $available[ $text_domain ] ) ? array_keys( $available[ $text_domain ] ) : array();
+		// en_US is always installed for core, but may not be available for plugins/themes,
+		// especially when custom translation sources are used.
+		if ( 'core' === $this->obj_type ) {
+			$available[] = 'en_US';
+		}
 
 		return $available;
 	}
@@ -414,6 +433,8 @@ protected function get_all_languages( $slug = null ) {
 	 *
 	 * @param array $assoc_args Parameters passed to command. Determines formatting.
 	 * @return Formatter
+	 *
+	 * @phpstan-ignore missingType.iterableValue
 	 */
 	protected function get_formatter( &$assoc_args ) {
 		return new Formatter( $assoc_args, $this->obj_fields, $this->obj_type );
diff --git a/src/WP_CLI/LanguagePackUpgrader.php b/src/WP_CLI/LanguagePackUpgrader.php
@@ -57,6 +57,8 @@ public function generic_strings() {
 	 * @param bool   $check_signatures Whether to validate file signatures. Default false.
 	 * @param array  $hook_extra       Extra arguments to pass to the filter hooks. Default empty array.
 	 * @return string|\WP_Error The full path to the downloaded package file, or a WP_Error object.
+	 *
+	 * @phpstan-ignore missingType.iterableValue
 	 */
 	public function download_package( $package, $check_signatures = false, $hook_extra = [] ) {
 
diff --git a/tests/phpstan/scan-files.php b/tests/phpstan/scan-files.php
@@ -0,0 +1,3 @@
+<?php
+
+define( 'WPINC', '' );

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`}`
`13`	`13`	`],`
`14`	`14`	`"require": {`
`15`		`- "wp-cli/wp-cli": "^2.12"`
	`15`	`+ "wp-cli/wp-cli": "^2.13"`
`16`	`16`	`},`
`17`	`17`	`"require-dev": {`
`18`	`18`	`"wp-cli/db-command": "^1.3 \|\| ^2",`
Original file line number	Diff line number	Diff line change
`@@ -398,6 +398,9 @@ public function activate( $args ) {`
`398`	`398`	`$this->activate_language( $language_code );`
`399`	`399`	`}`
`400`	`400`
	`401`	`+ /**`
	`402`	`+ * @param string $language_code`
	`403`	`+ */`
`401`	`404`	`private function activate_language( $language_code ) {`
`402`	`405`	`$available = $this->get_installed_languages();`
`403`	`406`