Skip to content

Commit 6a2c7a4

Browse files
author
Maksym Aposov
committed
MAGETWO-51538: Exception when perform advanced search by space in any field
1 parent bf89199 commit 6a2c7a4

File tree

7 files changed

+11
-6
lines changed

7 files changed

+11
-6
lines changed

app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext/Collection.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
use Magento\Framework\Exception\LocalizedException;
1616
use Magento\Framework\App\ObjectManager;
1717

18-
1918
/**
2019
* Fulltext Collection
2120
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
\Magento\Framework\Exception\LocalizedException
22
\Magento\Framework\View\Asset\File\NotFoundException
33
\Magento\Framework\Config\Dom\ValidationException
4+
\Magento\Framework\Search\Request\EmptyRequestDataException
5+
\Magento\Framework\Search\Request\NonExistingRequestNameException

lib/internal/Magento/Framework/Search/Request/Binder.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,9 @@ private function processDimensions($data, $bindData)
7070
*/
7171
private function processData($data, $bindData)
7272
{
73-
array_walk_recursive($bindData, function (&$item) { $item = trim($item);});
73+
array_walk_recursive($bindData, function (&$item) {
74+
$item = trim($item);
75+
});
7476
$bindData = array_filter($bindData);
7577
foreach ($data as $key => $value) {
7678
if (is_array($value)) {

lib/internal/Magento/Framework/Search/Request/Builder.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
namespace Magento\Framework\Search\Request;
88

99
use Magento\Framework\ObjectManagerInterface;
10+
use Magento\Framework\Phrase;
1011
use Magento\Framework\Search\RequestInterface;
1112

1213
class Builder
@@ -33,6 +34,7 @@ class Builder
3334
'dimensions' => [],
3435
'placeholder' => [],
3536
];
37+
3638
/**
3739
* @var Cleaner
3840
*/
@@ -130,7 +132,7 @@ public function create()
130132
/** @var array $data */
131133
$data = $this->config->get($requestName);
132134
if ($data === null) {
133-
throw new NonExistingRequestNameException(__("Request name '{$requestName}' doesn't exist."));
135+
throw new NonExistingRequestNameException(new Phrase("Request name '{$requestName}' doesn't exist."));
134136
}
135137

136138
$data = $this->binder->bind($data, $this->data);

lib/internal/Magento/Framework/Search/Request/Cleaner.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public function clean(array $requestData)
5757
$this->clear();
5858

5959
if (empty($requestData['queries']) && empty($requestData['filters'])) {
60-
throw new EmptyRequestDataException(__('Request query and filter is not set'));
60+
throw new EmptyRequestDataException(new Phrase('Request query and filter is not set'));
6161
}
6262

6363
return $requestData;

lib/internal/Magento/Framework/Search/Request/EmptyRequestDataException.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@
88

99
class EmptyRequestDataException extends \InvalidArgumentException
1010
{
11-
}
11+
}

lib/internal/Magento/Framework/Search/Request/NonExistingRequestNameException.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@
88

99
class NonExistingRequestNameException extends \InvalidArgumentException
1010
{
11-
}
11+
}

0 commit comments

Comments
 (0)