Merge branch '10.5' into 11.0

sebastianbergmann · Mar 10, 2024 · 9072431 · 9072431
2 parents d1c9957 + 5f6b731
commit 9072431
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/.phive/phars.xml b/.phive/phars.xml
@@ -2,7 +2,7 @@
 <phive xmlns="https://phar.io/phive">
   <phar name="phpab" version="^1.25" installed="1.29.0" location="./tools/phpab" copy="true"/>
   <phar name="php-cs-fixer" version="^3.0" installed="3.51.0" location="./tools/php-cs-fixer" copy="true"/>
-  <phar name="psalm" version="^5.0" installed="5.22.2" location="./tools/psalm" copy="true"/>
+  <phar name="psalm" version="^5.0" installed="5.23.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.0.3" installed="2.7.1" location="./tools/composer" copy="true"/>
 </phive>
diff --git a/.psalm/baseline.xml b/.psalm/baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="5.22.2@d768d914152dbbf3486c36398802f74e80cfde48">
+<files psalm-version="5.23.0@005e3184fb6de4350a873b9b8c4dc3cede9db762">
   <file src="src/Event/Dispatcher/DirectDispatcher.php">
     <UndefinedInterfaceMethod>
       <code><![CDATA[notify]]></code>
@@ -527,7 +527,6 @@
      * >]]></code>
     </InvalidReturnType>
     <RiskyTruthyFalsyComparison>
-      <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>

diff --git a/tools/psalm b/tools/psalm