Skip to content

Commit a5c4a91

Browse files
committed
#23429 fix static test
1 parent b8f6a3a commit a5c4a91

File tree

1 file changed

+36
-33
lines changed

1 file changed

+36
-33
lines changed

app/code/Magento/UrlRewrite/Model/Storage/DbStorage.php

Lines changed: 36 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@ class DbStorage extends AbstractStorage
4949
private $logger;
5050

5151
/**
52-
* @param UrlRewriteFactory $urlRewriteFactory
53-
* @param DataObjectHelper $dataObjectHelper
54-
* @param ResourceConnection $resource
52+
* @param UrlRewriteFactory $urlRewriteFactory
53+
* @param DataObjectHelper $dataObjectHelper
54+
* @param ResourceConnection $resource
5555
* @param LoggerInterface|null $logger
5656
*/
5757
public function __construct(
@@ -71,7 +71,7 @@ public function __construct(
7171
/**
7272
* Prepare select statement for specific filter
7373
*
74-
* @param array $data
74+
* @param array $data
7575
* @return Select
7676
*/
7777
protected function prepareSelect(array $data)
@@ -106,12 +106,14 @@ protected function doFindOneByData(array $data)
106106

107107
$requestPath = $data[UrlRewrite::REQUEST_PATH];
108108
$decodedRequestPath = urldecode($requestPath);
109-
$data[UrlRewrite::REQUEST_PATH] = array_unique([
109+
$data[UrlRewrite::REQUEST_PATH] = array_unique(
110+
[
110111
rtrim($requestPath, '/'),
111112
rtrim($requestPath, '/') . '/',
112113
rtrim($decodedRequestPath, '/'),
113114
rtrim($decodedRequestPath, '/') . '/',
114-
]);
115+
]
116+
);
115117

116118
$resultsFromDb = $this->connection->fetchAll($this->prepareSelect($data));
117119
if ($resultsFromDb) {
@@ -128,30 +130,30 @@ protected function doFindOneByData(array $data)
128130
/**
129131
* Extract most relevant url rewrite from url rewrites list
130132
*
131-
* @param string $requestPath
132-
* @param array $urlRewrites
133+
* @param string $requestPath
134+
* @param array $urlRewrites
133135
* @return array|null
134136
*/
135137
private function extractMostRelevantUrlRewrite(string $requestPath, array $urlRewrites): ?array
136138
{
137139
$prioritizedUrlRewrites = [];
138140
foreach ($urlRewrites as $urlRewrite) {
139141
switch (true) {
140-
case $urlRewrite[UrlRewrite::REQUEST_PATH] === $requestPath:
141-
$priority = 1;
142-
break;
143-
case $urlRewrite[UrlRewrite::REQUEST_PATH] === urldecode($requestPath):
144-
$priority = 2;
145-
break;
146-
case rtrim($urlRewrite[UrlRewrite::REQUEST_PATH], '/') === rtrim($requestPath, '/'):
147-
$priority = 3;
148-
break;
149-
case rtrim($urlRewrite[UrlRewrite::REQUEST_PATH], '/') === rtrim(urldecode($requestPath), '/'):
150-
$priority = 4;
151-
break;
152-
default:
153-
$priority = 5;
154-
break;
142+
case $urlRewrite[UrlRewrite::REQUEST_PATH] === $requestPath:
143+
$priority = 1;
144+
break;
145+
case $urlRewrite[UrlRewrite::REQUEST_PATH] === urldecode($requestPath):
146+
$priority = 2;
147+
break;
148+
case rtrim($urlRewrite[UrlRewrite::REQUEST_PATH], '/') === rtrim($requestPath, '/'):
149+
$priority = 3;
150+
break;
151+
case rtrim($urlRewrite[UrlRewrite::REQUEST_PATH], '/') === rtrim(urldecode($requestPath), '/'):
152+
$priority = 4;
153+
break;
154+
default:
155+
$priority = 5;
156+
break;
155157
}
156158
$prioritizedUrlRewrites[$priority] = $urlRewrite;
157159
}
@@ -166,8 +168,8 @@ private function extractMostRelevantUrlRewrite(string $requestPath, array $urlRe
166168
* If request path matches the DB value or it's redirect - we can return result from DB
167169
* Otherwise return 301 redirect to request path from DB results
168170
*
169-
* @param string $requestPath
170-
* @param array $urlRewrite
171+
* @param string $requestPath
172+
* @param array $urlRewrite
171173
* @return array
172174
*/
173175
private function prepareUrlRewrite(string $requestPath, array $urlRewrite): array
@@ -197,7 +199,7 @@ private function prepareUrlRewrite(string $requestPath, array $urlRewrite): arra
197199
/**
198200
* Delete old URLs from DB.
199201
*
200-
* @param UrlRewrite[] $urls
202+
* @param UrlRewrite[] $urls
201203
* @return void
202204
*/
203205
private function deleteOldUrls(array $urls): void
@@ -242,7 +244,7 @@ private function deleteOldUrls(array $urls): void
242244
/**
243245
* Prepare array with unique entities
244246
*
245-
* @param UrlRewrite[] $urls
247+
* @param UrlRewrite[] $urls
246248
* @return array
247249
*/
248250
private function prepareUniqueEntities(array $urls): array
@@ -258,13 +260,14 @@ private function prepareUniqueEntities(array $urls): array
258260
}
259261
$uniqueEntities[$url->getStoreId()][$url->getEntityType()] = $entityIds;
260262
}
263+
261264
return $uniqueEntities;
262265
}
263266

264267
/**
265268
* @inheritDoc
266269
*/
267-
protected function doReplace(array $urls)
270+
protected function doReplace(array $urls): array
268271
{
269272
$this->connection->beginTransaction();
270273

@@ -312,12 +315,12 @@ protected function doReplace(array $urls)
312315
/**
313316
* Insert multiple
314317
*
315-
* @param array $data
318+
* @param array $data
316319
* @return void
317320
* @throws \Magento\Framework\Exception\AlreadyExistsException|\Exception
318321
* @throws \Exception
319322
*/
320-
protected function insertMultiple($data)
323+
protected function insertMultiple($data): void
321324
{
322325
try {
323326
$this->connection->insertMultiple($this->resource->getTableName(self::TABLE_NAME), $data);
@@ -337,11 +340,11 @@ protected function insertMultiple($data)
337340
/**
338341
* Get filter for url rows deletion due to provided urls
339342
*
340-
* @param UrlRewrite[] $urls
341-
* @return array
343+
* @param UrlRewrite[] $urls
344+
* @return array
342345
* @deprecated Not used anymore.
343346
*/
344-
protected function createFilterDataBasedOnUrls($urls)
347+
protected function createFilterDataBasedOnUrls($urls): array
345348
{
346349
$data = [];
347350
foreach ($urls as $url) {

0 commit comments

Comments
 (0)