Remove dev-dependency on roave/better-reflection

Author: jeromegamez

composer.json

@@ -18,7 +18,6 @@
     },
     "require-dev": {
         "orchestra/testbench": "^4.0|^5.0|^6.0",
-        "roave/better-reflection": "^3.6|^4.6|5.0.x-dev",
         "friendsofphp/php-cs-fixer": "^2.16"
     },
     "autoload": {

config/firebase.php

@@ -88,8 +88,8 @@
                 'url' => env('FIREBASE_DATABASE_URL'),
 
                 /*
-                 * As a best practice, a service should have access to only the resources it needs. 
-                 * To get more fine-grained control over the resources a Firebase app instance can access, 
+                 * As a best practice, a service should have access to only the resources it needs.
+                 * To get more fine-grained control over the resources a Firebase app instance can access,
                  * use a unique identifier in your Security Rules to represent your service.
                  *
                  * https://firebase.google.com/docs/database/admin/start#authenticate-with-limited-privileges

tests/FirebaseProjectManagerTest.php

@@ -4,25 +4,23 @@
 
 namespace Kreait\Laravel\Firebase\Tests;
 
+use Illuminate\Contracts\Cache\Repository;
 use Kreait\Firebase;
 use Kreait\Firebase\Exception\InvalidArgumentException;
 use Kreait\Firebase\Factory;
 use Kreait\Laravel\Firebase\FirebaseProjectManager;
-use Roave\BetterReflection\Reflection\ReflectionObject;
+use ReflectionObject;
 
 /**
  * @internal
  */
 final class FirebaseProjectManagerTest extends TestCase
 {
-    protected function factoryForProject(?string $project = null): Factory
+    private function factoryForProject(?string $project = null): Factory
     {
-        $manager = $this->app->make(FirebaseProjectManager::class);
-        $project = $manager->project($project);
-
-        $factory = ReflectionObject::createFromInstance($project)->getProperty('factory');
+        $project = $this->app->make(FirebaseProjectManager::class)->project($project);
 
-        return $factory->getValue($project);
+        return $this->getAccessibleProperty($project, 'factory')->getValue($project);
     }
 
     /**
@@ -36,9 +34,7 @@ public function a_project_configuration_has_to_exist(): void
 
         $this->expectException(InvalidArgumentException::class);
 
-        ReflectionObject::createFromInstance($manager)
-            ->getMethod('configuration')
-            ->invoke($manager, $projectName);
+        $this->getAccessibleMethod($manager, 'configuration')->invoke($manager, $projectName);
     }
 
     /**
@@ -84,9 +80,7 @@ public function credentials_can_be_configured(): void
 
         // Retrieve service account
         /** @var Firebase\ServiceAccount $serviceAccount */
-        $serviceAccount = ReflectionObject::createFromInstance($factory)
-            ->getMethod('getServiceAccount')
-            ->invoke($factory);
+        $serviceAccount = $this->getAccessibleMethod($factory, 'getServiceAccount')->invoke($factory);
 
         // Validate value
         $this->assertSame($credentials, $serviceAccount->asArray());
@@ -102,7 +96,7 @@ public function a_tenant_id_can_be_set(): void
         $auth = $this->app->make(Firebase\Auth::class);
 
         /** @var Firebase\Auth\TenantId|null $tenantId */
-        $tenantId = ReflectionObject::createFromInstance($auth)->getProperty('tenantId')->getValue($auth);
+        $tenantId = $this->getAccessibleProperty($auth, 'tenantId')->getValue($auth);
 
         $this->assertInstanceOf(Firebase\Auth\TenantId::class, $tenantId);
 
@@ -134,14 +128,10 @@ public function projects_can_have_different_credentials(): void
         $secondFactory = $this->factoryForProject($secondProjectName);
 
         /** @var Firebase\ServiceAccount $serviceAccount */
-        $serviceAccount = ReflectionObject::createFromInstance($factory)
-            ->getMethod('getServiceAccount')
-            ->invoke($factory);
+        $serviceAccount = $this->getAccessibleMethod($factory, 'getServiceAccount')->invoke($factory);
 
         /** @var Firebase\ServiceAccount $secondServiceAccount */
-        $secondServiceAccount = ReflectionObject::createFromInstance($secondFactory)
-            ->getMethod('getServiceAccount')
-            ->invoke($secondFactory);
+        $secondServiceAccount = $this->getAccessibleMethod($factory, 'getServiceAccount')->invoke($secondFactory);
 
         // Validate values
         $this->assertSame($credentials, $serviceAccount->asArray());
@@ -157,8 +147,9 @@ public function credential_auto_discovery_is_enabled_by_default_for_default_proj
 
         $factory = $this->factoryForProject($projectName);
 
-        $property = ReflectionObject::createFromInstance($factory)->getProperty('discoveryIsDisabled');
-        $property->setVisibility(\ReflectionProperty::IS_PUBLIC);
+        $this->getAccessibleMethod($factory, 'getServiceAccount')->invoke($factory);
+
+        $property = $this->getAccessibleProperty($factory, 'discoveryIsDisabled');
 
         $this->assertFalse($property->getValue($factory));
     }
@@ -174,8 +165,7 @@ public function credential_auto_discovery_can_be_disabled_for_default_project():
 
         $factory = $this->factoryForProject($projectName);
 
-        $property = ReflectionObject::createFromInstance($factory)->getProperty('discoveryIsDisabled');
-        $property->setVisibility(\ReflectionProperty::IS_PUBLIC);
+        $property = $this->getAccessibleProperty($factory, 'discoveryIsDisabled');
 
         $this->assertTrue($property->getValue($factory));
     }
