Merge remote-tracking branch 'origin/2.4-develop' into 2.4-develop-pr39

Author: zakdma

app/code/Magento/AdvancedSearch/Model/Client/ClientResolver.php

@@ -5,8 +5,9 @@
  */
 namespace Magento\AdvancedSearch\Model\Client;
 
-use \Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\ObjectManagerInterface;
 use Magento\Framework\Search\EngineResolverInterface;
+use Magento\Framework\App\Config\ScopeConfigInterface;
 
 /**
  * @api
@@ -46,7 +47,7 @@ class ClientResolver
     private $clientOptionsPool;
 
     /**
-     * @var EngineResolver
+     * @var EngineResolverInterface
      */
     private $engineResolver;
 

app/code/Magento/AdvancedSearch/Model/Indexer/Fulltext/Plugin/CustomerGroup.php

@@ -12,8 +12,6 @@
 use Magento\Framework\Model\AbstractModel;
 use Magento\Catalog\Model\ResourceModel\Attribute;
 use Magento\AdvancedSearch\Model\Client\ClientOptionsInterface;
-use Magento\Framework\Search\EngineResolverInterface;
-use Magento\Search\Model\EngineResolver;
 
 class CustomerGroup extends AbstractPlugin
 {
@@ -22,24 +20,16 @@ class CustomerGroup extends AbstractPlugin
      */
     protected $clientOptions;
 
-    /**
-     * @var EngineResolverInterface
-     */
-    protected $engineResolver;
-
     /**
      * @param IndexerRegistry $indexerRegistry
      * @param ClientOptionsInterface $clientOptions
-     * @param EngineResolverInterface $engineResolver
      */
     public function __construct(
         IndexerRegistry $indexerRegistry,
-        ClientOptionsInterface $clientOptions,
-        EngineResolverInterface $engineResolver
+        ClientOptionsInterface $clientOptions
     ) {
         parent::__construct($indexerRegistry);
         $this->clientOptions = $clientOptions;
-        $this->engineResolver = $engineResolver;
     }
 
     /**
@@ -56,9 +46,7 @@ public function aroundSave(
         \Closure $proceed,
         AbstractModel $group
     ) {
-        $needInvalidation =
-            ($this->engineResolver->getCurrentSearchEngine() != EngineResolver::CATALOG_SEARCH_MYSQL_ENGINE)
-            && ($group->isObjectNew() || $group->dataHasChangedFor('tax_class_id'));
+        $needInvalidation = $group->isObjectNew() || $group->dataHasChangedFor('tax_class_id');
         $result = $proceed($group);
         if ($needInvalidation) {
             $this->indexerRegistry->get(Fulltext::INDEXER_ID)->invalidate();

app/code/Magento/AdvancedSearch/Test/Unit/Model/Indexer/Fulltext/Plugin/CustomerGroupTest.php

@@ -14,8 +14,8 @@
 use Magento\Customer\Model\ResourceModel\Group as CustomerGroupResourceModel;
 use Magento\Framework\Indexer\IndexerInterface;
 use Magento\Framework\Indexer\IndexerRegistry;
-use Magento\Framework\Search\EngineResolverInterface;
 use PHPUnit\Framework\TestCase;
+use PHPUnit\Framework\MockObject\MockObject;
 
 /**
  * @covers \Magento\AdvancedSearch\Model\Indexer\Fulltext\Plugin\CustomerGroup
@@ -35,7 +35,7 @@ class CustomerGroupTest extends TestCase
     private $indexerMock;
 
     /**
-     * @var Group|MockObject
+     * @var CustomerGroupResourceModel|MockObject
      */
     private $subjectMock;
 
@@ -49,11 +49,6 @@ class CustomerGroupTest extends TestCase
      */
     private $indexerRegistryMock;
 
-    /**
-     * @var EngineResolverInterface|MockObject
-     */
-    private $engineResolverMock;
-
     protected function setUp(): void
     {
         $this->subjectMock = $this->createMock(CustomerGroupResourceModel::class);
@@ -73,35 +68,24 @@ protected function setUp(): void
             IndexerRegistry::class,
             ['get']
         );
-        $this->engineResolverMock = $this->createPartialMock(
-            EngineResolverInterface::class,
-            ['getCurrentSearchEngine']
-        );
         $this->model = new CustomerGroupPlugin(
             $this->indexerRegistryMock,
-            $this->customerOptionsMock,
-            $this->engineResolverMock
+            $this->customerOptionsMock
         );
     }
 
     /**
-     * @param string $searchEngine
      * @param bool $isObjectNew
      * @param bool $isTaxClassIdChanged
      * @param int $invalidateCounter
      * @return void
      * @dataProvider aroundSaveDataProvider
      */
     public function testAroundSave(
-        string $searchEngine,
         bool $isObjectNew,
         bool $isTaxClassIdChanged,
         int $invalidateCounter
     ): void {
-        $this->engineResolverMock->expects($this->once())
-            ->method('getCurrentSearchEngine')
-            ->willReturn($searchEngine);
-
         $groupMock = $this->createPartialMock(
             CustomerGroupModel::class,
             ['dataHasChangedFor', 'isObjectNew', '__wakeup']
@@ -137,14 +121,10 @@ public function testAroundSave(
     public function aroundSaveDataProvider(): array
     {
         return [
-            ['mysql', false, false, 0],
-            ['mysql', false, true, 0],
-            ['mysql', true, false, 0],
-            ['mysql', true, true, 0],
-            ['custom', false, false, 0],
-            ['custom', false, true, 1],
-            ['custom', true, false, 1],
-            ['custom', true, true, 1],
+            [false, false, 0],
+            [false, true, 1],
+            [true, false, 1],
+            [true, true, 1],
         ];
     }
 }

app/code/Magento/Bundle/Test/Mftf/Test/StorefrontAdvanceCatalogSearchBundleBySkuWithHyphenTest.xml

@@ -19,7 +19,7 @@
             <group value="Bundle"/>
             <group value="SearchEngineElasticsearch"/>
             <skip>
-                <issueId value="MC-21228"/>
+                <issueId value="MC-34217"/>
             </skip>
         </annotations>
         <before>

app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml

@@ -35,6 +35,10 @@
         <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
         <requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
     </entity>
+    <entity name="ApiSimpleProductWithNoSpace" type="product" extends="ApiSimpleProduct">
+        <data key="name">TestFooBar</data>
+        <data key="sku" unique="suffix">foobar</data>
+    </entity>
     <entity name="ApiSimpleProductWithSpecCharInName" type="product" extends="ApiSimpleProduct">
         <data key="name">Pursuit Lumaflex&#38;trade; Tone Band</data>
         <data key="sku" unique="suffix">x&#38;trade;</data>
@@ -68,6 +72,9 @@
         <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
         <requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
     </entity>
+    <entity name="ProductForPartialSearch" extends="SimpleProduct" type="product">
+        <data key="sku">partialTestSku</data>
+    </entity>
     <entity name="ProductWithSpecialSymbols" extends="SimpleProduct" type="product">
         <data key="name">SimpleProduct -+~/\\&lt;&gt;\’“:*\$#@()!,.?`=%&amp;^</data>
     </entity>

app/code/Magento/Catalog/Test/Mftf/Test/StorefrontAdvanceCatalogSearchSimpleProductBySkuWithHyphenTest.xml

@@ -19,7 +19,7 @@
             <group value="Catalog"/>
             <group value="SearchEngineElasticsearch"/>
             <skip>
-                <issueId value="MC-21228"/>
+                <issueId value="MC-34217"/>
             </skip>
         </annotations>
         <before>

app/code/Magento/Catalog/Test/Mftf/Test/StorefrontAdvanceCatalogSearchVirtualProductBySkuWithHyphenTest.xml

@@ -19,7 +19,7 @@
             <group value="Catalog"/>
             <group value="SearchEngineElasticsearch"/>
             <skip>
-                <issueId value="MC-21228"/>
+                <issueId value="MC-34217"/>
             </skip>
         </annotations>
         <before>

app/code/Magento/CatalogCmsGraphQl/Model/Resolver/Category/Block.php

@@ -11,6 +11,7 @@
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 use Magento\CmsGraphQl\Model\Resolver\DataProvider\Block as BlockProvider;
@@ -48,18 +49,19 @@ public function resolve(
         }
         /** @var Category $category */
         $category = $value['model'];
-        $blockId = $category->getLandingPage();
+        $blockId = (int)$category->getLandingPage();
+        $storeId = (int)$context->getExtensionAttributes()->getStore()->getId();
 
         if (empty($blockId)) {
             return null;
         }
 
         try {
-            $block = $this->blockProvider->getData($blockId);
+            $blockData = $this->blockProvider->getBlockById($blockId, $storeId);
         } catch (NoSuchEntityException $e) {
-            return null;
+            return new GraphQlNoSuchEntityException(__($e->getMessage()), $e);
         }
 
-        return $block;
+        return $blockData;
     }
 }

