Merge branch 'release/3.5.1'

# Conflicts:
#	psalm-baseline.xml
#	src/Optimization/Enqueue.php

Author: Jazz-Man

composer.json

@@ -26,16 +26,16 @@
         "composer/installers": "^2.2",
         "jazzman/autoload-interface": "^0.3.1",
         "jazzman/wp-app-config": "^2.3",
-        "jazzman/wp-db-pdo": "^0.1.5"
+        "jazzman/wp-db-pdo": "^0.1.6"
     },
     "require-dev": {
         "jazzman/php-cs-fixer-rules": "^0.2.1",
-        "jetbrains/phpstorm-attributes": "@dev",
-        "php-stubs/wordpress-stubs": "^6.3",
-        "phpstan/extension-installer": "^1.3",
-        "rector/rector": "^0.17.13",
+        "jetbrains/phpstorm-attributes": "^1.2",
+        "php-stubs/wordpress-stubs": "^6.7",
+        "phpstan/extension-installer": "^1.4",
+        "rector/rector": "^1.2",
         "roave/security-advisories": "@dev",
-        "roots/wordpress": "^6.3",
+        "roots/wordpress": "^6.7",
         "szepeviktor/phpstan-wordpress": "^1.3"
     },
     "autoload": {

phpstan-baseline.neon

@@ -26,7 +26,7 @@ parameters:
 			path: src/Optimization/Update.php
 
 		-
-			message: "#^PHPDoc tag @var with type array\\<int\\> is not subtype of native type mixed\\.$#"
+			message: "#^Parameter \\#1 \\$maybeint of function absint expects array\\|bool\\|float\\|int\\|resource\\|string\\|null, mixed given\\.$#"
 			count: 2
 			path: src/Optimization/WPQuery.php
 

phpstan-rector.neon

@@ -1,3 +1,3 @@
 includes:
-    - phar://vendor/rector/vendor/phpstan/phpstan.phar/conf/bleedingEdge.neon
+    - phar://vendor/phpstan/phpstan/phpstan.phar/conf/bleedingEdge.neon
     - phpstan.neon.dist

psalm.xml

@@ -20,39 +20,6 @@
         </ignoreFiles>
     </projectFiles>
 
-    <issueHandlers>
-        <TooManyArguments>
-            <errorLevel type="suppress">
-                <referencedFunction name="apply_filters"/>
-            </errorLevel>
-        </TooManyArguments>
-        <MissingClosureParamType>
-            <errorLevel type="suppress">
-                <directory name="src"/>
-            </errorLevel>
-        </MissingClosureParamType>
-        <MixedReturnStatement>
-            <errorLevel type="suppress">
-                <file name="src/helper.php"/>
-            </errorLevel>
-        </MixedReturnStatement>
-        <MixedArgumentTypeCoercion>
-            <errorLevel type="suppress">
-                <file name="src/Optimization/Update.php"/>
-            </errorLevel>
-        </MixedArgumentTypeCoercion>
-        <MissingFile>
-            <errorLevel type="suppress">
-                <file name="src/Optimization/Update.php"/>
-            </errorLevel>
-        </MissingFile>
-        <DuplicateFunction>
-            <errorLevel type="suppress">
-                <file name="src/helper.php"/>
-            </errorLevel>
-        </DuplicateFunction>
-    </issueHandlers>
-
     <stubs>
         <file name="vendor/php-stubs/wordpress-stubs/wordpress-stubs.php" preloadClasses="true"/>
     </stubs>
@@ -62,5 +29,7 @@
         <var name="wp_rewrite" type="\WP_Rewrite"/>
         <var name="wp_version" type="string"/>
         <var name="ABSPATH" type="string"/>
+        <var name="WPINC" type="string"/>
+        <var name="SCRIPT_DEBUG" type="boolean"/>
     </globals>
 </psalm>

rector.php

@@ -2,7 +2,6 @@
 
 declare( strict_types=1 );
 
-use Rector\CodeQuality\Rector\Array_\CallableThisArrayToAnonymousFunctionRector;
 use Rector\CodeQuality\Rector\Empty_\SimplifyEmptyCheckOnEmptyArrayRector;
 use Rector\CodingStyle\Rector\Encapsed\EncapsedStringsToSprintfRector;
 use Rector\Config\RectorConfig;
@@ -11,8 +10,6 @@
 use Rector\Set\ValueObject\SetList;
 use Rector\Strict\Rector\Empty_\DisallowedEmptyRuleFixerRector;
 
-// use Rector\TypeDeclaration\Rector\ClassMethod\ArrayShapeFromConstantArrayReturnRector;
-
 return static function ( RectorConfig $config ): void {
     $config->sets( [
         SetList::CODE_QUALITY,
@@ -29,7 +26,6 @@
     $config->removeUnusedImports();
     $config->importShortClasses( false );
     $config->parallel();
-    //    $config->cacheDirectory(__DIR__.'/cache/rector');
     $config->phpstanConfig( __DIR__.'/phpstan-rector.neon' );
 
     $config->paths( [
@@ -40,12 +36,9 @@
     $config->skip( [
         __DIR__.'/vendor',
         __DIR__.'/cache',
-        CallableThisArrayToAnonymousFunctionRector::class,
-        //        ClassConstantToSelfClassRector::class,
         RemoveExtraParametersRector::class,
         EncapsedStringsToSprintfRector::class,
         DisallowedEmptyRuleFixerRector::class,
         SimplifyEmptyCheckOnEmptyArrayRector::class,
-        //	    ArrayShapeFromConstantArrayReturnRector::class,
     ] );
 };

src/Optimization/Update.php

@@ -420,6 +420,7 @@ private static function preSiteTransientUpdatePlugins(): object {
         if ( null === $pluginsList ) {
             // Add our plugin file if we don't have it.
             if ( ! \function_exists( 'get_plugins' ) ) {
+                /** @psalm-suppress MissingFile */
                 require_once ABSPATH.'wp-admin/includes/plugin.php';
             }