update code

Author: rogerdz

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

@@ -7,7 +7,6 @@
 
 namespace Magento\PageCache\Model\App\Request\Http;
 
-use Laminas\Uri\UriFactory;
 use Magento\Framework\App\Http\Context;
 use Magento\Framework\App\PageCache\IdentifierInterface;
 use Magento\Framework\App\Request\Http;
@@ -64,7 +63,7 @@ private function reconstructUrl($url)
             return [$url, ''];
         }
         $baseUrl = strtok((string)$url, '?');
-        $query = UriFactory::factory($url)->getQueryAsArray();
+        $query = $this->request->getUri()->getQueryAsArray();
         if (!empty($query)) {
             ksort($query);
             $query = http_build_query($query);

app/code/Magento/PageCache/Test/Unit/Model/App/Request/Http/IdentifierForSaveTest.php

@@ -8,6 +8,7 @@
 namespace Magento\PageCache\Test\Unit\Model\App\Request\Http;
 
 use Laminas\Stdlib\Parameters;
+use Laminas\Uri\Http as HttpUri;
 use Magento\Framework\App\Http\Context;
 use Magento\Framework\App\Request\Http as HttpRequest;
 use Magento\Framework\Serialize\Serializer\Json;
@@ -115,6 +116,12 @@ public function testGetValue(): void
             ->method('getVaryString')
             ->willReturn(self::VARY);
 
+        $uri = $this->createMock(HttpUri::class);
+        $uri->expects($this->any())->method('getQueryAsArray')->willReturn('');
+        $this->requestMock->expects($this->any())
+            ->method('getUri')
+            ->willReturn($uri);
+
         $this->identifierStoreReader->method('getPageTagsWithStoreCacheTags')->willReturnCallback(
             function ($value) {
                 return $value;
@@ -161,6 +168,15 @@ public function testGetValueWithQuery(): void
             ->method('getVaryString')
             ->willReturn(self::VARY);
 
+        $uri = $this->createMock(HttpUri::class);
+        $uri->expects($this->any())->method('getQueryAsArray')->willReturn([
+            'b' => 2,
+            'a' => 1,
+        ]);
+        $this->requestMock->expects($this->any())
+            ->method('getUri')
+            ->willReturn($uri);
+
         $this->identifierStoreReader->method('getPageTagsWithStoreCacheTags')->willReturnCallback(
             function ($value) {
                 return $value;

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

@@ -5,7 +5,6 @@
  */
 namespace Magento\Framework\App\PageCache;
 
-use Laminas\Uri\UriFactory;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Serialize\Serializer\Json;
 
@@ -75,7 +74,7 @@ private function reconstructUrl($url)
             return [$url, ''];
         }
         $baseUrl = strtok((string)$url, '?');
-        $query = UriFactory::factory($url)->getQueryAsArray();
+        $query = $this->request->getUri()->getQueryAsArray();
         if (!empty($query)) {
             ksort($query);
             $query = http_build_query($query);

lib/internal/Magento/Framework/App/Test/Unit/PageCache/IdentifierTest.php

@@ -8,6 +8,7 @@
 namespace Magento\Framework\App\Test\Unit\PageCache;
 
 use Laminas\Stdlib\Parameters;
+use Laminas\Uri\Http as HttpUri;
 use Magento\Framework\App\Http\Context;
 use Magento\Framework\App\PageCache\Identifier;
 use Magento\Framework\App\Request\Http as HttpRequest;
@@ -107,6 +108,12 @@ public function testSecureDifferentiator(): void
             ->method('toArray')
             ->willReturn([]);
 
+        $uri = $this->createMock(HttpUri::class);
+        $uri->expects($this->any())->method('getQueryAsArray')->willReturn('');
+        $this->requestMock->expects($this->any())
+            ->method('getUri')
+            ->willReturn($uri);
+
         $valueWithSecureRequest = $this->model->getValue();
         $valueWithInsecureRequest = $this->model->getValue();
         $this->assertNotEquals($valueWithSecureRequest, $valueWithInsecureRequest);
@@ -129,6 +136,12 @@ public function testDomainDifferentiator(): void
             ->method('toArray')
             ->willReturn([]);
 
+        $uri = $this->createMock(HttpUri::class);
+        $uri->expects($this->any())->method('getQueryAsArray')->willReturn('');
+        $this->requestMock->expects($this->any())
+            ->method('getUri')
+            ->willReturn($uri);
+
         $valueDomain1 = $this->model->getValue();
         $valueDomain2 = $this->model->getValue();
         $this->assertNotEquals($valueDomain1, $valueDomain2);
@@ -151,6 +164,12 @@ public function testPathDifferentiator(): void
             ->method('toArray')
             ->willReturn([]);
 
+        $uri = $this->createMock(HttpUri::class);
+        $uri->expects($this->any())->method('getQueryAsArray')->willReturn('');
+        $this->requestMock->expects($this->any())
+            ->method('getUri')
+            ->willReturn($uri);
+
         $valuePath1 = $this->model->getValue();
         $valuePath2 = $this->model->getValue();
         $this->assertNotEquals($valuePath1, $valuePath2);
@@ -209,6 +228,12 @@ public function testGetValue(): void
             ->method('toArray')
             ->willReturn([]);
 
+        $uri = $this->createMock(HttpUri::class);
+        $uri->expects($this->any())->method('getQueryAsArray')->willReturn('');
+        $this->requestMock->expects($this->any())
+            ->method('getUri')
+            ->willReturn($uri);
+
         $this->assertEquals(
             sha1(
                 json_encode(
@@ -248,6 +273,15 @@ public function testGetValueWithQuery(): void
                 'a' => 1,
             ]);
 
+        $uri = $this->createMock(HttpUri::class);
+        $uri->expects($this->any())->method('getQueryAsArray')->willReturn([
+            'b' => 2,
+            'a' => 1,
+        ]);
+        $this->requestMock->expects($this->any())
+            ->method('getUri')
+            ->willReturn($uri);
+
         $this->assertEquals(
             sha1(
                 json_encode(