wip

Author: brendt

packages/core/src/Commands/DiscoveryGenerateCommand.php

@@ -57,8 +57,7 @@ public function __invoke(): void
                     ($this->generateDiscoveryCache)(
                         container: $kernel->container,
                         config: $this->discoveryConfig,
-                        cache: $this->discoveryCache,
-                        strategy: $strategy,
+                        cache: $this->discoveryCache->withStrategy($strategy),
                     );
                 },
             );

packages/discovery/src/GenerateDiscoveryCache.php

@@ -10,8 +10,8 @@ public function __invoke(
         ContainerInterface $container,
         DiscoveryConfig $config,
         DiscoveryCache $cache,
-        DiscoveryCacheStrategy $strategy,
     ): void {
+        $originalStrategy = $cache->strategy;
         $cache = $cache->withStrategy(DiscoveryCacheStrategy::NONE);
 
         $bootDiscovery = new BootDiscovery(
@@ -26,6 +26,6 @@ public function __invoke(
             $cache->store($location, $discoveries);
         }
 
-        $cache->storeStrategy($strategy);
+        $cache->storeStrategy($originalStrategy);
     }
 }