Update BetterReflection to version that uses PHPStan namespace

Author: ondrejmirtes

build/baseline-7.4.neon

@@ -93,6 +93,6 @@ parameters:
 count: 1
 path: ../src/Reflection/ReflectionProvider/SetterReflectionProviderProvider.php
 -
-message: "#^Class class@anonymous/src/Testing/TestCase\\.php\\:268 has an uninitialized property \\$reflectionProvider\\. Give it default value or assign it in the constructor\\.$#"
+message: "#^Class class@anonymous/src/Testing/TestCase\\.php\\:267 has an uninitialized property \\$reflectionProvider\\. Give it default value or assign it in the constructor\\.$#"
 count: 1
 path: ../src/Testing/TestCase.php

compiler/build/scoper.inc.php

@@ -121,10 +121,6 @@ function (string $filePath, string $prefix, string $content): string {
 return $class;
 }
 
-if (strpos($class, 'Roave\\BetterReflection\\') === 0) {
-return $class;
-}
-
 if (strpos($class, '@') === 0) {
 return $class;
 }
@@ -217,7 +213,6 @@ function (string $filePath, string $prefix, string $content): string {
 'PHPStan\*',
 'PhpParser\*',
 'Hoa\*',
-'Roave\BetterReflection\*',
 ],
 'whitelist-global-functions' => false,
 'whitelist-global-classes' => false,

compiler/src/Console/CompileCommand.php

