Merge branch '2.4-develop' of https://github.com/magento-commerce/magento2ce into PR-2022-03-11

Author: Anna Bukatar

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

@@ -26,15 +26,11 @@
 class Form extends Template
 {
     /**
-     * Currency factory
-     *
      * @var CurrencyFactory
      */
     protected $_currencyFactory;
 
     /**
-     * Catalog search advanced
-     *
      * @var Advanced
      */
     protected $_catalogSearchAdvanced;
@@ -125,15 +121,12 @@ public function getAttributeValidationClass($attribute)
     public function getAttributeValue($attribute, $part = null)
     {
         $value = $this->getRequest()->getQuery($attribute->getAttributeCode());
+
         if ($part && $value) {
-            if (isset($value[$part])) {
-                $value = $value[$part];
-            } else {
-                $value = '';
-            }
+            $value = $value[$part] ?? '';
         }
 
-        return $value;
+        return is_array($value) ? '' : $value;
     }
 
     /**

app/code/Magento/CatalogSearch/Block/Advanced/Form.php

@@ -51,65 +51,47 @@
 class Advanced extends \Magento\Framework\Model\AbstractModel
 {
     /**
-     * User friendly search criteria list
-     *
      * @var array
      */
     protected $_searchCriterias = [];
 
     /**
-     * Product collection
-     *
      * @var ProductCollection
      */
     protected $_productCollection;
 
     /**
-     * Initialize dependencies
-     *
      * @deprecated 101.0.2
      * @var Config
      */
     protected $_catalogConfig;
 
     /**
-     * Catalog product visibility
-     *
      * @var Visibility
      */
     protected $_catalogProductVisibility;
 
     /**
-     * Attribute collection factory
-     *
      * @var AttributeCollectionFactory
      */
     protected $_attributeCollectionFactory;
 
     /**
-     * Store manager
-     *
      * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
     /**
-     * Product factory
-     *
      * @var ProductFactory
      */
     protected $_productFactory;
 
     /**
-     * Currency factory
-     *
      * @var CurrencyFactory
      */
     protected $_currencyFactory;
 
     /**
-     * Advanced Collection Factory
-     *
      * @deprecated
      * @see $collectionProvider
      * @var ProductCollectionFactory
@@ -197,12 +179,15 @@ public function addFilters($values)
             if (!isset($values[$attribute->getAttributeCode()])) {
                 continue;
             }
-            if ($attribute->getFrontendInput() == 'text' || $attribute->getFrontendInput() == 'textarea') {
-                if (!trim($values[$attribute->getAttributeCode()])) {
-                    continue;
-                }
-            }
+
             $value = $values[$attribute->getAttributeCode()];
+
+            if (($attribute->getFrontendInput() == 'text' || $attribute->getFrontendInput() == 'textarea')
+                && (!is_string($value) || !trim($value))
+            ) {
+                continue;
+            }
+
             $preparedSearchValue = $this->getPreparedSearchCriteria($attribute, $value);
             if (false === $preparedSearchValue) {
                 continue;

app/code/Magento/CatalogSearch/Model/Advanced.php

@@ -19,12 +19,12 @@ class Product extends AbstractDb
     /**
      * Product/Category relation table name
      */
-    const TABLE_NAME = 'catalog_url_rewrite_product_category';
+    public const TABLE_NAME = 'catalog_url_rewrite_product_category';
 
     /**
      * Chunk for mass insert
      */
-    const CHUNK_SIZE = 100;
+    public const CHUNK_SIZE = 100;
 
     /**
      * Primary key auto increment flag
@@ -53,12 +53,12 @@ public function saveMultiple(array $insertData)
     {
         $connection = $this->getConnection();
         if (count($insertData) <= self::CHUNK_SIZE) {
-            return $connection->insertMultiple($this->getTable(self::TABLE_NAME), $insertData);
+            return $connection->insertOnDuplicate($this->getTable(self::TABLE_NAME), $insertData);
         }
         $data = array_chunk($insertData, self::CHUNK_SIZE);
         $totalCount = 0;
         foreach ($data as $insertData) {
-            $totalCount += $connection->insertMultiple($this->getTable(self::TABLE_NAME), $insertData);
+            $totalCount += $connection->insertOnDuplicate($this->getTable(self::TABLE_NAME), $insertData);
         }
         return $totalCount;
     }

app/code/Magento/CatalogUrlRewrite/Model/ResourceModel/Category/Product.php

@@ -34,59 +34,59 @@ class ProcessCronQueueObserver implements ObserverInterface
     /**#@+
      * Cache key values
      */
-    const CACHE_KEY_LAST_SCHEDULE_GENERATE_AT = 'cron_last_schedule_generate_at';
+    public const CACHE_KEY_LAST_SCHEDULE_GENERATE_AT = 'cron_last_schedule_generate_at';
 
-    const CACHE_KEY_LAST_HISTORY_CLEANUP_AT = 'cron_last_history_cleanup_at';
+    public const CACHE_KEY_LAST_HISTORY_CLEANUP_AT = 'cron_last_history_cleanup_at';
 
     /**
      * Flag for internal communication between processes for running
      * all jobs in a group in parallel as a separate process
      */
-    const STANDALONE_PROCESS_STARTED = 'standaloneProcessStarted';
+    public const STANDALONE_PROCESS_STARTED = 'standaloneProcessStarted';
 
     /**#@-*/
 
     /**#@+
      * List of configurable constants used to calculate and validate during handling cron jobs
      */
-    const XML_PATH_SCHEDULE_GENERATE_EVERY = 'schedule_generate_every';
+    public const XML_PATH_SCHEDULE_GENERATE_EVERY = 'schedule_generate_every';
 
-    const XML_PATH_SCHEDULE_AHEAD_FOR = 'schedule_ahead_for';
+    public const XML_PATH_SCHEDULE_AHEAD_FOR = 'schedule_ahead_for';
 
-    const XML_PATH_SCHEDULE_LIFETIME = 'schedule_lifetime';
+    public const XML_PATH_SCHEDULE_LIFETIME = 'schedule_lifetime';
 
-    const XML_PATH_HISTORY_CLEANUP_EVERY = 'history_cleanup_every';
+    public const XML_PATH_HISTORY_CLEANUP_EVERY = 'history_cleanup_every';
 
-    const XML_PATH_HISTORY_SUCCESS = 'history_success_lifetime';
+    public const XML_PATH_HISTORY_SUCCESS = 'history_success_lifetime';
 
-    const XML_PATH_HISTORY_FAILURE = 'history_failure_lifetime';
+    public const XML_PATH_HISTORY_FAILURE = 'history_failure_lifetime';
 
     /**#@-*/
 
     /**
      * Value of seconds in one minute
      */
-    const SECONDS_IN_MINUTE = 60;
+    public const SECONDS_IN_MINUTE = 60;
 
     /**
      * How long to wait for cron group to become unlocked
      */
-    const LOCK_TIMEOUT = 60;
+    public const LOCK_TIMEOUT = 60;
 
     /**
      * Static lock prefix for cron group locking
      */
-    const LOCK_PREFIX = 'CRON_';
+    public const LOCK_PREFIX = 'CRON_';
 
     /**
      * Timer ID for profiling
      */
-    const CRON_TIMERID = 'job %s';
+    public const CRON_TIMERID = 'job %s';
 
     /**
      * Max retries for acquire locks for cron jobs
      */
-    const MAX_RETRIES = 5;
+    public const MAX_RETRIES = 5;
 
     /**
      * @var ScheduleCollection
@@ -378,7 +378,7 @@ function () use ($schedule) {
             );
             if (!$e instanceof \Exception) {
                 $e = new \RuntimeException(
-                    'Error when running a cron job',
+                    'Error when running a cron job: ' . $e->getMessage(),
                     0,
                     $e
                 );

app/code/Magento/Cron/Observer/ProcessCronQueueObserver.php

@@ -619,7 +619,7 @@ function ($callback) {
      */
     public function dispatchExceptionInCallbackDataProvider(): array
     {
-        $throwable = new TypeError();
+        $throwable = new TypeError('Description of TypeError');
         return [
             'non-callable callback' => [
                 'Not_Existed_Class',
@@ -642,11 +642,11 @@ public function dispatchExceptionInCallbackDataProvider(): array
                 new CronJobException(
                     $throwable
                 ),
-                'Error when running a cron job',
+                'Error when running a cron job: Description of TypeError',
                 2,
                 1,
                 new \RuntimeException(
-                    'Error when running a cron job',
+                    'Error when running a cron job: Description of TypeError',
                     0,
                     $throwable
                 )

app/code/Magento/Cron/Test/Unit/Observer/ProcessCronQueueObserverTest.php

@@ -66,6 +66,7 @@ public function execute(Observer $observer): void
         }
         $searchCriteria = $this->searchCriteriaBuilder
             ->addFilter(OrderInterface::CUSTOMER_ID, $customer->getId())
+            ->addFilter(OrderInterface::CUSTOMER_EMAIL, $originalCustomer->getEmail())
             ->create();
 
         /**

app/code/Magento/Customer/Observer/UpgradeOrderCustomerEmailObserver.php

@@ -171,7 +171,7 @@ private function setOriginalCustomerToEventMock(MockObject $originalCustomer): v
 
     private function setCustomerEmail(MockObject $originalCustomer, string $email): void
     {
-        $originalCustomer->expects($this->once())
+        $originalCustomer->expects($this->atLeastOnce())
             ->method('getEmail')
             ->willReturn($email);
     }
@@ -186,7 +186,7 @@ private function whenOrderRepositoryGetListIsCalled(MockObject $orderCollectionM
             ->method('create')
             ->willReturn($searchCriteriaMock);
 
-        $this->searchCriteriaBuilderMock->expects($this->once())
+        $this->searchCriteriaBuilderMock->expects($this->atLeastOnce())
             ->method('addFilter')
             ->willReturn($this->searchCriteriaBuilderMock);
 

app/code/Magento/Customer/Test/Unit/Observer/UpgradeOrderCustomerEmailObserverTest.php

@@ -5,5 +5,5 @@
  */
  -->
 
-<input type="checkbox" name="show-password" title="Show Password" id="show-password" class="checkbox" data-role="show-password" ko-checked="isPasswordVisible">
+<input type="checkbox" name="show-password" data-bind="attr: {title : $t('Show Password')}" id="show-password" class="checkbox" data-role="show-password" ko-checked="isPasswordVisible">
 <label for="show-password" class="label"><span translate="'Show Password'"></span></label>

app/code/Magento/Customer/view/frontend/web/template/show-password.html

@@ -1,5 +1,38 @@
-# GraphQl
+# Magento_GraphQl module
 
-**GraphQl** provides the framework for the application to expose GraphQL compliant web services. It exposes an area for
+This module provides the framework for the application to expose GraphQL compliant web services. It exposes an area for
 GraphQL services and resolves request data based on the generated schema. It also maps this response to a JSON object 
 for the client to read.
+
+## Installation
+
+The Magento_GraphQl module is one of the base Magento 2 modules. You cannot disable or uninstall this module.
+
+This module is dependent on the following modules:
+- `Magento_Authorization`
+- `Magento_Eav`
+
+The following modules depend on this module:
+- `Magento_BundleGraphQl`
+- `Magento_CatalogGraphQl`
+- `Magento_CmsGraphQl`
+- `Magento_CompareListGraphQl`
+- `Magento_ConfigurableProductGraphQl`
+- `Magento_DownloadableGraphQl`
+- `Magento_EavGraphQl`
+- `Magento_GraphQlCache`
+- `Magento_GroupedProductGraphQl`
+- `Magento_ReviewGraphQl`
+- `Magento_StoreGraphQl`
+
+For information about a module installation in Magento 2, see [Enable or disable modules](https://devdocs.magento.com/guides/v2.4/install-gde/install/cli/install-cli-subcommands-enable.html).
+
+## Extensibility
+
+Extension developers can interact with the Magento_GraphQl module. For more information about the Magento extension mechanism, see [Magento plugins](https://devdocs.magento.com/guides/v2.4/extension-dev-guide/plugins.html).
+
+[The Magento dependency injection mechanism](https://devdocs.magento.com/guides/v2.4/extension-dev-guide/depend-inj.html) enables you to override the functionality of the Magento_GraphQl module.
+
+## Additional information
+
+You can get more information about [GraphQl In Magento 2](https://devdocs.magento.com/guides/v2.4/graphql).