Make the always_expire_wfd_meta_resources config setting work regar…

…dless of `kernel.debug` mode
webfactory · Aug 30, 2024 · 779a4dd · 779a4dd
1 parent cf26d07
commit 779a4dd
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 25 deletions.
diff --git a/src/Config/CacheBustingResourceChecker.php b/src/Config/CacheBustingResourceChecker.php
diff --git a/src/Config/WfdMetaConfigCache.php b/src/Config/WfdMetaConfigCache.php
@@ -23,11 +23,14 @@ class WfdMetaConfigCache implements ConfigCacheInterface
     /** @var ConfigCacheInterface */
     private $innerCache;
 
-    public function __construct($file, ConfigCacheInterface $innerCache, MetaQueryFactory $metaQueryFactory)
+    private bool $alwaysExpireWfdMetaResources;
+
+    public function __construct($file, ConfigCacheInterface $innerCache, MetaQueryFactory $metaQueryFactory, bool $alwaysExpire = false)
     {
         $this->file = $file;
         $this->innerCache = $innerCache;
         $this->metaQueryFactory = $metaQueryFactory;
+        $this->alwaysExpireWfdMetaResources = $alwaysExpire;
     }
 
     public function getPath(): string
@@ -62,6 +65,10 @@ public function isWfdMetaFresh(): bool
             return true;
         }
 
+        if ($this->alwaysExpireWfdMetaResources) {
+            return false;
+        }
+
         $metaQuery = $this->metaQueryFactory->create();
 
         foreach ($wfdMetaResources['resources'] as $wfdMetaResource) {

diff --git a/src/Config/WfdMetaConfigCacheFactory.php b/src/Config/WfdMetaConfigCacheFactory.php
@@ -34,11 +34,14 @@ class WfdMetaConfigCacheFactory implements ConfigCacheFactoryInterface
      */
     private $lockFactory;
 
-    public function __construct(ConfigCacheFactoryInterface $configCacheFactory, MetaQueryFactory $metaQueryFactory, LockFactory $lockFactory)
+    private bool $alwaysExpireWfdMetaResources;
+
+    public function __construct(ConfigCacheFactoryInterface $configCacheFactory, MetaQueryFactory $metaQueryFactory, LockFactory $lockFactory, bool $alwaysExpireWfdMetaResources = false)
     {
         $this->configCacheFactory = $configCacheFactory;
         $this->metaQueryFactory = $metaQueryFactory;
         $this->lockFactory = $lockFactory;
+        $this->alwaysExpireWfdMetaResources = $alwaysExpireWfdMetaResources;
     }
 
     public function cache($file, $callback): ConfigCacheInterface
@@ -70,7 +73,7 @@ public function cache($file, $callback): ConfigCacheInterface
 
     private function createCache($file, ConfigCacheInterface $innerCache): ConfigCacheInterface
     {
-        return new WfdMetaConfigCache($file, $innerCache, $this->metaQueryFactory);
+        return new WfdMetaConfigCache($file, $innerCache, $this->metaQueryFactory, $this->alwaysExpireWfdMetaResources);
     }
 
     private function fillCache($callback, ConfigCacheInterface $cache): void

diff --git a/src/DependencyInjection/WebfactoryWfdMetaExtension.php b/src/DependencyInjection/WebfactoryWfdMetaExtension.php
@@ -33,8 +33,6 @@ public function load(array $configs, ContainerBuilder $container): void
         $configuration = new Configuration();
         $config = $this->processConfiguration($configuration, $configs);
 
-        if ($config['always_expire_wfd_meta_resources']) {
-            $yamlLoader->load('cache_busting.yml');
-        }
+        $container->setParameter('webfactory_wfd_meta.always_expire_wfd_meta_resources', $config['always_expire_wfd_meta_resources']);
     }
 }
diff --git a/src/Resources/config/services.xml b/src/Resources/config/services.xml
@@ -50,6 +50,7 @@
                     <tag name="monolog.logger" channel="webfactory_wfd_meta" />
                 </service>
             </argument>
+            <argument>%webfactory_wfd_meta.always_expire_wfd_meta_resources</argument>
         </service>
     </services>
 </container>