Merge remote-tracking branch 'origin/2.3-develop' into MC-21563

Author: Bohdan Shevchenko

app/code/Magento/Backend/view/adminhtml/templates/widget/grid.phtml

@@ -170,6 +170,9 @@ $numColumns = $block->getColumns() !== null ? count($block->getColumns()) : 0;
         <?php if ($block->getSortableUpdateCallback()) : ?>
                 <?= $block->escapeJs($block->getJsObjectName()) ?>.sortableUpdateCallback = <?= /* @noEscape */ $block->getSortableUpdateCallback() ?>;
         <?php endif; ?>
+        <?php if ($block->getFilterKeyPressCallback()) : ?>
+            <?= $block->escapeJs($block->getJsObjectName()) ?>.filterKeyPressCallback = <?= /* @noEscape */ $block->getFilterKeyPressCallback() ?>;
+        <?php endif; ?>
         <?= $block->escapeJs($block->getJsObjectName()) ?>.bindSortable();
         <?php if ($block->getRowInitCallback()) : ?>
                 <?= $block->escapeJs($block->getJsObjectName()) ?>.initRowCallback = <?= /* @noEscape */ $block->getRowInitCallback() ?>;

app/code/Magento/Backend/view/adminhtml/templates/widget/grid/extended.phtml

@@ -272,6 +272,9 @@ $numColumns = count($block->getColumns());
         <?php if ($block->getCheckboxCheckCallback()) : ?>
             <?= $block->escapeJs($block->getJsObjectName()) ?>.checkboxCheckCallback = <?= /* @noEscape */ $block->getCheckboxCheckCallback() ?>;
         <?php endif; ?>
+        <?php if ($block->getFilterKeyPressCallback()) : ?>
+            <?= $block->escapeJs($block->getJsObjectName()) ?>.filterKeyPressCallback = <?= /* @noEscape */ $block->getFilterKeyPressCallback() ?>;
+        <?php endif; ?>
         <?php if ($block->getRowInitCallback()) : ?>
             <?= $block->escapeJs($block->getJsObjectName()) ?>.initRowCallback = <?= /* @noEscape */ $block->getRowInitCallback() ?>;
             <?= $block->escapeJs($block->getJsObjectName()) ?>.initGridRows();

app/code/Magento/Braintree/Gateway/Validator/ErrorCodeProvider.php

@@ -11,6 +11,7 @@
 use Braintree\Error\Validation;
 use Braintree\Result\Error;
 use Braintree\Result\Successful;
