Skip to content

Commit de6ca84

Browse files
glo60612glo60612
committed
Merge remote-tracking branch 'origin/spartans_pr_28042025' into spartans_pr_21042025
2 parents 36bd9ee + b1e3430 commit de6ca84

File tree

58 files changed

+212
-641
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+212
-641
lines changed

‎app/code/Magento/OpenSearch/Plugin/SearchAdapter/Query/Builder/MatchQueryPlugin.php

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
<?php
2+
/**
3+
* Copyright 2025 Adobe
4+
* All Rights Reserved.
5+
*/
6+
declare(strict_types=1);
7+
8+
namespace Magento\OpenSearch\Plugin\SearchAdapter\Query\Builder;
9+
10+
use Magento\Elasticsearch\SearchAdapter\Query\Builder\QueryInterface as BaseMatchQuery;
11+
use Magento\CatalogSearch\Model\Indexer\Fulltext\Action\DataProvider;
12+
13+
/**
14+
* Modifications for sanitize search query and output result when name attribute disabled from search
15+
*/
16+
class MatchQueryPlugin
17+
{
18+
/**
19+
* @var DataProvider
20+
*/
21+
private $dataProvider;
22+
23+
/**
24+
* Constructor
25+
*
26+
* @param DataProvider $dataProvider
27+
*/
28+
public function __construct(
29+
DataProvider $dataProvider
30+
) {
31+
$this->dataProvider = $dataProvider;
32+
}
33+
34+
/**
35+
* After build plugin to modify selectQuery
36+
*
37+
* @param BaseMatchQuery $subject
38+
* @param array $selectQuery
39+
* @return array
40+
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
41+
*/
42+
public function afterBuild(
43+
BaseMatchQuery $subject,
44+
$selectQuery,
45+
): array {
46+
47+
$nameIsSearchable = $this->dataProvider->getSearchableAttribute('name')->getIsSearchable();
48+
if ($nameIsSearchable == 0) {
49+
if (isset($selectQuery['bool']['should'][0]['match_phrase_prefix']['name']['query'])) {
50+
$requestQueryValue = $selectQuery['bool']['should'][0]['match_phrase_prefix']['name']['query'];
51+
if (!empty($requestQueryValue) &&
52+
str_contains($requestQueryValue, ' ') || str_contains($requestQueryValue, '-')) {
53+
$requestQueryValue = str_replace(['-', ' '], '', $requestQueryValue);
54+
}
55+
$selectQuery['bool']['should'][0]['match_phrase_prefix']['name']['query'] = $requestQueryValue;
56+
}
57+
}
58+
return $selectQuery;
59+
}
60+
}

‎app/code/Magento/OpenSearch/etc/di.xml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0"?>
22
<!--
33
/**
4-
* Copyright © Magento, Inc. All rights reserved.
5-
* See COPYING.txt for license details.
4+
* Copyright 2022 Adobe
5+
* All Rights Reserved.
66
*/
77
-->
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -287,4 +287,7 @@
287287
</argument>
288288
</arguments>
289289
</type>
290+
<type name="Magento\Elasticsearch\SearchAdapter\Query\Builder\QueryInterface">
291+
<plugin name="sanitize_search_string" type="Magento\OpenSearch\Plugin\SearchAdapter\Query\Builder\MatchQueryPlugin" />
292+
</type>
290293
</config>

‎app/code/Magento/OrderCancellationGraphQl/Model/Validator/ValidateOrderCancellationReason.php

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,6 @@
22
/**
33
* Copyright 2025 Adobe
44
* All Rights Reserved.
5-
*
6-
* NOTICE: All information contained herein is, and remains
7-
* the property of Adobe and its suppliers, if any. The intellectual
8-
* and technical concepts contained herein are proprietary to Adobe
9-
* and its suppliers and are protected by all applicable intellectual
10-
* property laws, including trade secret and copyright laws.
11-
* Dissemination of this information or reproduction of this material
12-
* is strictly forbidden unless prior written permission is obtained
13-
* from Adobe.
145
*/
156
declare(strict_types=1);
167

‎app/code/Magento/OrderCancellationGraphQl/Plugin/Model/CancelOrder.php

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,6 @@
22
/**
33
* Copyright 2025 Adobe
44
* All Rights Reserved.
5-
*
6-
* NOTICE: All information contained herein is, and remains
7-
* the property of Adobe and its suppliers, if any. The intellectual
8-
* and technical concepts contained herein are proprietary to Adobe
9-
* and its suppliers and are protected by all applicable intellectual
10-
* property laws, including trade secret and copyright laws.
11-
* Dissemination of this information or reproduction of this material
12-
* is strictly forbidden unless prior written permission is obtained
13-
* from Adobe.
145
*/
156
declare(strict_types=1);
167