@@ -191,8 +181,7 @@ public function credential_auto_discovery_is_not_enabled_by_default_for_other_pr
 
         $factory = $this->factoryForProject($projectName); // factory for default project with default settings
 
-        $property = ReflectionObject::createFromInstance($factory)->getProperty('discoveryIsDisabled');
-        $property->setVisibility(\ReflectionProperty::IS_PUBLIC);
+        $property = $this->getAccessibleProperty($factory, 'discoveryIsDisabled');
 
         $this->assertTrue($property->getValue($factory));
     }
@@ -208,8 +197,7 @@ public function credential_auto_discovery_can_be_enabled_for_other_project(): vo
 
         $factory = $this->factoryForProject($projectName);
 
-        $property = ReflectionObject::createFromInstance($factory)->getProperty('discoveryIsDisabled');
-        $property->setVisibility(\ReflectionProperty::IS_PUBLIC);
+        $property = $this->getAccessibleProperty($factory, 'discoveryIsDisabled');
 
         $this->assertFalse($property->getValue($factory));
     }
@@ -225,8 +213,7 @@ public function the_realtime_database_url_can_be_configured(): void
 
         $database = $this->app->make(Firebase\Database::class);
 
-        $property = ReflectionObject::createFromInstance($database)->getProperty('uri');
-        $property->setVisibility(\ReflectionProperty::IS_PUBLIC);
+        $property = $this->getAccessibleProperty($database, 'uri');
 
         $this->assertSame($url, (string) $property->getValue($database));
     }
@@ -241,8 +228,7 @@ public function the_dynamic_links_default_domain_can_be_configured(): void
 
         $dynamicLinks = $this->app->make(Firebase\DynamicLinks::class);
 
-        $property = ReflectionObject::createFromInstance($dynamicLinks)->getProperty('defaultDynamicLinksDomain');
-        $property->setVisibility(\ReflectionProperty::IS_PUBLIC);
+        $property = $this->getAccessibleProperty($dynamicLinks, 'defaultDynamicLinksDomain');
 
         /** @var Firebase\Value\Url $configuredDomain */
         $configuredDomain = $property->getValue($dynamicLinks);
@@ -260,8 +246,7 @@ public function the_storage_default_bucket_can_be_configured(): void
 
         $storage = $this->app->make(Firebase\Storage::class);
 
-        $property = ReflectionObject::createFromInstance($storage)->getProperty('defaultBucket');
-        $property->setVisibility(\ReflectionProperty::IS_PUBLIC);
+        $property = $this->getAccessibleProperty($storage, 'defaultBucket');
 
         $this->assertSame($name, $property->getValue($storage));
     }
@@ -276,8 +261,7 @@ public function logging_can_be_configured(): void
 
         $factory = $this->factoryForProject($projectName);
 
-        $property = ReflectionObject::createFromInstance($factory)->getProperty('httpLogMiddleware');
-        $property->setVisibility(\ReflectionProperty::IS_PUBLIC);
+        $property = $this->getAccessibleProperty($factory, 'httpLogMiddleware');
 
         $this->assertNotNull($property->getValue($factory));
     }
@@ -292,8 +276,7 @@ public function debug_logging_can_be_configured(): void
 
         $factory = $this->factoryForProject($projectName);
 
-        $property = ReflectionObject::createFromInstance($factory)->getProperty('httpDebugLogMiddleware');
-        $property->setVisibility(\ReflectionProperty::IS_PUBLIC);
+        $property = $this->getAccessibleProperty($factory, 'httpDebugLogMiddleware');
 
         $this->assertNotNull($property->getValue($factory));
     }
@@ -309,11 +292,8 @@ public function http_client_options_can_be_configured(): void
 
         $factory = $this->factoryForProject($projectName);
 
-        $property = ReflectionObject::createFromInstance($factory)->getProperty('httpClientOptions');
-        $property->setVisibility(\ReflectionProperty::IS_PUBLIC);
-
         /** @var Firebase\Http\HttpClientOptions $httpClientOptions */
-        $httpClientOptions = $property->getValue($factory);
+        $httpClientOptions = $this->getAccessibleProperty($factory, 'httpClientOptions')->getValue($factory);
 
         $this->assertSame('proxy.domain.tld', $httpClientOptions->proxy());
         $this->assertSame(1.23, $httpClientOptions->timeout());
@@ -327,9 +307,24 @@ public function it_uses_the_laravel_cache(): void
         $projectName = $this->app->config->get('firebase.default');
         $factory = $this->factoryForProject($projectName);
 
-        $property = ReflectionObject::createFromInstance($factory)->getProperty('verifierCache');
-        $property->setVisibility(\ReflectionProperty::IS_PUBLIC);
+        $property = $this->getAccessibleProperty($factory, 'verifierCache');
+
+        $this->assertInstanceOf(Repository::class, $property->getValue($factory));
+    }
+
+    private function getAccessibleProperty(object $object, string $propertyName): \ReflectionProperty
+    {
+        $property = (new ReflectionObject($object))->getProperty($propertyName);
+        $property->setAccessible(true);
+
+        return $property;
+    }
+
+    private function getAccessibleMethod(object $object, string $methodName): \ReflectionMethod
+    {
+        $property = (new ReflectionObject($object))->getMethod($methodName);
+        $property->setAccessible(true);
 
-        $this->assertInstanceOf(\Illuminate\Contracts\Cache\Repository::class, $property->getValue($factory));
+        return $property;
     }
 }