NEXT-14221 - Remove cache feature flag

Author: OliverSkroblin

UPGRADE-6.2.md

@@ -411,7 +411,7 @@ The new indexers work as follows:
 2. each indexer takes care of indexing a whole entity
 3. if several data on an entity need to be indexed, a single indexer takes care of the successive updating of the data
 4. an event is thrown at the end of the indexer so that plugins can subscribe to the event to index additional data for this entity
-5. finally, the updated ids are passed to the `CacheClearer` to invalidate the corresponding caches
+
 
 #### The new base class
 The base `Shopware\Core\Framework\DataAbstractionLayer\Indexing\EntityIndexer` class looks as follows:
@@ -458,7 +458,6 @@ namespace Shopware\Core\Content\Product\DataAbstractionLayer;
 
 use Shopware\Core\Content\Product\Events\ProductIndexerEvent;
 use Shopware\Core\Content\Product\ProductDefinition;
-use Shopware\Core\Framework\Adapter\Cache\CacheClearer;
 use Shopware\Core\Framework\DataAbstractionLayer\Dbal\Common\IteratorFactory;
 use Shopware\Core\Framework\DataAbstractionLayer\EntityRepositoryInterface;
 use Shopware\Core\Framework\DataAbstractionLayer\Event\EntityWrittenContainerEvent;
@@ -474,9 +473,6 @@ class ProductIndexer extends EntityIndexer
     /** @var EntityRepositoryInterface */
     private $repository;
 
-    /** @var CacheClearer */
-    private $cacheClearer;
-
     /** @var EventDispatcherInterface */
     private $eventDispatcher;
 
@@ -523,8 +519,6 @@ class ProductIndexer extends EntityIndexer
         // update all required data
 
         $this->eventDispatcher->dispatch(new ProductIndexerEvent($ids, $message->getContext()));
