Added a new page cache identifier model to unify the page cache identifier with store configuration

Author: digitalrisedorset

app/code/Magento/PageCache/Model/App/Request/Http/IdentifierForSave.php

@@ -23,9 +23,10 @@ class IdentifierForSave implements IdentifierInterface
      * @param Json $serializer
      */
     public function __construct(
-        private Http $request,
-        private Context $context,
-        private Json $serializer
+        private Http                  $request,
+        private Context               $context,
+        private Json                  $serializer,
+        private IdentifierStoreReader $identifierStoreReader,
     ) {
     }
 
@@ -42,6 +43,8 @@ public function getValue()
             $this->context->getVaryString()
         ];
 
+        $data = $this->identifierStoreReader->getPageTagsWithStoreCacheTags($data);
+
         return sha1($this->serializer->serialize($data));
     }
 }

app/code/Magento/PageCache/Model/App/Request/Http/IdentifierStoreReader.php

@@ -0,0 +1,67 @@
+<?php
+declare(strict_types=1);
+
+namespace Magento\PageCache\Model\App\Request\Http;
+
+use Magento\Store\Model\StoreManager;
+
+class IdentifierStoreReader
+{
+    /**
+     * @var \Magento\Framework\View\DesignExceptions
+     */
+    private $designExceptions;
+
+    /**
+     * @var \Magento\Framework\App\RequestInterface
+     */
+    private $request;
+
+    /**
+     * @var \Magento\PageCache\Model\Config
+     */
+    private $config;
+
+    /**
+     * @param \Magento\Framework\View\DesignExceptions $designExceptions
+     * @param \Magento\Framework\App\RequestInterface $request
+     * @param \Magento\PageCache\Model\Config $config
+     */
+    public function __construct(
+        \Magento\Framework\View\DesignExceptions $designExceptions,
+        \Magento\Framework\App\RequestInterface $request,
+        \Magento\PageCache\Model\Config $config
+    ) {
+        $this->designExceptions = $designExceptions;
+        $this->request = $request;
+        $this->config = $config;
+    }
+
+    /**
+     * Adds a theme key to identifier for a built-in cache if user-agent theme rule is actual
+     *
+     * @param \Magento\Framework\App\PageCache\Identifier $identifier
+     * @param string $result
+     * @return array
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function getPageTagsWithStoreCacheTags($data): ?array
+    {
+        if ($this->config->getType() === \Magento\PageCache\Model\Config::BUILT_IN && $this->config->isEnabled()) {
+            $ruleDesignException = $this->designExceptions->getThemeByRequest($this->request);
+            if ($ruleDesignException !== false) {
+                $data['DESIGN'] = $ruleDesignException;
+            }
+
+            if ($runType = $this->request->getServerValue(StoreManager::PARAM_RUN_TYPE)) {
+                $data[StoreManager::PARAM_RUN_TYPE] = $runType;
+            }
+
+            if ($runCode = $this->request->getServerValue(StoreManager::PARAM_RUN_CODE)) {
+                $data[StoreManager::PARAM_RUN_CODE] = $runCode;
+            }
+        }
+
+        return $data;
+    }
+}

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

@@ -6,10 +6,6 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
-    <type name="Magento\Framework\App\PageCache\Identifier">
-        <plugin name="core-app-area-design-exception-plugin"
-                type="Magento\PageCache\Model\App\CacheIdentifierPlugin" sortOrder="10"/>
-    </type>
     <type name="Magento\Framework\App\PageCache\Cache">
         <plugin name="fpc-type-plugin" type="Magento\PageCache\Model\App\PageCachePlugin"/>
     </type>

app/code/Magento/PageCache/etc/frontend/di.xml

@@ -31,4 +31,15 @@
             <argument name="identifierForSave" xsi:type="object">Magento\PageCache\Model\App\Request\Http\IdentifierForSave</argument>
         </arguments>
     </type>
+
+    <type name="Magento\PageCache\Model\App\Request\Http\IdentifierForSave">
+        <arguments>
+            <argument name="identifierStoreReader" xsi:type="object">Magento\PageCache\Model\App\Request\Http\IdentifierStoreReader</argument>
+        </arguments>
+    </type>
+    <type name="Magento\Framework\App\PageCache\Identifier">
+        <arguments>
+            <argument name="identifierStoreReader" xsi:type="object">Magento\PageCache\Model\App\Request\Http\IdentifierStoreReader</argument>
+        </arguments>
+    </type>
 </config>