Stop using deprecated Broker in favor of ReflectionProvider

Author: ondrejmirtes

tests/unit/EnumMethodReflectionTest.php

@@ -13,9 +13,9 @@
 class EnumMethodReflectionTest extends PHPStanTestCase
 {
     /**
-     * @var \PHPStan\Broker\Broker
+     * @var \PHPStan\Reflection\ReflectionProvider
      */
-    protected $broker;
+    protected $reflectionProvider;
 
     /**
      * @var EnumMethodsClassReflectionExtension
@@ -24,61 +24,61 @@ class EnumMethodReflectionTest extends PHPStanTestCase
 
     public function setUp(): void
     {
-        $this->broker = $this->createBroker();
+        $this->reflectionProvider = $this->createReflectionProvider();
         $this->reflectionExtension = new EnumMethodsClassReflectionExtension();
     }
 
     public function testGetName(): void
     {
-        $classReflection  = $this->broker->getClass(VisibilityEnum::class);
+        $classReflection  = $this->reflectionProvider->getClass(VisibilityEnum::class);
         $methodReflection = $this->reflectionExtension->getMethod($classReflection, 'STR');
 
         $this->assertSame('STR', $methodReflection->getName());
     }
 
     public function testGetDeclaringClass(): void
     {
-        $classReflection  = $this->broker->getClass(VisibilityEnum::class);
+        $classReflection  = $this->reflectionProvider->getClass(VisibilityEnum::class);
         $methodReflection = $this->reflectionExtension->getMethod($classReflection, 'STR');
 
         $this->assertSame($classReflection, $methodReflection->getDeclaringClass());
     }
 
     public function testShouldBeStatic(): void
     {
-        $classReflection  = $this->broker->getClass(VisibilityEnum::class);
+        $classReflection  = $this->reflectionProvider->getClass(VisibilityEnum::class);
         $methodReflection = $this->reflectionExtension->getMethod($classReflection, 'STR');
 
         $this->assertTrue($methodReflection->isStatic());
     }
 
     public function testShouldNotBePrivate(): void
     {
-        $classReflection  = $this->broker->getClass(VisibilityEnum::class);
+        $classReflection  = $this->reflectionProvider->getClass(VisibilityEnum::class);
         $methodReflection = $this->reflectionExtension->getMethod($classReflection, 'STR');
 
         $this->assertFalse($methodReflection->isPrivate());
     }
 
     public function testShouldBePublic(): void
     {
-        $classReflection  = $this->broker->getClass(VisibilityEnum::class);
+        $classReflection  = $this->reflectionProvider->getClass(VisibilityEnum::class);
         $methodReflection = $this->reflectionExtension->getMethod($classReflection, 'STR');
 
         $this->assertTrue($methodReflection->isPublic());
     }
 
     public function testGetPrototype(): void
     {
-        $classReflection  = $this->broker->getClass(VisibilityEnum::class);
+        $classReflection  = $this->reflectionProvider->getClass(VisibilityEnum::class);
         $methodReflection = $this->reflectionExtension->getMethod($classReflection, 'STR');
 
         $this->assertSame($methodReflection, $methodReflection->getPrototype());
     }
 
     public function testGetVariants(): void
     {
-        $classReflection  = $this->broker->getClass(VisibilityEnum::class);
+        $classReflection  = $this->reflectionProvider->getClass(VisibilityEnum::class);
         $methodReflection = $this->reflectionExtension->getMethod($classReflection, 'STR');
         $parametersAcceptor = ParametersAcceptorSelector::selectSingle($methodReflection->getVariants());
 
@@ -87,7 +87,7 @@ public function testGetVariants(): void
 
     public function testGetDocComment(): void
     {
-        $classReflection = $this->broker->getClass(DocCommentEnum::class);
+        $classReflection = $this->reflectionProvider->getClass(DocCommentEnum::class);
         $docMethodRefl = $this->reflectionExtension->getMethod($classReflection, 'WITH_DOC_BLOCK');
         $noDocMethodRefl = $this->reflectionExtension->getMethod($classReflection, 'WITHOUT_DOC_BLOCK');
 
@@ -103,7 +103,7 @@ public function testGetDocComment(): void
 
     public function testIsDeprecated(): void
     {
-        $classReflection = $this->broker->getClass(DeprecatedEnum::class);
+        $classReflection = $this->reflectionProvider->getClass(DeprecatedEnum::class);
         $deprecatedRefl = $this->reflectionExtension->getMethod($classReflection, 'DEPRECATED');
         $notDeprecatedRefl = $this->reflectionExtension->getMethod($classReflection, 'NOT_DEPRECATED');
 
@@ -113,7 +113,7 @@ public function testIsDeprecated(): void
 
     public function testGetDeprecatedDescription(): void
     {
-        $classReflection = $this->broker->getClass(DeprecatedEnum::class);
+        $classReflection = $this->reflectionProvider->getClass(DeprecatedEnum::class);
         $deprecatedRefl = $this->reflectionExtension->getMethod($classReflection, 'DEPRECATED');
         $notDeprecatedRefl = $this->reflectionExtension->getMethod($classReflection, 'NOT_DEPRECATED');
 
@@ -123,31 +123,31 @@ public function testGetDeprecatedDescription(): void
 
     public function testIsFinal(): void
     {
-        $classReflection = $this->broker->getClass(DeprecatedEnum::class);
+        $classReflection = $this->reflectionProvider->getClass(DeprecatedEnum::class);
         $methodReflection = $this->reflectionExtension->getMethod($classReflection, 'STR');
 
         $this->assertTrue($methodReflection->isFinal()->no());
     }
 
     public function testIsInternal(): void
     {
-        $classReflection = $this->broker->getClass(DeprecatedEnum::class);
+        $classReflection = $this->reflectionProvider->getClass(DeprecatedEnum::class);
         $methodReflection = $this->reflectionExtension->getMethod($classReflection, 'STR');
 
         $this->assertTrue($methodReflection->isInternal()->no());
     }
 
     public function testGetThrowType(): void
     {
-        $classReflection = $this->broker->getClass(DeprecatedEnum::class);
+        $classReflection = $this->reflectionProvider->getClass(DeprecatedEnum::class);
         $methodReflection = $this->reflectionExtension->getMethod($classReflection, 'STR');
 
         $this->assertNull($methodReflection->getThrowType());
     }
 
     public function testHasSideEffects(): void
     {
-        $classReflection = $this->broker->getClass(DeprecatedEnum::class);
+        $classReflection = $this->reflectionProvider->getClass(DeprecatedEnum::class);
         $methodReflection = $this->reflectionExtension->getMethod($classReflection, 'STR');
 
         $this->assertTrue($methodReflection->hasSideEffects()->no());

tests/unit/EnumMethodsClassReflectionExtensionTest.php

@@ -11,9 +11,9 @@
 class EnumMethodsClassReflectionExtensionTest extends PHPStanTestCase
 {
     /**
-     * @var \PHPStan\Broker\Broker
+     * @var \PHPStan\Reflection\ReflectionProvider
      */
-    protected $broker;
+    protected $reflectionProvider;
 
     /**
      * @var EnumMethodsClassReflectionExtension
@@ -22,13 +22,13 @@ class EnumMethodsClassReflectionExtensionTest extends PHPStanTestCase
 
     public function setUp(): void
     {
-        $this->broker = $this->createBroker();
+        $this->reflectionProvider = $this->createReflectionProvider();
         $this->extension = new EnumMethodsClassReflectionExtension();
     }
 
     public function testHasMethodSuccess(): void
     {
-        $classReflection = $this->broker->getClass(VisibilityEnum::class);
+        $classReflection = $this->reflectionProvider->getClass(VisibilityEnum::class);
 
         foreach (array_keys(VisibilityEnum::getConstants()) as $name) {
             $this->assertTrue($this->extension->hasMethod($classReflection, $name));
@@ -37,19 +37,19 @@ public function testHasMethodSuccess(): void
 
     public function testHasMethodUnknownNotFound(): void
     {
-        $classReflection = $this->broker->getClass(VisibilityEnum::class);
+        $classReflection = $this->reflectionProvider->getClass(VisibilityEnum::class);
         $this->assertFalse($this->extension->hasMethod($classReflection, 'UNKNOWN'));
     }
 
     public function testHasMethodNotSubclassOfEnumNotFound(): void
     {
-        $classReflection = $this->broker->getClass(NotAnEnum::class);
+        $classReflection = $this->reflectionProvider->getClass(NotAnEnum::class);
         $this->assertFalse($this->extension->hasMethod($classReflection, 'STR'));
     }
 
     public function testGetMethodSuccess(): void
     {
-        $classReflection = $this->broker->getClass(VisibilityEnum::class);
+        $classReflection = $this->reflectionProvider->getClass(VisibilityEnum::class);
 
         foreach (array_keys(VisibilityEnum::getConstants()) as $name) {
             $methodReflection = $this->extension->getMethod($classReflection, $name);