Merge branch 'release/0.2.0'

Jazz-Man · Nov 20, 2022 · a9f1a8d · a9f1a8d
2 parents e47a88a + 377a9e7
commit a9f1a8d
Show file tree

Hide file tree

Showing 11 changed files with 197 additions and 209 deletions.
diff --git a/composer.json b/composer.json
@@ -24,6 +24,7 @@
         "php": "^7.4|^8.1",
         "composer/installers": "^1|^2",
         "jazzman/autoload-interface": "^0.3.1",
+        "jazzman/singleton-trait": "^1.1",
         "jazzman/wp-app-config": "^2.3",
         "jazzman/wp-db-pdo": "^0.1.4"
     },
@@ -50,14 +51,12 @@
     },
     "description": "",
     "require-dev": {
-        "jazzman/php-cs-fixer-rules": "^0.1.2",
-        "phpmd/phpmd": "@stable",
-        "phpstan/extension-installer": "^1.1",
-        "rector/rector": "^0.14.5",
+        "jazzman/php-cs-fixer-rules": "^0.1.3",
+        "phpstan/extension-installer": "^1.2",
+        "rector/rector": "^0.14.8",
         "roave/security-advisories": "@dev",
-        "roots/wordpress": "^6.0",
-        "szepeviktor/phpstan-wordpress": "^1.1",
-        "vimeo/psalm": "^4.27"
+        "roots/wordpress": "^6.1",
+        "szepeviktor/phpstan-wordpress": "^1.1"
     },
     "scripts": {
         "rm-cache" : [

diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -1,5 +1,10 @@
 parameters:
 	ignoreErrors:
+		-
+			message: "#^Method JazzMan\\\\WpNavMenuCache\\\\MenuItems\\:\\:setMenuClasses\\(\\) should return array\\<string\\> but returns mixed\\.$#"
+			count: 1
+			path: src/MenuItems.php
+
 		-
 			message: "#^Parameter \\#2 \\$fetch_argument of method PDOStatement\\:\\:fetchAll\\(\\) expects \\(callable\\(\\)\\: mixed\\)\\|int\\|string, array given\\.$#"
 			count: 1

diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="4.27.0@faf106e717c37b8c81721845dba9de3d8deed8ff"/>
+<files psalm-version="4.x-dev@"/>
diff --git a/rector.php b/rector.php
@@ -33,15 +33,16 @@
     $config->cacheDirectory(__DIR__.'/cache/rector');
 
     $config->paths([
+        __DIR__,
         __DIR__.'/src',
-        __DIR__.'/wp-performance.php',
     ]);
 
     $config->skip(
         [
             // or fnmatch
             __DIR__.'/vendor',
             __DIR__.'/cache',
+            __DIR__.'/rector.php',
             CallableThisArrayToAnonymousFunctionRector::class,
             ClassConstantToSelfClassRector::class,
             RemoveExtraParametersRector::class,