Merge branch 'phpstan-local' into fix/incorrect-search-migration-927

Icinga · Nov 7, 2023 · fb0816a · fb0816a
2 parents de3e376 + 816d8d7
commit fb0816a
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 28 deletions.
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -735,11 +735,6 @@ parameters:
 			count: 1
 			path: application/controllers/MigrateController.php
 
-		-
-			message: "#^Parameter \\#1 \\$haystack of function strpos expects string, mixed given\\.$#"
-			count: 2
-			path: application/controllers/MigrateController.php
-
 		-
 			message: "#^Parameter \\#1 \\$url of static method Icinga\\\\Web\\\\Url\\:\\:fromPath\\(\\) expects string, mixed given\\.$#"
 			count: 2
@@ -750,16 +745,6 @@ parameters:
 			count: 3
 			path: application/controllers/MigrateController.php
 
-		-
-			message: "#^Parameter \\#2 \\$value of static method ipl\\\\Stdlib\\\\Filter\\:\\:like\\(\\) expects array\\<string\\>\\|string, mixed given\\.$#"
-			count: 1
-			path: application/controllers/MigrateController.php
-
-		-
-			message: "#^Parameter \\#2 \\$value of static method ipl\\\\Stdlib\\\\Filter\\:\\:unlike\\(\\) expects array\\<string\\>\\|string, mixed given\\.$#"
-			count: 1
-			path: application/controllers/MigrateController.php
-
 		-
 			message: "#^Method Icinga\\\\Module\\\\Icingadb\\\\Controllers\\\\NotificationsController\\:\\:completeAction\\(\\) has no return type specified\\.$#"
 			count: 1
@@ -2735,6 +2720,11 @@ parameters:
 			count: 1
 			path: library/Icingadb/Compat/UrlMigrator.php
 
+		-
+			message: "#^Method Icinga\\\\Module\\\\Icingadb\\\\Compat\\\\UrlMigrator\\:\\:commonParameters\\(\\) return type has no value type specified in iterable type array\\.$#"
+			count: 1
+			path: library/Icingadb/Compat/UrlMigrator.php
+
 		-
 			message: "#^Method Icinga\\\\Module\\\\Icingadb\\\\Compat\\\\UrlMigrator\\:\\:contactgroupsColumns\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
@@ -2770,6 +2760,11 @@ parameters:
 			count: 1
 			path: library/Icingadb/Compat/UrlMigrator.php
 
+		-
+			message: "#^Method Icinga\\\\Module\\\\Icingadb\\\\Compat\\\\UrlMigrator\\:\\:hostsParameters\\(\\) return type has no value type specified in iterable type array\\.$#"
+			count: 1
+			path: library/Icingadb/Compat/UrlMigrator.php
+
 		-
 			message: "#^Method Icinga\\\\Module\\\\Icingadb\\\\Compat\\\\UrlMigrator\\:\\:multipleHostsColumns\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
@@ -2811,33 +2806,28 @@ parameters:
 			path: library/Icingadb/Compat/UrlMigrator.php
 
 		-
-			message: "#^Method Icinga\\\\Module\\\\Icingadb\\\\Compat\\\\UrlMigrator\\:\\:transformWildcardFilter\\(\\) has no return type specified\\.$#"
+			message: "#^Method Icinga\\\\Module\\\\Icingadb\\\\Compat\\\\UrlMigrator\\:\\:servicesParameters\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
 			path: library/Icingadb/Compat/UrlMigrator.php
 
 		-
-			message: "#^Parameter \\#1 \\$column of method ipl\\\\Stdlib\\\\Filter\\\\Condition\\:\\:setColumn\\(\\) expects string, int\\|string\\|null given\\.$#"
+			message: "#^Method Icinga\\\\Module\\\\Icingadb\\\\Compat\\\\UrlMigrator\\:\\:transformParams\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1
 			path: library/Icingadb/Compat/UrlMigrator.php
 
 		-
-			message: "#^Parameter \\#1 \\$string of function strtolower expects string, mixed given\\.$#"
-			count: 2
-			path: library/Icingadb/Compat/UrlMigrator.php
-
-		-
-			message: "#^Parameter \\#2 \\$string of function explode expects string, mixed given\\.$#"
-			count: 2
+			message: "#^Method Icinga\\\\Module\\\\Icingadb\\\\Compat\\\\UrlMigrator\\:\\:transformWildcardFilter\\(\\) has no return type specified\\.$#"
+			count: 1
 			path: library/Icingadb/Compat/UrlMigrator.php
 
 		-
-			message: "#^Part \\$column \\(mixed\\) of encapsed string cannot be cast to string\\.$#"
+			message: "#^Parameter \\#1 \\$column of method ipl\\\\Stdlib\\\\Filter\\\\Condition\\:\\:setColumn\\(\\) expects string, int\\|string\\|null given\\.$#"
 			count: 1
 			path: library/Icingadb/Compat/UrlMigrator.php
 
 		-
-			message: "#^Part \\$dir \\(mixed\\) of encapsed string cannot be cast to string\\.$#"
-			count: 1
+			message: "#^Parameter \\#1 \\$string of function strtolower expects string, mixed given\\.$#"
+			count: 2
 			path: library/Icingadb/Compat/UrlMigrator.php
 
 		-

diff --git a/phpstan.neon b/phpstan.neon
@@ -12,8 +12,18 @@ parameters:
         - application
         - library
 
+    excludePaths:
+        - application/clicommands/*
+        - application/controllers/TestController.php
+        - application/views/scripts/test/*
+        - blub.json
+        - library/Icingadb/Model/Behavior/Faker.php
+        - library/Icingadb/Test/*
+        - public/css/themes/*
+        - public/js/ghost.js
+
     scanDirectories:
-        - vendor
+        - /vendor
 
     ignoreErrors:
         -