Skip to content

Commit 991b4ac

Browse files
committed
fix integration test
1 parent c081e0d commit 991b4ac

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
namespace Magento\PageCache\Model\App\Request\Http;
99

10+
use Laminas\Uri\UriFactory;
1011
use Magento\Framework\App\Http\Context;
1112
use Magento\Framework\App\PageCache\IdentifierInterface;
1213
use Magento\Framework\App\Request\Http;
@@ -48,7 +49,6 @@ public function getValue()
4849
];
4950

5051
$data = $this->identifierStoreReader->getPageTagsWithStoreCacheTags($data);
51-
5252
return sha1($this->serializer->serialize($data));
5353
}
5454

@@ -61,7 +61,8 @@ public function getValue()
6161
private function reconstructUrl($url)
6262
{
6363
$baseUrl = strtok((string)$url, '?');
64-
$query = $this->request->getQuery()->toArray();
64+
$uri = UriFactory::factory($url);
65+
$query = $uri->getQueryAsArray();
6566
if (!empty($query)) {
6667
ksort($query);
6768
$query = http_build_query($query);

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
*/
66
namespace Magento\Framework\App\PageCache;
77

8+
use Laminas\Uri\UriFactory;
89
use Magento\Framework\App\ObjectManager;
910
use Magento\Framework\Serialize\Serializer\Json;
1011

@@ -71,7 +72,8 @@ public function getValue()
7172
private function reconstructUrl($url)
7273
{
7374
$baseUrl = strtok((string)$url, '?');
74-
$query = $this->request->getQuery()->toArray();
75+
$uri = UriFactory::factory($url);
76+
$query = $uri->getQueryAsArray();
7577
if (!empty($query)) {
7678
ksort($query);
7779
$query = http_build_query($query);

0 commit comments

Comments
 (0)