Merge pull request #290 from cakephp/3.next-merge

merge 3.x => 3.next
cakephp · Sep 13, 2024 · b5c3b87 · b5c3b87
2 parents 92b0884 + 852f6bf
commit b5c3b87
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.phive/phars.xml b/.phive/phars.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phive xmlns="https://phar.io/phive">
-  <phar name="phpstan" version="1.10.56" installed="1.10.56" location="./tools/phpstan" copy="false"/>
-  <phar name="psalm" version="5.20.0" installed="5.20.0" location="./tools/psalm" copy="false"/>
+  <phar name="phpstan" version="1.11.9" installed="1.11.9" location="./tools/phpstan" copy="false"/>
+  <phar name="psalm" version="5.25.0" installed="5.25.0" location="./tools/psalm" copy="false"/>
 </phive>
diff --git a/phpstan.neon b/phpstan.neon
@@ -1,8 +1,8 @@
 parameters:
 	level: 6
-	checkMissingIterableValueType: false
-	checkGenericClassInNonGenericObjectType: false
 	treatPhpDocTypesAsCertain: false
 	paths:
 		- src/
 	ignoreErrors:
+			- identifier: missingType.generics
+			- identifier: missingType.iterableValue