More improvements

Author: swissspidy

composer.json

@@ -20,7 +20,7 @@
         "wp-cli/extension-command": "^1.2 || ^2",
         "wp-cli/media-command": "^1.1 || ^2",
         "wp-cli/super-admin-command": "^1 || ^2",
-        "wp-cli/wp-cli-tests": "dev-main"
+        "wp-cli/wp-cli-tests": "dev-add/phpstan-enhancements"
     },
     "config": {
         "process-timeout": 7200,

phpstan.neon.dist

@@ -1,5 +1,5 @@
 parameters:
-  level: 6
+  level: 9
   paths:
     - src
     - entity-command.php
@@ -9,10 +9,6 @@ parameters:
   scanFiles:
     - vendor/php-stubs/wordpress-stubs/wordpress-stubs.php
   treatPhpDocTypesAsCertain: false
-  dynamicConstantNames:
-  	- WP_DEBUG
-  	- WP_DEBUG_LOG
-  	- WP_DEBUG_DISPLAY
   ignoreErrors:
     - identifier: missingType.iterableValue
     - identifier: missingType.property

src/Comment_Command.php

@@ -387,7 +387,12 @@ public function list_( $args, $assoc_args ) {
 			 * @var int $comments
 			 */
 			echo $comments;
+			return;
 		} else {
+			/**
+			 * @var array $comments
+			 */
+
 			if ( 'ids' === $formatter->format ) {
 				/**
 				 * @var \WP_Comment[] $comments

src/Comment_Meta_Command.php

@@ -104,7 +104,8 @@ protected function delete_metadata( $object_id, $meta_key, $meta_value = '' ) {
 	/**
 	 * Check that the comment ID exists
 	 *
-	 * @param int $object_id
+	 * @param string|int $object_id
+	 * @return int|never
 	 */
 	protected function check_object_id( $object_id ) {
 		$fetcher = new CommentFetcher();

src/Option_Command.php

@@ -241,6 +241,9 @@ public function add( $args, $assoc_args ) {
 	 *     Success: Deleted 'theme_mods_twentyfourteen' option.
 	 *
 	 * @subcommand list
+	 *
+	 * @param string[] $args Positional arguments. Unused.
+	 * @param array{search?: string, exclude: string, autoload: string, transients?: bool, unserialize?: bool, field?: string, fields: string, format: 'table'|'csv'|'json'|'yaml'|'count'|'total_bytes', orderby: 'option_id'|'option_name'|'option_value', order: 'asc'|'desc'} $assoc_args Associative arguments.
 	 */
 	public function list_( $args, $assoc_args ) {
 

src/Post_Command.php

@@ -974,6 +974,9 @@ private function get_category_ids( $arg ) {
 	 * @return array
 	 */
 	private function get_metadata( $post_id ) {
+		/**
+		 * @var array<string, array<string>> $metadata
+		 */
 		$metadata = get_metadata( 'post', $post_id );
 		$items    = [];
 		foreach ( $metadata as $key => $values ) {

src/Post_Meta_Command.php

@@ -30,7 +30,8 @@ class Post_Meta_Command extends CommandWithMeta {
 	/**
 	 * Check that the post ID exists
 	 *
-	 * @param int $object_id
+	 * @param string|int $object_id
+	 * @return int|never
 	 */
 	protected function check_object_id( $object_id ) {
 		$fetcher = new PostFetcher();

src/Site_Command.php

@@ -164,8 +164,8 @@ private function insert_default_terms() {
 		/* translators: Default category slug */
 		$cat_slug = sanitize_title( _x( 'Uncategorized', 'Default category slug' ) );
 
-		// phpcs:ignore WordPress.WP.DeprecatedFunctions.global_terms_enabledFound -- Required for backwards compatibility.
-		if ( global_terms_enabled() ) {
+		// @phpstan-ignore function.deprecated
+		if ( global_terms_enabled() ) { // phpcs:ignore WordPress.WP.DeprecatedFunctions.global_terms_enabledFound -- Required for backwards compatibility.
 			$cat_id = $wpdb->get_var( $wpdb->prepare( "SELECT cat_ID FROM {$wpdb->sitecategories} WHERE category_nicename = %s", $cat_slug ) );
 			if ( null === $cat_id ) {
 				$wpdb->insert(

src/Site_Meta_Command.php

@@ -30,7 +30,8 @@ class Site_Meta_Command extends CommandWithMeta {
 	/**
 	 * Check that the site ID exists
 	 *
-	 * @param int $object_id
+	 * @param string|int $object_id
+	 * @return int|never
 	 */
 	protected function check_object_id( $object_id ) {
 		$fetcher = new SiteFetcher();

src/Term_Meta_Command.php

@@ -29,10 +29,11 @@ class Term_Meta_Command extends CommandWithMeta {
 	/**
 	 * Check that the term ID exists
 	 *
-	 * @param int $object_id
+	 * @param string|int $object_id
+	 * @return int|never
 	 */
 	protected function check_object_id( $object_id ) {
-		$term = get_term( $object_id );
+		$term = get_term( (int) $object_id );
 		if ( ! $term || is_wp_error( $term ) ) {
 			WP_CLI::error( "Could not find the term with ID {$object_id}." );
 		}