fix

Author: staabm

src/Internal/ComposerHelper.php

@@ -23,6 +23,8 @@ final class ComposerHelper
 
 	private static ?string $betterReflectionVersion = null;
 
+	private static ?string $phpstomStubsVersion = null;
+
 	private static ?string $phpDocParserVersion = null;
 
 	/** @var array<string, mixed[]> */
@@ -124,6 +126,21 @@ public static function getBetterReflectionVersion(): string
 		return self::$betterReflectionVersion = self::processPackageVersion($rootPackage);
 	}
 
+	public static function getPhpStormStubsVersion(): string
+	{
+		if (self::$phpstomStubsVersion !== null) {
+			return self::$phpstomStubsVersion;
+		}
+
+		$installed = self::getInstalled();
+		$rootPackage = $installed['versions']['jetbrains/phpstorm-stubs'] ?? null;
+		if ($rootPackage === null) {
+			return self::$phpstomStubsVersion = self::UNKNOWN_VERSION;
+		}
+
+		return self::$phpstomStubsVersion = self::processPackageVersion($rootPackage);
+	}
+
 	public static function getPhpDocParserVersion(): string
 	{
 		if (self::$phpDocParserVersion !== null) {

src/Reflection/BetterReflection/SourceLocator/PhpVersionBlacklistSourceLocator.php

@@ -15,7 +15,7 @@ final class PhpVersionBlacklistSourceLocator implements SourceLocator
 {
 
 	public function __construct(
-		private SourceLocator                                               $sourceLocator,
+		private SourceLocator $sourceLocator,
 		private PhpStormStubsSourceStubber|CachedPhpStormStubsSourceStubber $phpStormStubsSourceStubber,
 	)
 	{

src/Reflection/BetterReflection/SourceStubber/CachedPhpStormStubsSourceStubber.php

@@ -32,13 +32,14 @@ public function __construct(
 	 */
 	private function getCacheKeys(): array
 	{
-		$stubsVersion = 'dev-master#5fd9e4ef2b4c2a00848ea62d78bf3aa81f43e038';
-		$cacheKey = 'phpstorm-stubs';
-		$variableCacheKey = sprintf('v1-%s-%s-%s', ComposerHelper::getBetterReflectionVersion(), $this->phpVersion->getVersionString(), $stubsVersion);
+		$stubsVersion = ComposerHelper::getPhpStormStubsVersion();
+		$cacheKey = sprintf('phpstorm-stubs-%s', $stubsVersion);
+		$variableCacheKey = sprintf('v1-%s-%s', ComposerHelper::getBetterReflectionVersion(), $this->phpVersion->getVersionString());
 
 		return [$cacheKey, $variableCacheKey];
 	}
 
+	#[\Override]
 	public function generateClassStub(string $className): ?StubData
 	{
 		$this->cached['classes'] ??= [];
@@ -49,6 +50,7 @@ public function generateClassStub(string $className): ?StubData
 		return $this->cached['classes'][$className];
 	}
 
+	#[\Override]
 	public function generateFunctionStub(string $functionName): ?StubData
 	{
 		$this->cached['functions'] ??= [];
@@ -59,6 +61,7 @@ public function generateFunctionStub(string $functionName): ?StubData
 		return $this->cached['functions'][$functionName];
 	}
 
+	#[\Override]
 	public function generateConstantStub(string $constantName): ?StubData
 	{
 		$this->cached['constants'] ??= [];