chore: Fix static analysis issues

sprout-laravel · Nov 17, 2024 · 3899bfe · 3899bfe
1 parent 21b950e
commit 3899bfe
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 11 deletions.
diff --git a/src/Concerns/HandlesServiceOverrides.php b/src/Concerns/HandlesServiceOverrides.php
@@ -9,7 +9,6 @@
 use Sprout\Contracts\ServiceOverride;
 use Sprout\Contracts\Tenancy;
 use Sprout\Contracts\Tenant;
-use Sprout\Overrides\StorageOverride;
 
 trait HandlesServiceOverrides
 {
@@ -39,7 +38,7 @@ trait HandlesServiceOverrides
     private array $bootedOverrides = [];
 
     /**
-     * @var array<string, array<class-string<\Sprout\Contracts\ServiceOverride>>
+     * @var array<string, array<class-string<\Sprout\Contracts\ServiceOverride>, bool>>
      */
     private array $setupOverrides = [];
 
@@ -97,6 +96,7 @@ protected function processOverride(string $overrideClass): static
 
         // The override is bootable
         if ($override instanceof BootableServiceOverride) {
+            /** @var class-string<\Sprout\Contracts\BootableServiceOverride> $overrideClass */
             // So register it as one
             $this->bootableOverrides[$overrideClass] = $override;
             $this->bootedOverrides[$overrideClass]   = false;
@@ -203,17 +203,16 @@ public function bootOverrides(): void
     /**
      * Boot a service override
      *
-     * @template TenantClass of \Sprout\Contracts\Tenant
-     *
-     * @param class-string<\Sprout\Contracts\BootableServiceOverride> $overrideClass
-     *
-     * @phpstan-param TenantClass                                     $tenant
+     * @param class-string<\Sprout\Contracts\ServiceOverride> $overrideClass
      *
      * @return void
      */
     protected function bootOverride(string $overrideClass): void
     {
-        $this->overrides[$overrideClass]->boot($this->app, $this);
+        /** @var \Sprout\Contracts\BootableServiceOverride $override */
+        $override = $this->overrides[$overrideClass];
+
+        $override->boot($this->app, $this);
         $this->bootedOverrides[$overrideClass] = true;
     }
 
@@ -359,11 +358,11 @@ public function hasRegisteredOverride(string $class): bool
     /**
      * Get all service overrides for a tenancy
      *
-     * @param \Sprout\Contracts\Tenancy|null $tenancy
+     * @param \Sprout\Contracts\Tenancy<*>|null $tenancy
      *
-     * @return \Sprout\Contracts\ServiceOverride[]|void
+     * @return array<\Sprout\Contracts\ServiceOverride>
      */
-    public function getCurrentOverrides(?Tenancy $tenancy = null)
+    public function getCurrentOverrides(?Tenancy $tenancy = null): array
     {
         $tenancy ??= $this->getCurrentTenancy();
 
@@ -376,5 +375,7 @@ function (string $overrideClass) use ($tenancy) {
                 ARRAY_FILTER_USE_KEY
             );
         }
+
+        return [];
     }
 }
diff --git a/src/Overrides/CacheOverride.php b/src/Overrides/CacheOverride.php
@@ -3,6 +3,7 @@
 
 namespace Sprout\Overrides;
 
+use Illuminate\Cache\ApcStore;
 use Illuminate\Cache\ApcWrapper;
 use Illuminate\Cache\ArrayStore;
 use Illuminate\Cache\CacheManager;