Merge branch '2.x' into 3.x

.github/workflows/cs.yml

@@ -65,7 +65,7 @@ jobs:
         with:
           php-version: '7.4'
           coverage: none
-          tools: phpstan:1.x
+          tools: phpstan:2.x
 
       # Install dependencies and handle caching in one go.
       # Dependencies need to be installed to make sure the PHPUnit classes are recognized.

phpstan.neon.dist

@@ -31,6 +31,34 @@ parameters:
 			count: 2
 			path: src/Polyfills/ExpectUserDeprecation.php
 
+		# Level 4
+		# This is part of the functionality of this package. Safe to ignore.
+		-
+			message: "`^Call to function method_exists\\(\\) with 'PHPUnit\\W+Framework\\W+(TestCase|Assert)' and '(assert|expect|equalTo)[^']+' will always evaluate to true\\.$`"
+			count: 10
+			path: phpunitpolyfills-autoload.php
+		-
+			message: "`^Call to function method_exists\\(\\) with 'PHPUnit\\W+Framework\\W+TestCase' and 'expectDeprecationMe[^']+' will always evaluate to true\\.$`"
+			count: 4
+			path: src/Polyfills/ExpectUserDeprecation.php
+		-
+			message: "`^Call to function method_exists\\(\\) with 'PHPUnit\\W+Framework\\W+Assert' and 'assertIsArray' will always evaluate to true\\.$`"
+			count: 2
+			path: src/Polyfills/AssertIsList.php
+
+		-
+			message: '`^Call to static method PHPUnit\\Framework\\Assert::assertIsArray\(\) with mixed and mixed will always evaluate to false\.$`'
+			count: 2
+			path: src/Polyfills/AssertIsList.php
+
+		# The traits are functionality, but not used by the package itself. Can't be helped.
+		-
+			identifier: trait.unused
+			path: src/TestListeners/TestListenerDefaultImplementationPHPUnit6.php
+		-
+			identifier: trait.unused
+			path: src/TestListeners/TestListenerSnakeCaseMethods.php
+
 		# Level 5
 		-
 			# False positive, a string callback is perfectly fine, especially for static methods.