ACP2E-3063: [Cloud] Cache is not getting invalidated.

- without test

Author: arnobsh

app/code/Magento/Cms/Model/TagsStrategy.php

@@ -0,0 +1,30 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Cms\Model;
+
+use Magento\Framework\App\Cache\Tag\StrategyInterface;
+
+/**
+ * Provides the cms layout cache identity to invalidate on layout change.
+ */
+class TagsStrategy implements StrategyInterface
+{
+    /**
+     * @inheritDoc
+     */
+    public function getTags($object)
+    {
+        return [
+            sprintf('%s_%s', Page::CACHE_TAG, $object->getId()),
+            sprintf(
+                '%s_%s', 'CMS_PAGE_VIEW_ID',
+                str_replace('-', '_', strtoupper($object->getIdentifier()))
+            )
+        ];
+    }
+}

app/code/Magento/Cms/Observer/InvalidateLayoutCacheObserver.php

@@ -0,0 +1,87 @@
+<?php
+/************************************************************************
+ *
+ * Copyright 2024 Adobe
+ * All Rights Reserved.
+ *
+ * NOTICE: All information contained herein is, and remains
+ * the property of Adobe and its suppliers, if any. The intellectual
+ * and technical concepts contained herein are proprietary to Adobe
+ * and its suppliers and are protected by all applicable intellectual
+ * property laws, including trade secret and copyright laws.
+ * Dissemination of this information or reproduction of this material
+ * is strictly forbidden unless prior written permission is obtained
+ * from Adobe.
+ * ************************************************************************
+ */
+declare(strict_types=1);
+
+namespace Magento\Cms\Observer;
+
+use Magento\Framework\App\Cache\Type\Layout as LayoutCache;
+use Magento\Framework\App\Cache\StateInterface as CacheState;
+use Magento\Framework\App\Cache\Tag\Resolver;
+use Magento\Framework\Event\Observer;
+use Magento\Framework\Event\ObserverInterface;
+
+/**
+ * Invalidates layout cache.
+ */
+class InvalidateLayoutCacheObserver implements ObserverInterface
+{
+    /**
+     * @var LayoutCache
+     */
+    private $layoutCache;
+
+    /**
+     * @var CacheState
+     */
+    private $cacheState;
+
+    /**
+     * @var Resolver
+     */
+    private $tagResolver;
+
+    /**
+     * @param LayoutCache $layoutCache
+     * @param CacheState $cacheState
+     * @param Resolver $tagResolver
+     */
+    public function __construct(
+        LayoutCache $layoutCache,
+        CacheState $cacheState,
+        Resolver $tagResolver
+    ) {
+        $this->layoutCache = $layoutCache;
+        $this->cacheState = $cacheState;
+        $this->tagResolver = $tagResolver;
+    }
+
+    /**
+     * Clean identities of event object from layout cache
+     *
+     * @param Observer $observer
+     *
+     * @return void
+     */
+    public function execute(Observer $observer)
+    {
+        $object = $observer->getEvent()->getObject();
+
+        if (!is_object($object)) {
+            return;
+        }
+
+        if (!$this->cacheState->isEnabled(LayoutCache::TYPE_IDENTIFIER)) {
+            return;
+        }
+
+        $tags = $this->tagResolver->getTags($object);
+
+        if (!empty($tags)) {
+            $this->layoutCache->clean(\Zend_Cache::CLEANING_MODE_MATCHING_ANY_TAG, $tags);
+        }
+    }
+}

app/code/Magento/Cms/etc/di.xml

@@ -316,4 +316,13 @@
             </argument>
         </arguments>
     </virtualType>
+     <type name="Magento\Framework\App\Cache\Tag\Strategy\Factory">
+        <arguments>
+            <argument name="customStrategies" xsi:type="array">
+                <item name="Magento\Cms\Model\Page" xsi:type="object">
+                    Magento\Cms\Model\TagsStrategy
+                </item>
+            </argument>
+        </arguments>
+    </type>
 </config>

app/code/Magento/Cms/etc/events.xml

@@ -39,4 +39,7 @@
     <event name="cms_page_prepare_save">
         <observer name="validate_cms_page" instance="Magento\Cms\Observer\PageValidatorObserver" />
     </event>
+    <event name="clean_cache_by_tags">
+        <observer name="invalidate_layout_cache" instance="Magento\Cms\Observer\InvalidateLayoutCacheObserver"/>
+    </event>
 </config>