Skip to content

Commit 1366c36

Browse files
Merge remote-tracking branch 'remotes/github/MAGETWO-91537' into EPAM-PR-19
2 parents ee06a40 + 9a5d90b commit 1366c36

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductSimple.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
<field name="attribute_set_id" xsi:type="array">
4242
<item name="dataset" xsi:type="string">default</item>
4343
</field>
44-
<field name="name" xsi:type="string">Product \&#39;!@#$%^&amp;*()+:;\\|}{][?=-~` %isolation%</field>
44+
<field name="name" xsi:type="string">Product \&#39;!@#$%^&amp;*()+:;\\|}{][?=~` %isolation%</field>
4545
<field name="sku" xsi:type="string">sku_simple_product_%isolation%</field>
4646
<field name="is_virtual" xsi:type="string">No</field>
4747
<field name="product_has_weight" xsi:type="string">This item has weight</field>

lib/internal/Magento/Framework/Search/Adapter/Mysql/Query/Builder/Match.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,10 @@
2323
*/
2424
class Match implements QueryInterface
2525
{
26-
const SPECIAL_CHARACTERS = '-+~/\\<>\'":*$#@()!,.?`=%&^';
26+
/**
27+
* @var string
28+
*/
29+
const SPECIAL_CHARACTERS = '+~/\\<>\'":*$#@()!,.?`=%&^';
2730

2831
const MINIMAL_CHARACTER_LENGTH = 3;
2932

@@ -117,7 +120,7 @@ public function build(
117120
}
118121

119122
/**
120-
* Prepare query.
123+
* Prepare query value for build function.
121124
*
122125
* @param string $queryValue
123126
* @param string $conditionType

0 commit comments

Comments
 (0)