Merge pull request #346 from cultuurnet/III-6509-featuref-flag-removal

III-6509 feature Flag removal

Author: JonasVHG

app/Factory/ContainerFactory.php

@@ -40,9 +40,7 @@ public static function forCli(Config $config): Container
         $container->addServiceProvider(EventIndexationServiceProvider::class);
         $container->addServiceProvider(PlaceIndexationServiceProvider::class);
         $container->addServiceProvider(CommandServiceProvider::class);
-        if ($container->get(Config::class)->get('cache.enabled') ?? false) {
-            $container->addServiceProvider(CacheProvider::class);
-        }
+        $container->addServiceProvider(CacheProvider::class);
         return $container;
     }
 
@@ -55,9 +53,7 @@ public static function forWeb(Config $config): Container
         $container->addServiceProvider(EventSearchServiceProvider::class);
         $container->addServiceProvider(PlaceSearchServiceProvider::class);
         $container->addServiceProvider(RoutingServiceProvider::class);
-        if ($container->get(Config::class)->get('cache.enabled') ?? false) {
-            $container->addServiceProvider(CacheProvider::class);
-        }
+        $container->addServiceProvider(CacheProvider::class);
         return $container;
     }
 

app/RoutingServiceProvider.php

@@ -57,39 +57,32 @@ function (): Router {
                     $oauthClient->setEndpoint($this->parameter('uitid.base_url'));
 
                     $consumerResolver = new CultureFeedConsumerResolver(new CultureFeed($oauthClient));
-                    $cacheEnabled = $this->parameter('cache.enabled');
-                    if ($cacheEnabled) {
-                        $cachedConsumerResolver = new CachedConsumerResolver(
-                            CacheFactory::create(
-                                $this->container->get(PredisClient::class),
-                                'permission',
-                                86400 // one day
-                            ),
-                            $consumerResolver
-                        );
-                    }
 
                     $metadataGenerator = $this->getMetadataGenerator();
                     $clientIdResolver = new MetadataClientIdResolver(
                         $this->getManagementTokenProvider(),
                         $metadataGenerator
                     );
-                    if ($cacheEnabled) {
-                        $cachedClientIdResolver = new CachedClientIdResolver(
+
+                    $pemFile = $this->parameter('keycloak.pem_file');
+                    $authenticateRequest = new AuthenticateRequest(
+                        $this->getLeagueContainer(),
+                        new CachedConsumerResolver(
+                            CacheFactory::create(
+                                $this->container->get(PredisClient::class),
+                                'permission',
+                                86400 // one day
+                            ),
+                            $consumerResolver
+                        ),
+                        new CachedClientIdResolver(
                             CacheFactory::create(
                                 $this->container->get(PredisClient::class),
                                 'permission',
                                 86400 // one day
                             ),
                             $clientIdResolver
-                        );
-                    }
-
-                    $pemFile = $this->parameter('keycloak.pem_file');
-                    $authenticateRequest = new AuthenticateRequest(
-                        $this->getLeagueContainer(),
-                        $cacheEnabled ? $cachedConsumerResolver : $consumerResolver,
-                        $cacheEnabled ? $cachedClientIdResolver : $clientIdResolver,
+                        ),
                         new InMemoryDefaultQueryRepository(
                             file_exists(__DIR__ . '/../default_queries.php') ? require __DIR__ . '/../default_queries.php' : []
                         ),