Merge branch 'MAGETWO-99669' of https://github.com/magento-tango/magento2ce into MPI_PR_2019_06_21

Author: ArtemVasyliev

app/code/Magento/Search/Model/ResourceModel/SynonymReader.php

@@ -106,7 +106,7 @@ private function queryByPhrase($phrase)
      */
     private function escapePhrase(string $phrase): string
     {
-        return preg_replace('/@+|[@+-]+$/', '', $phrase);
+        return preg_replace('/@+|[@+-]+$|[<>]/', '', $phrase);
     }
 
     /**

dev/tests/integration/testsuite/Magento/Search/Model/SynonymReaderTest.php

@@ -25,7 +25,7 @@ protected function setUp()
     /**
      * @return array
      */
-    public static function loadByPhraseDataProvider()
+    public function loadByPhraseDataProvider(): array
     {
         return [
             [
@@ -64,6 +64,15 @@ public static function loadByPhraseDataProvider()
             [
                 'query_value+@', []
             ],
+            [
+                '<', []
+            ],
+            [
+                '>', []
+            ],
+            [
+                '<english>', [['synonyms' => 'british,english', 'store_id' => 1, 'website_id' => 0]]
+            ],
         ];
     }
 
@@ -72,7 +81,7 @@ public static function loadByPhraseDataProvider()
      * @param array $expectedResult
      * @dataProvider loadByPhraseDataProvider
      */
-    public function testLoadByPhrase($phrase, $expectedResult)
+    public function testLoadByPhrase(string $phrase, array $expectedResult)
     {
         $data = $this->model->loadByPhrase($phrase)->getData();