Merge branch '8.5' into 9.6

Author: sebastianbergmann

.phive/phars.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phive xmlns="https://phar.io/phive">
   <phar name="phpab" version="^1.29" installed="1.29.1" location="./tools/phpab" copy="true"/>
-  <phar name="php-cs-fixer" version="^3.53" installed="3.54.0" location="./tools/php-cs-fixer" copy="true"/>
-  <phar name="psalm" version="^5.23" installed="5.23.1" location="./tools/psalm" copy="true"/>
+  <phar name="php-cs-fixer" version="^3.53" installed="3.56.1" location="./tools/php-cs-fixer" copy="true"/>
+  <phar name="psalm" version="^5.23" installed="5.24.0" location="./tools/psalm" copy="true"/>
   <phar name="humbug/php-scoper" version="^0.18" installed="0.18.11" location="./tools/php-scoper" copy="true"/>
-  <phar name="composer" version="^2.7" installed="2.7.4" location="./tools/composer" copy="true"/>
+  <phar name="composer" version="^2.7" installed="2.7.6" location="./tools/composer" copy="true"/>
 </phive>

.psalm/baseline.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="5.23.0@005e3184fb6de4350a873b9b8c4dc3cede9db762">
+<files psalm-version="5.24.0@462c80e31c34e58cc4f750c656be3927e80e550e">
   <file src="src/Framework/Assert.php">
     <ArgumentTypeCoercion>
       <code><![CDATA[$actualElement->childNodes->item($i)]]></code>
@@ -1661,6 +1661,8 @@
     </RedundantCast>
     <RiskyTruthyFalsyComparison>
       <code><![CDATA[!preg_match_all(self::REGEX_DATA_PROVIDER, $docComment, $matches)]]></code>
+      <code><![CDATA[empty($matches['version'])]]></code>
+      <code><![CDATA[empty($requires[$matches['name']])]]></code>
       <code><![CDATA[preg_match_all('/@(?P<name>[A-Za-z_-]+)(?:[ \t]+(?P<value>.*?))?[ \t]*\r?$/m', $docBlock, $matches)]]></code>
     </RiskyTruthyFalsyComparison>
   </file>

src/Runner/PhptTestCase.php

@@ -345,7 +345,7 @@ private function parseEnvSection(string $content): array
         foreach (explode("\n", trim($content)) as $e) {
             $e = explode('=', trim($e), 2);
 
-            if (!empty($e[0]) && isset($e[1])) {
+            if ($e[0] !== '' && isset($e[1])) {
                 $env[$e[0]] = $e[1];
             }
         }