Moved identifier page cache model outside of library folder to allow to work with non library models for the cache logic

Author: digitalrisedorset

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

@@ -0,0 +1,61 @@
+<?php
+declare(strict_types=1);
+
+namespace Magento\PageCache\Model\App\Request\Http;
+
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\App\PageCache\IdentifierInterface;
+use Magento\Framework\Serialize\Serializer\Json;
+
+class Identifier implements IdentifierInterface
+{
+    /**
+     * @var \Magento\Framework\App\Request\Http
+     */
+    protected $request;
+
+    /**
+     * @var \Magento\Framework\App\Http\Context
+     */
+    protected $context;
+
+    /**
+     * @var Json
+     */
+    private $serializer;
+
+    /**
+     * @param \Magento\Framework\App\Request\Http $request
+     * @param \Magento\Framework\App\Http\Context $context
+     * @param Json|null $serializer
+     */
+    public function __construct(
+        \Magento\Framework\App\Request\Http $request,
+        \Magento\Framework\App\Http\Context $context,
+        Json $serializer = null,
+        private IdentifierStoreReader $identifierStoreReader
+    ) {
+        $this->request = $request;
+        $this->context = $context;
+        $this->serializer = $serializer ?: ObjectManager::getInstance()->get(Json::class);
+    }
+
+    /**
+     * Return unique page identifier
+     *
+     * @return string
+     */
+    public function getValue()
+    {
+        $data = [
+            $this->request->isSecure(),
+            $this->request->getUriString(),
+            $this->request->get(\Magento\Framework\App\Response\Http::COOKIE_VARY_STRING)
+                ?: $this->context->getVaryString()
+        ];
+
+        $data = $this->identifierStoreReader->getPageTagsWithStoreCacheTags($data);
+
+        return sha1($this->serializer->serialize($data));
+    }
+}

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

@@ -44,4 +44,6 @@
     <preference for="Magento\PageCache\Model\VclGeneratorInterface" type="Magento\PageCache\Model\Varnish\VclGenerator"/>
     <preference for="Magento\PageCache\Model\VclTemplateLocatorInterface" type="Magento\PageCache\Model\Varnish\VclTemplateLocator"/>
     <preference for="Magento\PageCache\Model\Spi\PageCacheTagsPreprocessorInterface" type="Magento\PageCache\Model\PageCacheTagsPreprocessorComposite"/>
+
+    <preference for="Magento\Framework\App\PageCache\IdentifierInterface" type="Magento\PageCache\Model\App\Request\Http\Identifier"/>
 </config>

lib/internal/Magento/Framework/App/PageCache/Identifier.php

@@ -7,7 +7,6 @@
 
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Serialize\Serializer\Json;
-use Magento\PageCache\Model\App\Request\Http\IdentifierStoreReader;
 
 /**
  * Page unique identifier
@@ -37,8 +36,7 @@ class Identifier implements IdentifierInterface
     public function __construct(
         \Magento\Framework\App\Request\Http $request,
         \Magento\Framework\App\Http\Context $context,
-        Json $serializer = null,
-        private IdentifierStoreReader $identifierStoreReader
+        Json $serializer = null
     ) {
         $this->request = $request;
         $this->context = $context;
@@ -59,8 +57,6 @@ public function getValue()
                 ?: $this->context->getVaryString()
         ];
 
-        $data = $this->identifierStoreReader->getPageTagsWithStoreCacheTags($data);
-
         return sha1($this->serializer->serialize($data));
     }
 }