Upgraded phpstan from v1 to v2

Author: ajaydsouza

composer.json

@@ -19,9 +19,9 @@
         }
     ],
     "require-dev": {
-        "szepeviktor/phpstan-wordpress": "^1",
+        "szepeviktor/phpstan-wordpress": "^2",
         "phpstan/extension-installer": "^1",
-        "phpstan/phpstan": "^1",
+        "phpstan/phpstan": "^2",
         "php-stubs/wordpress-stubs": "^6",
         "wp-coding-standards/wpcs": "^3",
         "dealerdirect/phpcodesniffer-composer-installer": "^1",
@@ -59,4 +59,4 @@
         ],
         "zip": "mkdir -p build && zip -X -r build/$(basename $(pwd)).zip . -x '*.git*' 'node_modules/*' '.*' '*/.git*' '*/.DS_Store' 'vendor/**/.DS_Store' 'vendor/bin/*' 'CODE_OF_CONDUCT.md' 'CONTRIBUTING.md' 'ISSUE_TEMPLATE.md' 'PULL_REQUEST_TEMPLATE.md' 'CLAUDE.md' '*.dist' '*.yml' '*.neon' 'composer.*' 'package.json' 'package-lock.json' 'dev-helpers**' 'build**' 'wporg-assets**' 'test-tools**' 'docs/*' 'phpunit**' 'phpstan-bootstrap.php' 'phpcompat-tools**'"
     }
-}
+}

includes/admin/class-settings-wizard.php

@@ -166,7 +166,7 @@ public function process_step() {
 		}
 
 		$this->current_step = $this->get_current_step();
-		$action             = isset( $_POST['wizard_action'] ) ? sanitize_text_field( wp_unslash( $_POST['wizard_action'] ) ) : ''; // phpcs:ignore WordPress.Security.NonceVerification.Missing
+		$action             = sanitize_text_field( wp_unslash( $_POST['wizard_action'] ) ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
 
 		switch ( $action ) {
 			case 'next_step':

includes/admin/class-settings.php

@@ -832,7 +832,7 @@ private function validate_freemius_plugins_for_save( array $settings ): array {
 		}
 
 		return array(
-			'plugins' => array_values( $persisted_plugins ),
+			'plugins' => $persisted_plugins,
 			'errors'  => $errors,
 		);
 	}

includes/admin/settings/class-settings-api.php

@@ -728,11 +728,7 @@ public function settings_defaults() {
 			}
 		}
 
-		$upgraded_settings = $this->upgraded_settings;
-
-		if ( false !== $upgraded_settings ) {
-			$options = array_merge( $options, $upgraded_settings );
-		}
+		$options = array_merge( $options, $this->upgraded_settings );
 
 		/**
 		 * Filters the default settings array.

includes/admin/settings/class-settings-sanitize.php

@@ -288,7 +288,7 @@ public function sanitize_sensitive_field( $value, $key ) {
 	/**
 	 * Sanitize repeater field.
 	 *
-	 * @param array $value Array of repeater values.
+	 * @param mixed $value Array of repeater values (may be non-array from form data).
 	 * @param array $field Field configuration array.
 	 * @return array Sanitized array
 	 */
@@ -418,7 +418,7 @@ public static function str_putcsv( $input_array, $delimiter = ',', $enclosure =
 						break;
 					// Make sure sprintf has a good datatype to work with.
 					case 'integer':
-						$sp_format = '%i';
+						$sp_format = '%d';
 						break;
 					case 'double':
 						$sp_format = '%0.2f';

includes/admin/settings/class-settings-wizard-api.php

@@ -341,7 +341,7 @@ public function process_step() {
 		// Initialise the current step based on the URL or stored option before processing the action.
 		$this->current_step = $this->get_current_step();
 
-		$action = isset( $_POST['wizard_action'] ) ? sanitize_text_field( wp_unslash( $_POST['wizard_action'] ) ) : '';
+		$action = sanitize_text_field( wp_unslash( $_POST['wizard_action'] ) );
 
 		switch ( $action ) {
 			case 'next_step':

includes/admin/settings/js/settings-admin-scripts.min.js

@@ -76,10 +76,7 @@ public function maybe_delete_credentials( $error, $client_id ): void {
 			return;
 		}
 
-		$code = 0;
-		if ( $error instanceof \WP_Error ) {
-			$code = (int) $error->get_error_data( 'convertkit_api_error' );
-		}
+		$code = (int) $error->get_error_data( 'convertkit_api_error' );
 
 		// Only count confirmed invalid token responses.
 		if ( 401 !== $code ) {

includes/kit/class-kit-credential-hooks.php

@@ -36,20 +36,17 @@ class Hook_Registry {
 	 *
 	 * @return bool True if registered, false if duplicate or invalid hook.
 	 */
-	public static function register( $hook_type, $hook_name, $callback, $priority = 10, $args = 1 ) {
+	public static function register( string $hook_type, string $hook_name, callable $callback, int $priority = 10, int $args = 1 ): bool {
 		if ( ! in_array( $hook_type, array( 'action', 'filter' ), true ) ) {
 			return false;
 		}
-		if ( ! is_string( $hook_name ) || empty( trim( $hook_name ) ) ) {
+		if ( empty( trim( $hook_name ) ) ) {
 			return false;
 		}
-		if ( ! is_callable( $callback ) ) {
+		if ( $priority < 0 ) {
 			return false;
 		}
-		if ( ! is_int( $priority ) || $priority < 0 ) {
-			return false;
-		}
-		if ( ! is_int( $args ) || $args < 1 ) {
+		if ( $args < 1 ) {
 			return false;
 		}
 

includes/util/class-hook-registry.php

@@ -27,14 +27,14 @@
         "phpstan-baseline.neon"
     ],
     "devDependencies": {
-        "@wordpress/prettier-config": "^4.40.0",
+        "@wordpress/prettier-config": "^4.42.0",
         "@wordpress/scripts": "^31",
         "clean-css-cli": "^5.6.3",
         "rtlcss": "^4.3.0",
-        "terser": "^5.46.0"
+        "terser": "^5.46.1"
     },
     "dependencies": {
-        "@wordpress/icons": "^11.7.0",
+        "@wordpress/icons": "^12.0.0",
         "clsx": "^2.1.1",
         "uuid": "^13.0.0"
     }