Merge pull request #875 from kukulich/phpstorm2

Fixed parsing of `PhpStormStubsElementAvailable` in `PhpStormStubsSourceStubber` to comply with stubs declared PHP version
Roave · Nov 23, 2021 · bba7bac · bba7bac
2 parents a89d21d + 6961a5d
commit bba7bac
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/SourceLocator/SourceStubber/PhpStormStubsSourceStubber.php b/src/SourceLocator/SourceStubber/PhpStormStubsSourceStubber.php
@@ -507,7 +507,7 @@ private function getSupportedPhpVersions(
 
                         assert($attributeArg->value instanceof Node\Scalar\String_);
 
-                        $toVersion = $this->parsePhpVersion($attributeArg->value->value);
+                        $toVersion = $this->parsePhpVersion($attributeArg->value->value, 99);
                     }
                 }
             }
@@ -516,11 +516,11 @@ private function getSupportedPhpVersions(
         return [$fromVersion, $toVersion];
     }
 
-    private function parsePhpVersion(string $version): int
+    private function parsePhpVersion(string $version, int $defaultPatch = 0): int
     {
         $parts = array_map('intval', explode('.', $version));
 
-        return $parts[0] * 10000 + $parts[1] * 100 + ($parts[2] ?? 0);
+        return $parts[0] * 10000 + $parts[1] * 100 + ($parts[2] ?? $defaultPatch);
     }
 
     private function getStubsDirectory(): string

diff --git a/test/unit/SourceLocator/SourceStubber/PhpStormStubsSourceStubberTest.php b/test/unit/SourceLocator/SourceStubber/PhpStormStubsSourceStubberTest.php
@@ -906,7 +906,7 @@ public function testFunctionInPhpVersion(string $functionName, ?int $phpVersion,
 
     public function testFunctionWithDifferentParameterInPhpVersion74(): void
     {
-        $sourceStubber            = new PhpStormStubsSourceStubber($this->phpParser, 70400);
+        $sourceStubber            = new PhpStormStubsSourceStubber($this->phpParser, 70499);
         $phpInternalSourceLocator = new PhpInternalSourceLocator($this->astLocator, $sourceStubber);
         $reflector                = new DefaultReflector($phpInternalSourceLocator);