-
-        $this->cacheClearer->invalidateIds($ids, ProductDefinition::ENTITY_NAME);
     }
 }
 ```

changelog/_unreleased/2021-03-08-moved-cache-layer-from-dal-to-store-api.md

@@ -1,7 +1,6 @@
 ---
 title: Moved cache layer from DAL to store api
 issue: NEXT-11735
-flag: FEATURE_NEXT_10514
 author: OliverSkroblin
 author_email: [email protected]
 author_github: OliverSkroblin
@@ -24,24 +23,20 @@ author_github: OliverSkroblin
     * Added `ShippingMethodRouteCacheTagsEvent`, which is triggered when the cache item is written, and the attached tags are determined 
 * Added cache layer for product suggest store api route
     * Added `CachedProductSuggestRoute`, which adds a cache around the product suggest route
-    * Added `CachedProductSuggestRouteInvalidator`, which invalidates the cache for the route
     * Added `ProductSuggestRouteCacheKeyEvent`, which is triggered when the cache key for the route is generated
     * Added `ProductSuggestRouteCacheTagsEvent`, which is triggered when the cache item is written, and the attached tags are determined
 * Added cache layer for product search store api route
     * Added `CachedProductSearchRoute`, which adds a cache around the product search route
-    * Added `CachedProductSearchRouteInvalidator`, which invalidates the cache for the route
     * Added `ProductSearchRouteCacheKeyEvent`, which is triggered when the cache key for the route is generated
     * Added `ProductSearchRouteCacheTagsEvent`, which is triggered when the cache item is written, and the attached tags are determined
     * Added `ResolvedCriteriaProductSearchRoute`, which resolves the criteria before the cached route is called. This way the route gets a resolved criterion and does not have to listen to all request parameters. 
 * Added cache layer for product listing store api route
     * Added `CachedProductListingRoute`, which adds a cache around the product listing route
-    * Added `CachedProductListingRouteInvalidator`, which invalidates the cache for the route
     * Added `ProductListingRouteCacheKeyEvent`, which is triggered when the cache key for the route is generated
     * Added `ProductListingRouteCacheTagsEvent`, which is triggered when the cache item is written, and the attached tags are determined
     * Added `ResolveCriteriaProductListingRoute`, which resolves the criteria before the cached route is called. This way the route gets a resolved criterion and does not have to listen to all request parameters. 
 * Added cache layer for product detail store api route
     * Added `CachedProductDetailRoute`, which adds a cache around the product detail route
-    * Added `CachedProductDetailRouteInvalidator`, which invalidates the cache for the route
     * Added `ProductDetailRouteCacheKeyEvent`, which is triggered when the cache key for the route is generated
     * Added `ProductDetailRouteCacheTagsEvent`, which is triggered when the cache item is written, and the attached tags are determined
 * Added cache layer for payment method store api route

changelog/_unreleased/2021-03-18-add-cross-selling-and-category-route-cache.md

@@ -1,7 +1,6 @@
 ---
 title: Add cross selling and category route cache
 issue: NEXT-14084
-flag: FEATURE_NEXT_10514
 author: OliverSkroblin
 author_email: [email protected] 
 author_github: OliverSkroblin

phpstan-baseline.neon

@@ -2190,16 +2190,6 @@ parameters:
 			count: 1
 			path: src/Core/Framework/Bundle.php
 
-		-
-			message: "#^Method Shopware\\\\Core\\\\Framework\\\\Context\\:\\:disableCache\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/Core/Framework/Context.php
-
-		-
-			message: "#^Method Shopware\\\\Core\\\\Framework\\\\Context\\:\\:enableCache\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/Core/Framework/Context.php
-
 		-
 			message: "#^Method Shopware\\\\Core\\\\Framework\\\\Context\\:\\:enableInheritance\\(\\) has no return typehint specified\\.$#"
 			count: 1
@@ -2210,38 +2200,8 @@ parameters:
 			count: 1
 			path: src/Core/Framework/Context.php
 
-		-
-			message: "#^Parameter \\#1 \\$aggregation of method Shopware\\\\Core\\\\Framework\\\\DataAbstractionLayer\\\\Cache\\\\CachedEntityAggregator\\:\\:getAggregationResult\\(\\) expects Shopware\\\\Core\\\\Framework\\\\DataAbstractionLayer\\\\Search\\\\Aggregation\\\\Aggregation, Shopware\\\\Core\\\\Framework\\\\DataAbstractionLayer\\\\Search\\\\Aggregation\\\\Aggregation\\|null given\\.$#"
-			count: 1
-			path: src/Core/Framework/DataAbstractionLayer/Cache/CachedEntityAggregator.php
-
-		-
-			message: "#^Parameter \\#1 \\$aggregation of method Shopware\\\\Core\\\\Framework\\\\DataAbstractionLayer\\\\Cache\\\\CachedEntityAggregator\\:\\:removeFilterAggregation\\(\\) expects Shopware\\\\Core\\\\Framework\\\\DataAbstractionLayer\\\\Search\\\\Aggregation\\\\Aggregation, Shopware\\\\Core\\\\Framework\\\\DataAbstractionLayer\\\\Search\\\\Aggregation\\\\Aggregation\\|null given\\.$#"
-			count: 1
-			path: src/Core/Framework/DataAbstractionLayer/Cache/CachedEntityAggregator.php
-
-		-
-			message: "#^Method Shopware\\\\Core\\\\Framework\\\\DataAbstractionLayer\\\\Cache\\\\CachedEntityAggregator\\:\\:getAggregation\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/Core/Framework/DataAbstractionLayer/Cache/CachedEntityAggregator.php
-
-		-
-			message: "#^Method Shopware\\\\Core\\\\Framework\\\\DataAbstractionLayer\\\\Cache\\\\CachedEntityReader\\:\\:loadFilterResult\\(\\) has no return typehint specified\\.$#"
-			count: 1
-			path: src/Core/Framework/DataAbstractionLayer/Cache/CachedEntityReader.php
-
 		-
 			message: "#^Parameter \\#1 \\$str of function md5 expects string, string\\|false given\\.$#"
-			count: 7
-			path: src/Core/Framework/DataAbstractionLayer/Cache/EntityCacheKeyGenerator.php
-
-		-
-			message: "#^Cannot call method getFields\\(\\) on Shopware\\\\Core\\\\Framework\\\\DataAbstractionLayer\\\\EntityDefinition\\|null\\.$#"
-			count: 1
-			path: src/Core/Framework/DataAbstractionLayer/Cache/EntityCacheKeyGenerator.php
-
-		-
-			message: "#^Parameter \\#1 \\$definition of method Shopware\\\\Core\\\\Framework\\\\DataAbstractionLayer\\\\Cache\\\\EntityCacheKeyGenerator\\:\\:getFieldTag\\(\\) expects Shopware\\\\Core\\\\Framework\\\\DataAbstractionLayer\\\\EntityDefinition, Shopware\\\\Core\\\\Framework\\\\DataAbstractionLayer\\\\EntityDefinition\\|null given\\.$#"
 			count: 2
 			path: src/Core/Framework/DataAbstractionLayer/Cache/EntityCacheKeyGenerator.php
 
@@ -2320,11 +2280,6 @@ parameters:
 			count: 1
 			path: src/Core/Framework/DataAbstractionLayer/Dbal/EntityDefinitionQueryHelper.php
 
-		-
-			message: "#^Parameter \\#2 \\$field of method Shopware\\\\Core\\\\Framework\\\\DataAbstractionLayer\\\\Dbal\\\\EntityDefinitionQueryHelper\\:\\:isInherited\\(\\) expects Shopware\\\\Core\\\\Framework\\\\DataAbstractionLayer\\\\Field\\\\Field, Shopware\\\\Core\\\\Framework\\\\DataAbstractionLayer\\\\Field\\\\Field\\|null given\\.$#"
-			count: 3
-			path: src/Core/Framework/DataAbstractionLayer/Dbal/EntityDefinitionQueryHelper.php
-
 		-
 			message: "#^Cannot call method buildAccessor\\(\\) on Shopware\\\\Core\\\\Framework\\\\DataAbstractionLayer\\\\Dbal\\\\FieldAccessorBuilder\\\\FieldAccessorBuilderInterface\\|null\\.$#"
 			count: 1
@@ -4730,11 +4685,6 @@ parameters:
 			count: 1
 			path: src/Storefront/Framework/Media/StorefrontMediaValidatorRegistry.php
 
-		-
-			message: "#^Method Shopware\\\\Storefront\\\\Framework\\\\Cache\\\\ObjectCacheKeyFinder\\:\\:loop\\(\\) has parameter \\$data with no typehint specified\\.$#"
-			count: 1
-			path: src/Storefront/Framework/Cache/ObjectCacheKeyFinder.php
-
 		-
 			message: "#^Parameter \\#1 \\$mimeType of class Shopware\\\\Storefront\\\\Framework\\\\Media\\\\Exception\\\\FileTypeNotAllowedException constructor expects string, string\\|null given\\.$#"
 			count: 1

psalm.xml

@@ -15,8 +15,6 @@
             <file name="src/Docs/Resources/current/60-references-internals/10-core/50-checkout-process/_examples/10-cart-example.php"/>
             <file name="src/Docs/Resources/deprecated/2-internals/1-core/50-checkout-process/_examples/10-cart-example.php"/>
 
-            <!-- @internal (FEATURE_NEXT_10514) remove this entry -->
-            <file name="src/Core/Framework/Adapter/Cache/CacheInvalidationLogger.php"/>
             <directory name="src/*/Resources/app" />
         </ignoreFiles>
     </projectFiles>

src/Core/Checkout/Cart/CachedRuleLoader.php

@@ -6,7 +6,6 @@
 use Shopware\Core\Content\Rule\RuleCollection;
 use Shopware\Core\Framework\Adapter\Cache\CacheCompressor;
 use Shopware\Core\Framework\Context;
-use Shopware\Core\Framework\Feature;
 use Symfony\Component\Cache\Adapter\TagAwareAdapterInterface;
 
 class CachedRuleLoader extends AbstractRuleLoader
@@ -33,10 +32,6 @@ public function getDecorated(): AbstractRuleLoader
 
     public function load(Context $context): RuleCollection
     {
-        if (!Feature::isActive('FEATURE_NEXT_10514')) {
-            return $this->getDecorated()->load($context);
-        }
-
         $item = $this->cache->getItem(self::CACHE_KEY);
 
         try {

src/Core/Checkout/Cart/CachedRuleLoaderInvalidator.php

@@ -4,7 +4,6 @@
 
 use Shopware\Core\Content\Rule\Event\RuleIndexerEvent;
 use Shopware\Core\Framework\Adapter\Cache\CacheInvalidationLogger;
-use Shopware\Core\Framework\Feature;
 use Shopware\Core\Framework\Plugin\Event\PluginPostActivateEvent;
 use Shopware\Core\Framework\Plugin\Event\PluginPostDeactivateEvent;
 use Shopware\Core\Framework\Plugin\Event\PluginPostInstallEvent;
@@ -35,9 +34,6 @@ public static function getSubscribedEvents()
 
     public function invalidate(): void
     {
-        if (!Feature::isActive('FEATURE_NEXT_10514')) {
-            return;
-        }
         $this->logger->log([CachedRuleLoader::CACHE_KEY]);
     }
 }

src/Core/Checkout/Cart/CartRuleLoader.php

@@ -11,10 +11,6 @@
 
 class CartRuleLoader
 {
-    /**
-     * @feature-deprecated (flag:FEATURE_NEXT_10514) tag:v6.4.0 - Use \Shopware\Core\Checkout\Cart\CachedRuleLoader::CACHE_KEY instead
-     */
-    public const CHECKOUT_RULE_LOADER_CACHE_KEY = CachedRuleLoader::CACHE_KEY;
     private const MAX_ITERATION = 7;
 
     /**

src/Core/Checkout/Customer/DataAbstractionLayer/CustomerIndexer.php

@@ -4,14 +4,12 @@
 
 use Shopware\Core\Checkout\Customer\CustomerDefinition;
 use Shopware\Core\Checkout\Customer\Event\CustomerIndexerEvent;
-use Shopware\Core\Framework\Adapter\Cache\CacheClearer;
 use Shopware\Core\Framework\DataAbstractionLayer\Dbal\Common\IteratorFactory;
 use Shopware\Core\Framework\DataAbstractionLayer\EntityRepositoryInterface;
 use Shopware\Core\Framework\DataAbstractionLayer\Event\EntityWrittenContainerEvent;
 use Shopware\Core\Framework\DataAbstractionLayer\Indexing\EntityIndexer;
 use Shopware\Core\Framework\DataAbstractionLayer\Indexing\EntityIndexingMessage;
 use Shopware\Core\Framework\DataAbstractionLayer\Indexing\ManyToManyIdFieldUpdater;
-use Shopware\Core\Framework\Feature;
 use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
 
 class CustomerIndexer extends EntityIndexer
@@ -26,11 +24,6 @@ class CustomerIndexer extends EntityIndexer
      */
     private $repository;
 
-    /**
-     * @var CacheClearer
-     */
-    private $cacheClearer;
-
     /**
      * @var ManyToManyIdFieldUpdater
      */
@@ -44,13 +37,11 @@ class CustomerIndexer extends EntityIndexer
     public function __construct(
         IteratorFactory $iteratorFactory,
         EntityRepositoryInterface $repository,
-        CacheClearer $cacheClearer,
         ManyToManyIdFieldUpdater $manyToManyIdFieldUpdater,
         EventDispatcherInterface $eventDispatcher
     ) {
         $this->iteratorFactory = $iteratorFactory;
         $this->repository = $repository;
-        $this->cacheClearer = $cacheClearer;
         $this->manyToManyIdFieldUpdater = $manyToManyIdFieldUpdater;
         $this->eventDispatcher = $eventDispatcher;
     }
@@ -101,13 +92,5 @@ public function handle(EntityIndexingMessage $message): void
         $this->manyToManyIdFieldUpdater->update(CustomerDefinition::ENTITY_NAME, $ids, $context);
 
         $this->eventDispatcher->dispatch(new CustomerIndexerEvent($ids, $context));
-
-        //@internal (flag:FEATURE_NEXT_10514) Remove with feature flag
-        if (!Feature::isActive('FEATURE_NEXT_10514')) {
-            $this->cacheClearer->invalidateIds(
-                array_unique(array_merge($ids)),
-                CustomerDefinition::ENTITY_NAME
-            );
-        }
     }
 }

src/Core/Checkout/Customer/SalesChannel/LoadWishlistRoute.php

@@ -134,11 +134,7 @@ private function loadProducts(string $wishlistId, Criteria $criteria, SalesChann
         $event = new CustomerWishlistLoaderCriteriaEvent($criteria, $context);
         $this->eventDispatcher->dispatch($event);
 
-        $products = $context->getContext()->disableCache(
-            function () use ($criteria, $context) {
-                return $this->productRepository->search($criteria, $context);
-            }
-        );
+        $products = $this->productRepository->search($criteria, $context);
 
         $event = new CustomerWishlistProductListingResultEvent($request, $products, $context);
         $this->eventDispatcher->dispatch($event);

src/Core/Checkout/DependencyInjection/customer.xml

@@ -230,7 +230,6 @@
         <service id="Shopware\Core\Checkout\Customer\DataAbstractionLayer\CustomerIndexer">
             <argument type="service" id="Shopware\Core\Framework\DataAbstractionLayer\Dbal\Common\IteratorFactory"/>
             <argument type="service" id="customer.repository"/>
-            <argument type="service" id="Shopware\Core\Framework\Adapter\Cache\CacheClearer"/>
             <argument type="service" id="Shopware\Core\Framework\DataAbstractionLayer\Indexing\ManyToManyIdFieldUpdater"/>
             <argument type="service" id="event_dispatcher"/>
             <tag name="shopware.entity_indexer" priority="100"/>

src/Core/Checkout/DependencyInjection/promotion.xml

@@ -200,7 +200,6 @@
         <service id="Shopware\Core\Checkout\Promotion\DataAbstractionLayer\PromotionIndexer">
             <argument type="service" id="Shopware\Core\Framework\DataAbstractionLayer\Dbal\Common\IteratorFactory"/>
             <argument type="service" id="promotion.repository"/>
-            <argument type="service" id="Shopware\Core\Framework\Adapter\Cache\CacheClearer"/>
             <argument type="service" id="Shopware\Core\Checkout\Promotion\DataAbstractionLayer\PromotionExclusionUpdater"/>
             <argument type="service" id="Shopware\Core\Checkout\Promotion\DataAbstractionLayer\PromotionRedemptionUpdater"/>
             <tag name="shopware.entity_indexer"/>
@@ -209,13 +208,10 @@
 
         <service id="Shopware\Core\Checkout\Promotion\DataAbstractionLayer\PromotionRedemptionUpdater">
             <argument type="service" id="Doctrine\DBAL\Connection"/>
-            <argument type="service" id="Shopware\Core\Framework\Adapter\Cache\CacheClearer"/>
             <tag name="kernel.event_subscriber"/>
         </service>
 
         <service id="Shopware\Core\Checkout\Promotion\DataAbstractionLayer\PromotionExclusionUpdater">
-            <argument type="service" id="Shopware\Core\Framework\DataAbstractionLayer\Cache\EntityCacheKeyGenerator"/>
-            <argument type="service" id="Shopware\Core\Framework\Adapter\Cache\CacheClearer"/>
             <argument type="service" id="Doctrine\DBAL\Connection"/>
         </service>
 

src/Core/Checkout/Payment/SalesChannel/CachedPaymentMethodRoute.php

@@ -11,7 +11,6 @@
 use Shopware\Core\Framework\DataAbstractionLayer\Cache\EntityCacheKeyGenerator;
 use Shopware\Core\Framework\DataAbstractionLayer\FieldSerializer\JsonFieldSerializer;
 use Shopware\Core\Framework\DataAbstractionLayer\Search\Criteria;
-use Shopware\Core\Framework\Feature;
 use Shopware\Core\Framework\Routing\Annotation\Entity;
 use Shopware\Core\Framework\Routing\Annotation\RouteScope;
 use Shopware\Core\Framework\Routing\Annotation\Since;
@@ -105,10 +104,6 @@ public function getDecorated(): AbstractPaymentMethodRoute
      */
     public function load(Request $request, SalesChannelContext $context, Criteria $criteria): PaymentMethodRouteResponse
     {
-        if (!Feature::isActive('FEATURE_NEXT_10514')) {
-            return $this->getDecorated()->load($request, $context, $criteria);
-        }
-
         if ($context->hasState(...$this->states)) {
             $this->logger->info('cache-miss: ' . self::buildName($context->getSalesChannelId()));
 

src/Core/Checkout/Payment/SalesChannel/CachedPaymentMethodRouteInvalidator.php

@@ -6,7 +6,6 @@
 use Shopware\Core\Checkout\Payment\PaymentMethodDefinition;
 use Shopware\Core\Framework\Adapter\Cache\CacheInvalidationLogger;
 use Shopware\Core\Framework\DataAbstractionLayer\Event\EntityWrittenContainerEvent;
-use Shopware\Core\Framework\Feature;
 use Shopware\Core\Framework\Uuid\Uuid;
 use Shopware\Core\System\SalesChannel\Aggregate\SalesChannelPaymentMethod\SalesChannelPaymentMethodDefinition;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
@@ -36,10 +35,6 @@ public static function getSubscribedEvents()
 
     public function invalidate(EntityWrittenContainerEvent $event): void
     {
-        if (!Feature::isActive('FEATURE_NEXT_10514')) {
-            return;
-        }
-
         $logs = array_merge(
             $this->getChangedPaymentMethods($event),
             $this->getChangedAssignments($event)