‎app/code/Magento/OrderCancellationGraphQl/Plugin/Model/CancelOrderGuest.php

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,6 @@
22
/**
33
* Copyright 2025 Adobe
44
* All Rights Reserved.
5-
*
6-
* NOTICE: All information contained herein is, and remains
7-
* the property of Adobe and its suppliers, if any. The intellectual
8-
* and technical concepts contained herein are proprietary to Adobe
9-
* and its suppliers and are protected by all applicable intellectual
10-
* property laws, including trade secret and copyright laws.
11-
* Dissemination of this information or reproduction of this material
12-
* is strictly forbidden unless prior written permission is obtained
13-
* from Adobe.
145
*/
156
declare(strict_types=1);
167

‎app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/AddComment.php

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,7 @@
11
<?php
2-
/************************************************************************
3-
* Copyright 2025 Adobe
2+
/**
3+
* Copyright 2014 Adobe
44
* All Rights Reserved.
5-
*
6-
* NOTICE: All information contained herein is, and remains
7-
* the property of Adobe and its suppliers, if any. The intellectual
8-
* and technical concepts contained herein are proprietary to Adobe
9-
* and its suppliers and are protected by all applicable intellectual
10-
* property laws, including trade secret and copyright laws.
11-
* Dissemination of this information or reproduction of this material
12-
* is strictly forbidden unless prior written permission is obtained
13-
* from Adobe.
14-
* ***********************************************************************
155
*/
166
declare(strict_types=1);
177

‎app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/EditComment.php

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,7 @@
11
<?php
2-
/************************************************************************
2+
/**
33
* Copyright 2025 Adobe
44
* All Rights Reserved.
5-
*
6-
* NOTICE: All information contained herein is, and remains
7-
* the property of Adobe and its suppliers, if any. The intellectual
8-
* and technical concepts contained herein are proprietary to Adobe
9-
* and its suppliers and are protected by all applicable intellectual
10-
* property laws, including trade secret and copyright laws.
11-
* Dissemination of this information or reproduction of this material
12-
* is strictly forbidden unless prior written permission is obtained
13-
* from Adobe.
14-
* ***********************************************************************
155
*/
166

177
declare(strict_types=1);

‎app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/AddComment.php

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,7 @@
11
<?php
2-
/************************************************************************
3-
* Copyright 2025 Adobe
2+
/**
3+
* Copyright 2014 Adobe
44
* All Rights Reserved.
5-
*
6-
* NOTICE: All information contained herein is, and remains
7-
* the property of Adobe and its suppliers, if any. The intellectual
8-
* and technical concepts contained herein are proprietary to Adobe
9-
* and its suppliers and are protected by all applicable intellectual
10-
* property laws, including trade secret and copyright laws.
11-
* Dissemination of this information or reproduction of this material
12-
* is strictly forbidden unless prior written permission is obtained
13-
* from Adobe.
14-
* ***********************************************************************
155
*/
166
declare(strict_types=1);
177

‎app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/EditComment.php

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,7 @@
11
<?php
2-
/************************************************************************
2+
/**
33
* Copyright 2025 Adobe
44
* All Rights Reserved.
5-
*
6-
* NOTICE: All information contained herein is, and remains
7-
* the property of Adobe and its suppliers, if any. The intellectual
8-
* and technical concepts contained herein are proprietary to Adobe
9-
* and its suppliers and are protected by all applicable intellectual
10-
* property laws, including trade secret and copyright laws.
11-
* Dissemination of this information or reproduction of this material
12-
* is strictly forbidden unless prior written permission is obtained
13-
* from Adobe.
14-
* ***********************************************************************
155
*/
166

177
declare(strict_types=1);

‎app/code/Magento/Sales/Helper/SalesEntityCommentValidator.php

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,7 @@
11
<?php
2-
/************************************************************************
2+
/**
33
* Copyright 2025 Adobe
44
* All Rights Reserved.
5-
*
6-
* NOTICE: All information contained herein is, and remains
7-
* the property of Adobe and its suppliers, if any. The intellectual
8-
* and technical concepts contained herein are proprietary to Adobe
9-
* and its suppliers and are protected by all applicable intellectual
10-
* property laws, including trade secret and copyright laws.
11-
* Dissemination of this information or reproduction of this material
12-
* is strictly forbidden unless prior written permission is obtained
13-
* from Adobe.
14-
* ***********************************************************************
155
*/
166
declare(strict_types=1);
177

0 commit comments

Comments
 (0)