+use Braintree\Transaction;
 
 /**
  * Processes errors codes from Braintree response.
@@ -38,12 +39,14 @@ public function getErrorCodes($response): array
             $result[] = $error->code;
         }
 
-        if (isset($response->transaction) && $response->transaction->status === 'gateway_rejected') {
-            $result[] = $response->transaction->gatewayRejectionReason;
-        }
+        if (isset($response->transaction) && $response->transaction) {
+            if ($response->transaction->status === Transaction::GATEWAY_REJECTED) {
+                $result[] = $response->transaction->gatewayRejectionReason;
+            }
 
-        if (isset($response->transaction) && $response->transaction->status === 'processor_declined') {
-            $result[] = $response->transaction->processorResponseCode;
+            if ($response->transaction->status === Transaction::PROCESSOR_DECLINED) {
+                $result[] = $response->transaction->processorResponseCode;
+            }
         }
 
         return $result;

app/code/Magento/Catalog/Helper/Output.php

@@ -9,9 +9,21 @@
 
 use Magento\Catalog\Model\Category as ModelCategory;
 use Magento\Catalog\Model\Product as ModelProduct;
+use Magento\Eav\Model\Config;
+use Magento\Framework\App\Helper\AbstractHelper;
+use Magento\Framework\App\Helper\Context;
+use Magento\Framework\Escaper;
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Filter\Template;
+use function is_object;
+use function method_exists;
+use function preg_match;
+use function strtolower;
 
-class Output extends \Magento\Framework\App\Helper\AbstractHelper
+/**
+ * Html output
+ */
+class Output extends AbstractHelper
 {
     /**
      * Array of existing handlers
@@ -37,12 +49,12 @@ class Output extends \Magento\Framework\App\Helper\AbstractHelper
     /**
      * Eav config
      *
-     * @var \Magento\Eav\Model\Config
+     * @var Config
      */
     protected $_eavConfig;
 
     /**
-     * @var \Magento\Framework\Escaper
+     * @var Escaper
      */
     protected $_escaper;
 
@@ -53,27 +65,32 @@ class Output extends \Magento\Framework\App\Helper\AbstractHelper
 
     /**
      * Output constructor.
-     * @param \Magento\Framework\App\Helper\Context $context
-     * @param \Magento\Eav\Model\Config $eavConfig
+     * @param Context $context
+     * @param Config $eavConfig
      * @param Data $catalogData
-     * @param \Magento\Framework\Escaper $escaper
+     * @param Escaper $escaper
      * @param array $directivePatterns
+     * @param array $handlers
      */
     public function __construct(
-        \Magento\Framework\App\Helper\Context $context,
-        \Magento\Eav\Model\Config $eavConfig,
+        Context $context,
+        Config $eavConfig,
         Data $catalogData,
-        \Magento\Framework\Escaper $escaper,
-        $directivePatterns = []
+        Escaper $escaper,
+        $directivePatterns = [],
+        array $handlers = []
     ) {
         $this->_eavConfig = $eavConfig;
         $this->_catalogData = $catalogData;
         $this->_escaper = $escaper;
         $this->directivePatterns = $directivePatterns;
+        $this->_handlers = $handlers;
         parent::__construct($context);
     }
 
     /**
+     * Return template processor
+     *
      * @return Template
      */
     protected function _getTemplateProcessor()
@@ -115,8 +132,7 @@ public function addHandler($method, $handler)
      */
     public function getHandlers($method)
     {
-        $method = strtolower($method);
-        return $this->_handlers[$method] ?? [];
+        return $this->_handlers[strtolower($method)] ?? [];
     }
 
     /**
@@ -145,21 +161,21 @@ public function process($method, $result, $params)
      * @param string $attributeName
      * @return string
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws LocalizedException
      */
     public function productAttribute($product, $attributeHtml, $attributeName)
     {
         $attribute = $this->_eavConfig->getAttribute(ModelProduct::ENTITY, $attributeName);
         if ($attribute &&
             $attribute->getId() &&
-            $attribute->getFrontendInput() != 'media_image' &&
+            $attribute->getFrontendInput() !== 'media_image' &&
             (!$attribute->getIsHtmlAllowedOnFront() &&
             !$attribute->getIsWysiwygEnabled())
         ) {
-            if ($attribute->getFrontendInput() != 'price') {
+            if ($attribute->getFrontendInput() !== 'price') {
                 $attributeHtml = $this->_escaper->escapeHtml($attributeHtml);
             }
-            if ($attribute->getFrontendInput() == 'textarea') {
+            if ($attribute->getFrontendInput() === 'textarea') {
                 $attributeHtml = nl2br($attributeHtml);
             }
         }
@@ -187,14 +203,14 @@ public function productAttribute($product, $attributeHtml, $attributeName)
      * @param string $attributeHtml
      * @param string $attributeName
      * @return string
-     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws LocalizedException
      */
     public function categoryAttribute($category, $attributeHtml, $attributeName)
     {
         $attribute = $this->_eavConfig->getAttribute(ModelCategory::ENTITY, $attributeName);
 
         if ($attribute &&
-            $attribute->getFrontendInput() != 'image' &&
+            $attribute->getFrontendInput() !== 'image' &&
             (!$attribute->getIsHtmlAllowedOnFront() &&
             !$attribute->getIsWysiwygEnabled())
         ) {

app/code/Magento/Catalog/Model/Product/Hydrator.php

@@ -0,0 +1,39 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Model\Product;
+
+use Magento\Framework\EntityManager\HydratorInterface;
+
+/**
+ * Class is used to extract data and populate entity with data
+ */
+class Hydrator implements HydratorInterface
+{
+    /**
+     * @inheritdoc
+     */
+    public function extract($entity)
+    {
+        return $entity->getData();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function hydrate($entity, array $data)
+    {
+        $lockedAttributes = $entity->getLockedAttributes();
+        $entity->unlockAttributes();
+        $entity->setData(array_merge($entity->getData(), $data));
+        foreach ($lockedAttributes as $attribute) {
+            $entity->lockAttribute($attribute);
+        }
+
+        return $entity;
+    }
+}

app/code/Magento/Catalog/Ui/Component/UrlInput/Product.php

@@ -10,6 +10,9 @@
 
 use Magento\Framework\UrlInterface;
 
+/**
+ * Returns configuration for product Url Input type
+ */
 class Product implements \Magento\Ui\Model\UrlInput\ConfigInterface
 {
     /**
@@ -27,7 +30,7 @@ public function __construct(UrlInterface $urlBuilder)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getConfig(): array
     {
@@ -46,6 +49,7 @@ public function getConfig(): array
             'template' => 'ui/grid/filters/elements/ui-select',
             'searchUrl' => $this->urlBuilder->getUrl('catalog/product/search'),
             'filterPlaceholder' => __('Product Name or SKU'),
+            'filterRateLimitMethod' => 'notifyWhenChangesStop',
             'isDisplayEmptyPlaceholder' => true,
             'emptyOptionsHtml' => __('Start typing to find products'),
             'missingValuePlaceholder' => __('Product with ID: %s doesn\'t exist'),

app/code/Magento/Catalog/etc/di.xml

@@ -867,7 +867,7 @@
             <argument name="hydrators" xsi:type="array">
                 <item name="Magento\Catalog\Api\Data\CategoryInterface" xsi:type="string">Magento\Framework\EntityManager\AbstractModelHydrator</item>
                 <item name="Magento\Catalog\Api\Data\CategoryTreeInterface" xsi:type="string">Magento\Framework\EntityManager\AbstractModelHydrator</item>
-                <item name="Magento\Catalog\Api\Data\ProductInterface" xsi:type="string">Magento\Framework\EntityManager\AbstractModelHydrator</item>
+                <item name="Magento\Catalog\Api\Data\ProductInterface" xsi:type="string">Magento\Catalog\Model\Product\Hydrator</item>
             </argument>
         </arguments>
     </type>

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

@@ -0,0 +1,102 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogGraphQl\Model\Category;
+
+use Magento\Catalog\Api\Data\CategoryInterface;
+use Magento\Catalog\Model\ResourceModel\Category\Collection;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\Exception\InputException;
+use Magento\Store\Api\Data\StoreInterface;
+use Magento\Store\Model\ScopeInterface;
+use Magento\Search\Model\Query;
+
+/**
+ * Category filter allows to filter collection using 'id, url_key, name' from search criteria.
+ */
+class CategoryFilter
+{
+    /**
+     * @var ScopeConfigInterface
+     */
+    private $scopeConfig;
+
+    /**
+     * @param ScopeConfigInterface $scopeConfig
+     */
+    public function __construct(
+        ScopeConfigInterface $scopeConfig
+    ) {
+        $this->scopeConfig = $scopeConfig;
+    }
+
+    /**
+     * Filter for filtering the requested categories id's based on url_key, ids, name in the result.
+     *
+     * @param array $args
+     * @param Collection $categoryCollection
+     * @param StoreInterface $store
+     * @throws InputException
+     */
+    public function applyFilters(array $args, Collection $categoryCollection, StoreInterface $store)
+    {
+        $categoryCollection->addAttributeToFilter(CategoryInterface::KEY_IS_ACTIVE, ['eq' => 1]);
+        foreach ($args['filters'] as $field => $cond) {
+            foreach ($cond as $condType => $value) {
+                if ($field === 'ids') {
+                    $categoryCollection->addIdFilter($value);
+                } else {
+                    $this->addAttributeFilter($categoryCollection, $field, $condType, $value, $store);
+                }
+            }
+        }
+    }
+
+    /**
+     * Add filter to category collection
+     *
+     * @param Collection $categoryCollection
+     * @param string $field
+     * @param string $condType
+     * @param string|array $value
+     * @param StoreInterface $store
+     * @throws InputException
+     */
+    private function addAttributeFilter($categoryCollection, $field, $condType, $value, $store)
+    {
+        if ($condType === 'match') {
+            $this->addMatchFilter($categoryCollection, $field, $value, $store);
+            return;
+        }
+        $categoryCollection->addAttributeToFilter($field, [$condType => $value]);
+    }
+
+    /**
+     * Add match filter to collection
+     *
+     * @param Collection $categoryCollection
+     * @param string $field
+     * @param string $value
+     * @param StoreInterface $store
+     * @throws InputException
+     */
+    private function addMatchFilter($categoryCollection, $field, $value, $store)
+    {
+        $minQueryLength = $this->scopeConfig->getValue(
+            Query::XML_PATH_MIN_QUERY_LENGTH,
+            ScopeInterface::SCOPE_STORE,
+            $store
+        );
+        $searchValue = str_replace('%', '', $value);
+        $matchLength = strlen($searchValue);
+        if ($matchLength < $minQueryLength) {
+            throw new InputException(__('Invalid match filter'));
+        }
+
+        $categoryCollection->addAttributeToFilter($field, ['like' => "%{$searchValue}%"]);
+    }
+}