@@ -201,10 +201,8 @@ private function buildPreloadScript(): void
 $output = '';
 foreach ($finder->files()->name('*.php')->in([
 $this->buildDir . '/src',
-$this->buildDir . '/stubs/runtime',
 $vendorDir . '/nikic/php-parser/lib/PhpParser',
 $vendorDir . '/phpstan/phpdoc-parser/src',
-$vendorDir . '/ondrejmirtes/better-reflection/src',
 ])->exclude([
 'Testing',
 ]) as $phpFile) {

composer.json

@@ -23,7 +23,7 @@
 "nette/utils": "^3.1.3",
 "nikic/php-parser": "4.10.4",
 "ondram/ci-detector": "^3.4.0",
-"ondrejmirtes/better-reflection": "4.3.50",
+"ondrejmirtes/better-reflection": "4.3.51",
 "phpdocumentor/reflection-docblock": "4.3.4",
 "phpstan/php-8-stubs": "^0.1.12",
 "phpstan/phpdoc-parser": "^0.4.9",

composer.lock

@@ -98,7 +98,6 @@ parameters:
 - '#^PhpParser\\#'
 - '#^PHPStan\\#'
 - '#^Hoa\\#'
-- '#^Roave\\BetterReflection\\#'
 dynamicConstantNames:
 - ICONV_IMPL
 - LIBXML_VERSION
@@ -1331,7 +1330,7 @@ services:
 - PHPStan\Reflection\ReflectionProvider
 
 betterReflectionSourceLocator:
-class: Roave\BetterReflection\SourceLocator\Type\SourceLocator
+class: PHPStan\BetterReflection\SourceLocator\Type\SourceLocator
 factory: @PHPStan\Reflection\BetterReflection\BetterReflectionSourceLocatorFactory::create
 autowired: false
 
@@ -1405,17 +1404,17 @@ services:
 implement: PHPStan\Reflection\BetterReflection\BetterReflectionProviderFactory
 
 -
-class: Roave\BetterReflection\SourceLocator\SourceStubber\PhpStormStubsSourceStubber
+class: PHPStan\BetterReflection\SourceLocator\SourceStubber\PhpStormStubsSourceStubber
 arguments:
 phpParser: @php8PhpParser
 phpVersionId: %phpVersion%
 autowired:
-- Roave\BetterReflection\SourceLocator\SourceStubber\PhpStormStubsSourceStubber
+- PHPStan\BetterReflection\SourceLocator\SourceStubber\PhpStormStubsSourceStubber
 
 -
-class: Roave\BetterReflection\SourceLocator\SourceStubber\ReflectionSourceStubber
+class: PHPStan\BetterReflection\SourceLocator\SourceStubber\ReflectionSourceStubber
 autowired:
-- Roave\BetterReflection\SourceLocator\SourceStubber\ReflectionSourceStubber
+- PHPStan\BetterReflection\SourceLocator\SourceStubber\ReflectionSourceStubber
 
 php8Lexer:
 class: PhpParser\Lexer\Emulative

conf/config.neon

@@ -25,27 +25,27 @@ services:
 autowired: false
 
 stubClassReflector:
-class: Roave\BetterReflection\Reflector\ClassReflector
+class: PHPStan\BetterReflection\Reflector\ClassReflector
 arguments:
 sourceLocator: @stubSourceLocator
 autowired: false
 
 stubFunctionReflector:
-class: Roave\BetterReflection\Reflector\FunctionReflector
+class: PHPStan\BetterReflection\Reflector\FunctionReflector
 arguments:
 classReflector: @stubClassReflector
 sourceLocator: @stubSourceLocator
 autowired: false
 
 stubConstantReflector:
-class: Roave\BetterReflection\Reflector\ConstantReflector
+class: PHPStan\BetterReflection\Reflector\ConstantReflector
 arguments:
 classReflector: @stubClassReflector
 sourceLocator: @stubSourceLocator
 autowired: false
 
 stubSourceLocator:
-class: Roave\BetterReflection\SourceLocator\Type\SourceLocator
+class: PHPStan\BetterReflection\SourceLocator\Type\SourceLocator
 factory: @PHPStan\PhpDoc\StubSourceLocatorFactory::create()
 autowired: false
 

conf/config.stubValidator.neon

@@ -4,6 +4,10 @@
 
 use PhpParser\Comment;
 use PhpParser\Node;
+use PHPStan\BetterReflection\NodeCompiler\Exception\UnableToCompileNode;
+use PHPStan\BetterReflection\Reflection\Exception\NotAClassReflection;
+use PHPStan\BetterReflection\Reflection\Exception\NotAnInterfaceReflection;
+use PHPStan\BetterReflection\Reflector\Exception\IdentifierNotFound;
 use PHPStan\Dependency\DependencyResolver;
 use PHPStan\Node\FileNode;
 use PHPStan\Parser\Parser;
@@ -14,10 +18,6 @@
 use PHPStan\Rules\NonIgnorableRuleError;
 use PHPStan\Rules\Registry;
 use PHPStan\Rules\TipRuleError;
-use Roave\BetterReflection\NodeCompiler\Exception\UnableToCompileNode;
-use Roave\BetterReflection\Reflection\Exception\NotAClassReflection;
-use Roave\BetterReflection\Reflection\Exception\NotAnInterfaceReflection;
-use Roave\BetterReflection\Reflector\Exception\IdentifierNotFound;
 use function array_key_exists;
 use function array_unique;
 

src/Analyser/FileAnalyser.php

@@ -46,6 +46,10 @@
 use PhpParser\Node\Stmt\TryCatch;
 use PhpParser\Node\Stmt\Unset_;
 use PhpParser\Node\Stmt\While_;
+use PHPStan\BetterReflection\Reflection\Adapter\ReflectionClass;
+use PHPStan\BetterReflection\Reflector\ClassReflector;
+use PHPStan\BetterReflection\SourceLocator\Ast\Strategy\NodeToReflection;
+use PHPStan\BetterReflection\SourceLocator\Located\LocatedSource;
 use PHPStan\DependencyInjection\Reflection\ClassReflectionExtensionRegistryProvider;
 use PHPStan\File\FileHelper;
 use PHPStan\File\FileReader;
@@ -114,10 +118,6 @@
 use PHPStan\Type\TypeTraverser;
 use PHPStan\Type\TypeUtils;
 use PHPStan\Type\UnionType;
-use Roave\BetterReflection\Reflection\Adapter\ReflectionClass;
-use Roave\BetterReflection\Reflector\ClassReflector;
-use Roave\BetterReflection\SourceLocator\Ast\Strategy\NodeToReflection;
-use Roave\BetterReflection\SourceLocator\Located\LocatedSource;
 
 class NodeScopeResolver
 {
@@ -1257,7 +1257,7 @@ private function createAstClassReflection(Node\Stmt\ClassLike $stmt, Scope $scop
 new LocatedSource(FileReader::read($scope->getFile()), $scope->getFile()),
 $scope->getNamespace() !== null ? new Node\Stmt\Namespace_(new Name($scope->getNamespace())) : null
 );
-if (!$betterReflectionClass instanceof \Roave\BetterReflection\Reflection\ReflectionClass) {
+if (!$betterReflectionClass instanceof \PHPStan\BetterReflection\Reflection\ReflectionClass) {
 throw new \PHPStan\ShouldNotHappenException();
 }
 

src/Analyser/NodeScopeResolver.php

@@ -4,12 +4,12 @@
 
 use Nette\DI\Extensions\PhpExtension;
 use Phar;
+use PHPStan\BetterReflection\BetterReflection;
+use PHPStan\BetterReflection\SourceLocator\SourceStubber\PhpStormStubsSourceStubber;
 use PHPStan\Broker\Broker;
 use PHPStan\Command\CommandHelper;
 use PHPStan\File\FileHelper;
 use PHPStan\Php\PhpVersion;
-use Roave\BetterReflection\BetterReflection;
-use Roave\BetterReflection\SourceLocator\SourceStubber\PhpStormStubsSourceStubber;
 use Symfony\Component\Finder\Finder;
 use function sys_get_temp_dir;