Merge branch 'ACP2E-1787' of https://github.com/magento-l3/magento2ce into PR-2023-04-27

Author: ArtemVasyliev

app/code/Magento/CatalogSearch/Model/Autocomplete/DataProvider.php

@@ -21,11 +21,9 @@ class DataProvider implements DataProviderInterface
     /**
      * Autocomplete limit
      */
-    const CONFIG_AUTOCOMPLETE_LIMIT = 'catalog/search/autocomplete_limit';
+    public const CONFIG_AUTOCOMPLETE_LIMIT = 'catalog/search/autocomplete_limit';
 
     /**
-     * Query factory
-     *
      * @var QueryFactory
      */
     protected $queryFactory;
@@ -38,8 +36,6 @@ class DataProvider implements DataProviderInterface
     protected $itemFactory;
 
     /**
-     * Limit
-     *
      * @var int
      */
     protected $limit;
@@ -68,8 +64,12 @@ public function __construct(
      */
     public function getItems()
     {
-        $collection = $this->getSuggestCollection();
         $query = $this->queryFactory->get()->getQueryText();
+        if (!$query) {
+            return [];
+        }
+
+        $collection = $this->getSuggestCollection();
         $result = [];
         foreach ($collection as $item) {
             $resultItem = $this->itemFactory->create([

app/code/Magento/CatalogSearch/Test/Unit/Model/Autocomplete/DataProviderTest.php

@@ -147,4 +147,17 @@ private function buildCollection(array $data)
             ->method('getIterator')
             ->willReturn(new \ArrayIterator($collectionData));
     }
+
+    public function testGetItemsWithEmptyQueryText()
+    {
+        $this->query->expects($this->once())
+            ->method('getQueryText')
+            ->willReturn('');
+        $this->query->expects($this->never())
+            ->method('getSuggestCollection');
+        $this->itemFactory->expects($this->never())
+            ->method('create');
+        $result = $this->model->getItems();
+        $this->assertEmpty($result);
+    }
 }