Don't test what we don't own

Author: jeromegamez

src/FirebaseProject.php

@@ -16,10 +16,6 @@
 
 class FirebaseProject
 {
-    protected Factory $factory;
-
-    protected array $config;
-
     protected ?AppCheck $appCheck = null;
 
     protected ?Auth $auth = null;
@@ -36,11 +32,11 @@ class FirebaseProject
 
     protected ?Storage $storage = null;
 
-    public function __construct(Factory $factory, array $config)
-    {
-        $this->factory = $factory;
-        $this->config = $config;
-    }
+    public function __construct(
+        protected Factory $factory,
+        protected ?string $dynamicLinksDefaultDomain,
+        protected ?string $firestoreDatabase
+    ) {}
 
     public function appCheck(): AppCheck
     {
@@ -72,7 +68,7 @@ public function database(): Database
     public function dynamicLinks(): DynamicLinks
     {
         if (! $this->dynamicLinks) {
-            $this->dynamicLinks = $this->factory->createDynamicLinksService($this->config['dynamic_links']['default_domain'] ?? null);
+            $this->dynamicLinks = $this->factory->createDynamicLinksService($this->dynamicLinksDefaultDomain);
         }
 
         return $this->dynamicLinks;
@@ -81,7 +77,7 @@ public function dynamicLinks(): DynamicLinks
     public function firestore(): Firestore
     {
         if (! $this->firestore) {
-            $this->firestore = $this->factory->createFirestore();
+            $this->firestore = $this->factory->createFirestore($this->firestoreDatabase);
         }
 
         return $this->firestore; // @codeCoverageIgnore

src/FirebaseProjectManager.php

@@ -4,41 +4,37 @@
 
 namespace Kreait\Laravel\Firebase;
 
-use Illuminate\Contracts\Container\Container;
+use Illuminate\Contracts\Config\Repository as ConfigRepository;
 use Illuminate\Contracts\Foundation\Application;
 use Kreait\Firebase\Exception\InvalidArgumentException;
 use Kreait\Firebase\Factory;
 use Kreait\Firebase\Http\HttpClientOptions;
 use Psr\SimpleCache\CacheInterface;
 use Symfony\Component\Cache\Adapter\Psr16Adapter;
 
+use function str_contains;
+use function str_starts_with;
+
 class FirebaseProjectManager
 {
-    /** @var Application */
-    protected $app;
-
     /** @var FirebaseProject[] */
     protected array $projects = [];
 
-    public function __construct(Container $app)
-    {
-        $this->app = $app;
-    }
+    public function __construct(
+        protected Application $app,
+        protected ConfigRepository $config,
+    ) {}
 
     public function project(?string $name = null): FirebaseProject
     {
         $name = $name ?? $this->getDefaultProject();
 
-        if (! isset($this->projects[$name])) {
-            $this->projects[$name] = $this->configure($name);
-        }
-
-        return $this->projects[$name];
+        return $this->projects[$name] ??= $this->configure($name);
     }
 
     protected function configuration(string $name): array
     {
-        $config = $this->app->config->get('firebase.projects.'.$name);
+        $config = $this->config->get('firebase.projects.'.$name);
 
         if (! $config) {
             throw new InvalidArgumentException("Firebase project [{$name}] not configured.");
@@ -49,9 +45,9 @@ protected function configuration(string $name): array
 
     protected function resolveJsonCredentials(string $credentials): string
     {
-        $isJsonString = \str_starts_with($credentials, '{');
-        $isAbsoluteLinuxPath = \str_starts_with($credentials, '/');
-        $isAbsoluteWindowsPath = \str_contains($credentials, ':\\');
+        $isJsonString = str_starts_with($credentials, '{');
+        $isAbsoluteLinuxPath = str_starts_with($credentials, '/');
+        $isAbsoluteWindowsPath = str_contains($credentials, ':\\');
 
         $isRelativePath = ! $isJsonString && ! $isAbsoluteLinuxPath && ! $isAbsoluteWindowsPath;
 
@@ -60,7 +56,7 @@ protected function resolveJsonCredentials(string $credentials): string
 
     protected function configure(string $name): FirebaseProject
     {
-        $factory = new Factory;
+        $factory = $this->app->make(Factory::class);
 
         $config = $this->configuration($name);
 
@@ -84,10 +80,6 @@ protected function configure(string $name): FirebaseProject
             $factory = $factory->withDatabaseAuthVariableOverride($authVariableOverride);
         }
 
-        if ($firestoreDatabase = $config['firestore']['database'] ?? null) {
-            $factory = $factory->withFirestoreDatabase($firestoreDatabase);
-        }
-
         if ($defaultStorageBucket = $config['storage']['default_bucket'] ?? null) {
             $factory = $factory->withDefaultStorageBucket($defaultStorageBucket);
         }
@@ -134,17 +126,21 @@ protected function configure(string $name): FirebaseProject
 
         $factory = $factory->withHttpClientOptions($options);
 
-        return new FirebaseProject($factory, $config);
+        return new FirebaseProject(
+            $factory,
+            $config['dynamic_links']['default_domain'] ?? null,
+            $config['firestore']['database'] ?? null,
+        );
     }
 
     public function getDefaultProject(): string
     {
-        return $this->app->config->get('firebase.default');
+        return $this->config->get('firebase.default');
     }
 
     public function setDefaultProject(string $name): void
     {
-        $this->app->config->set('firebase.default', $name);
+        $this->config->set('firebase.default', $name);
     }
 
     public function __call($method, $parameters)

src/ServiceProvider.php

@@ -59,7 +59,7 @@ private function registerComponents(): void
 
     private function registerManager(): void
     {
-        $this->app->singleton(FirebaseProjectManager::class, static fn (Container $app) => new FirebaseProjectManager($app));
+        $this->app->singleton(FirebaseProjectManager::class);
         $this->app->alias(FirebaseProjectManager::class, 'firebase.manager');
     }
 }