Merge branch 'main' into php-8.4

Author: mathroc

composer.json

@@ -24,15 +24,15 @@
         "php": "^8.1"
     },
     "require-dev": {
-        "phpunit/phpunit": "^10.3",
+        "phpunit/phpunit": "^10.0|^11.0|^12.0",
         "phpspec/prophecy-phpunit": "^2.0",
         "squizlabs/php_codesniffer": "^3.6",
         "slevomat/coding-standard": "^8.0",
         "phpstan/phpstan": "^2.0",
         "phpstan/extension-installer": "^1.1",
         "phpstan/phpstan-strict-rules": "^2.0",
         "phpstan/phpstan-phpunit": "^2.0",
-        "vimeo/psalm": "^5.0",
+        "vimeo/psalm": "^6.0",
         "symfony/finder": "^6.0|^7.0",
         "symfony/console": "^6.0|^7.0",
         "texthtml/doctest": "^0.2"

psalm.xml

@@ -41,11 +41,6 @@
                 <directory name="tests/Unit" />
             </errorLevel>
         </RedundantCondition>
-        <RedundantConditionGivenDocblockType>
-            <errorLevel type="suppress">
-                <directory name="tests/Unit" />
-            </errorLevel>
-        </RedundantConditionGivenDocblockType>
         <TypeDoesNotContainType>
             <errorLevel type="suppress">
                 <directory name="tests/Unit" />
@@ -57,16 +52,6 @@
                 <directory name="tests/Provider" />
             </errorLevel>
         </InvalidReturnType>
-        <LessSpecificReturnStatement>
-            <errorLevel type="suppress">
-                <directory name="tests/Unit" />
-            </errorLevel>
-        </LessSpecificReturnStatement>
-        <MoreSpecificReturnType>
-            <errorLevel type="suppress">
-                <directory name="tests/Unit" />
-            </errorLevel>
-        </MoreSpecificReturnType>
         <NoValue>
             <errorLevel type="suppress">
                 <directory name="tests/Unit" />