fix(core): allow discovery:generate to run even when full caching is enabled (#1223)

Author: brendt

packages/cache/src/CacheConfig.php

@@ -35,7 +35,7 @@ public function __construct(
         /** Used as a global override, should be true in production, null in local */
         ?bool $enable = null,
     ) {
-        $this->enable = $enable ?? env('CACHE');
+        $this->enable = $this->enableCache($enable);
         $this->iconCache = (bool) env('ICON_CACHE', true);
         $this->projectCache = (bool) env('PROJECT_CACHE', false);
         $this->viewCache = (bool) env('VIEW_CACHE', false);
@@ -51,12 +51,8 @@ public function addCache(string $className): void
 
     private function resolveDiscoveryCacheStrategy(): DiscoveryCacheStrategy
     {
-        if (PHP_SAPI === 'cli') {
-            $command = $_SERVER['argv'][1] ?? null;
-
-            if ($command === 'dg' || $command === 'discovery:generate') {
-                return DiscoveryCacheStrategy::NONE;
-            }
+        if ($this->isDiscoveryGenerateCommand()) {
+            return DiscoveryCacheStrategy::NONE;
         }
 
         $cache = env('CACHE');
@@ -79,4 +75,24 @@ private function resolveDiscoveryCacheStrategy(): DiscoveryCacheStrategy
 
         return $current;
     }
+
+    private function enableCache(?bool $enable): ?bool
+    {
+        if ($this->isDiscoveryGenerateCommand()) {
+            return false;
+        }
+
+        return $enable ?? env('CACHE');
+    }
+
+    private function isDiscoveryGenerateCommand(): bool
+    {
+        if (PHP_SAPI !== 'cli') {
+            return false;
+        }
+
+        $command = $_SERVER['argv'][1] ?? null;
+
+        return $command === 'dg' || $command === 'discovery:generate';
+    }
 }