Merge pull request #538 from fredden/psalm-baseline/tests/locate-from…

…-composer-runtime-api Fix Psalm complaint in LocateDefinedSymbolsFromComposerRuntimeApiTest
maglnet · Apr 1, 2024 · cc9b97b · cc9b97b
2 parents 8f3f3a7 + 5245abe
commit cc9b97b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 15 deletions.
diff --git a/baseline.xml b/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.1@8471a896ccea3526b26d082f4461eeea467f10a4">
   <file src="src/ComposerRequireChecker/Cli/CheckCommand.php">
     <MixedArgumentTypeCoercion>
       <code><![CDATA[(new ComposeGenerators())->__invoke(
@@ -59,10 +59,6 @@
       <code><![CDATA[json_decode($composerJson, true)]]></code>
       <code><![CDATA[json_decode($composerJson, true)]]></code>
     </MixedArgument>
-    <MixedInferredReturnType>
-      <code><![CDATA[Generator]]></code>
-      <code><![CDATA[Generator]]></code>
-    </MixedInferredReturnType>
   </file>
   <file src="test/ComposerRequireCheckerTest/DefinedSymbolsLocator/LocateDefinedSymbolsFromExtensionsTest.php">
     <ArgumentTypeCoercion>

diff --git a/...quireCheckerTest/DefinedSymbolsLocator/LocateDefinedSymbolsFromComposerRuntimeApiTest.php b/...quireCheckerTest/DefinedSymbolsLocator/LocateDefinedSymbolsFromComposerRuntimeApiTest.php
@@ -37,22 +37,24 @@ public function testInstalledVersionsSymbol(string $composerJson): void
         self::assertContains('Composer\InstalledVersions', $symbols);
     }
 
+    /** @return Generator<array-key, array<array-key, string>> */
     public static function provideComposerJsonWithUnsuitableComposerRuntimeApi(): Generator
     {
-        yield ['{ "require": { "composer-runtime-api": "^1.0" } }'];
-        yield ['{ "require": { "composer-runtime-api": "^1" } }'];
-        yield ['{ "require": { "composer-runtime-api": "~1" } }'];
-        yield ['{ "require": { "composer-runtime-api": "=1" } }'];
+        yield 'Caret major minor' => ['composerJson' => '{ "require": { "composer-runtime-api": "^1.0" } }'];
+        yield 'Caret major' => ['composerJson' => '{ "require": { "composer-runtime-api": "^1" } }'];
+        yield 'Tilde major' => ['composerJson' => '{ "require": { "composer-runtime-api": "~1" } }'];
+        yield 'Equal major' => ['composerJson' => '{ "require": { "composer-runtime-api": "=1" } }'];
     }
 
+    /** @return Generator<array-key, array<array-key, string>> */
     public static function provideComposerJsonWithSuitableComposerRuntimeApi(): Generator
     {
-        yield ['{ "require": { "composer-runtime-api": "^2.0" } }'];
-        yield ['{ "require": { "composer-runtime-api": "^2" } }'];
-        yield ['{ "require": { "composer-runtime-api": "~2" } }'];
-        yield ['{ "require": { "composer-runtime-api": ">=2" } }'];
-        yield ['{ "require": { "composer-runtime-api": "=2" } }'];
-        yield ['{ "require": { "composer-runtime-api": ">2" } }'];
+        yield 'Caret major minor' => ['composerJson' => '{ "require": { "composer-runtime-api": "^2.0" } }'];
+        yield 'Caret major' => ['composerJson' => '{ "require": { "composer-runtime-api": "^2" } }'];
+        yield 'Tilde major' => ['composerJson' => '{ "require": { "composer-runtime-api": "~2" } }'];
+        yield 'Greater equal major' => ['composerJson' => '{ "require": { "composer-runtime-api": ">=2" } }'];
+        yield 'Equal major' => ['composerJson' => '{ "require": { "composer-runtime-api": "=2" } }'];
+        yield 'Greater major' => ['composerJson' => '{ "require": { "composer-runtime-api": ">2" } }'];
     }
 
     /**