app/code/Magento/CatalogGraphQl/Model/Category/CategoryFilter.php

@@ -13,7 +13,6 @@
 use Magento\Framework\Exception\InputException;
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 use Magento\Framework\GraphQl\Query\Resolver\Argument\SearchCriteria\ArgumentApplier\Filter;
-use Magento\Framework\Search\Adapter\Mysql\Query\Builder\Match;
 use Magento\Search\Model\Query;
 use Magento\Store\Api\Data\StoreInterface;
 use Magento\Store\Model\ScopeInterface;
@@ -24,6 +23,11 @@
  */
 class CategoryFilter
 {
+    /**
+     * @var string
+     */
+    private const SPECIAL_CHARACTERS = '-+~/\\<>\'":*$#@()!,.?`=%&^';
+
     /**
      * @var ScopeConfigInterface
      */
@@ -120,7 +124,7 @@ private function formatMatchFilters(array $filters, StoreInterface $store): arra
         foreach ($filters as $filter => $condition) {
             $conditionType = current(array_keys($condition));
             if ($conditionType === 'match') {
-                $searchValue = trim(str_replace(Match::SPECIAL_CHARACTERS, '', $condition[$conditionType]));
+                $searchValue = trim(str_replace(self::SPECIAL_CHARACTERS, '', $condition[$conditionType]));
                 $matchLength = strlen($searchValue);
                 if ($matchLength < $minQueryLength) {
                     throw new InputException(__('Invalid match filter. Minimum length is %1.', $minQueryLength));

app/code/Magento/CatalogGraphQl/Model/Search/Adapter/Mysql/Query/Builder/Match.php

@@ -91,8 +91,6 @@
             </argument>
         </arguments>
     </virtualType>
-    <preference for="Magento\Framework\Search\Adapter\Mysql\Query\Builder\Match"
-                type="Magento\CatalogGraphQl\Model\Search\Adapter\Mysql\Query\Builder\Match" />
     <type name="Magento\StoreGraphQl\Model\Resolver\Store\StoreConfigDataProvider">
         <arguments>
             <argument name="extendedConfigData" xsi:type="array">

app/code/Magento/CatalogGraphQl/etc/graphql/di.xml

@@ -245,7 +245,7 @@ interface CategoryInterface @typeResolver(class: "Magento\\CatalogGraphQl\\Model
     level: Int @doc(description: "Indicates the depth of the category within the tree.")
     created_at: String @doc(description: "Timestamp indicating when the category was created.")
     updated_at: String @doc(description: "Timestamp indicating when the category was updated.")
-    product_count: Int @doc(description: "The number of products in the category.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Category\\ProductsCount")
+    product_count: Int @doc(description: "The number of products in the category that are marked as visible. By default, in complex products, parent products are visible, but their child products are not.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Category\\ProductsCount")
     default_sort_by: String @doc(description: "The attribute to use for sorting.")
     products(
         pageSize: Int = 20 @doc(description: "Specifies the maximum number of results to return at once. This attribute is optional."),
@@ -299,7 +299,7 @@ type SimpleProduct implements ProductInterface, PhysicalProductInterface, Custom
 type Products @doc(description: "The Products object is the top-level object returned in a product search.") {
     items: [ProductInterface] @doc(description: "An array of products that match the specified search criteria.")
     page_info: SearchResultPageInfo @doc(description: "An object that includes the page_info and currentPage values specified in the query.")
-    total_count: Int @doc(description: "The number of products returned.")
+    total_count: Int @doc(description: "The number of products that are marked as visible. By default, in complex products, parent products are visible, but their child products are not.")
     filters: [LayerFilter] @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\LayerFilters") @doc(description: "Layered navigation filters array.") @deprecated(reason: "Use aggregations instead")
     aggregations: [Aggregation] @doc(description: "Layered navigation aggregations.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Aggregations")
     sort_fields: SortFields @doc(description: "An object that includes the default sort field and all available sort fields.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Category\\SortFields")
@@ -308,7 +308,7 @@ type Products @doc(description: "The Products object is the top-level object ret
 type CategoryProducts @doc(description: "The category products object returned in the Category query.") {
     items: [ProductInterface] @doc(description: "An array of products that are assigned to the category.")
     page_info: SearchResultPageInfo @doc(description: "An object that includes the page_info and currentPage values specified in the query.")
-    total_count: Int @doc(description: "The number of products returned.")
+    total_count: Int @doc(description: "The number of products in the category that are marked as visible. By default, in complex products, parent products are visible, but their child products are not.")
 }
 
 input ProductAttributeFilterInput @doc(description: "ProductAttributeFilterInput defines the filters to be used in the search. A filter contains at least one attribute, a comparison operator, and the value that is being searched for.") {