Merge branch '2.4-develop' into DHL_AC-3023_JULY_28_22

Author: ishakhsuvarov

app/code/Magento/Catalog/Model/Indexer/Product/Price/AbstractAction.php

@@ -164,6 +164,7 @@ public function __construct(
      */
     abstract public function execute($ids);
 
+    // phpcs:disable
     /**
      * Synchronize data between index storage and original storage
      *
@@ -196,6 +197,7 @@ protected function _syncData(array $processIds = [])
         return $this;
     }
 
+    // phpcs:enable
     /**
      * Prepare website current dates table
      *
@@ -456,6 +458,7 @@ private function deleteOutdatedData(array $entityIds, string $temporaryTable, st
      */
     private function deleteIndexData(array $entityIds)
     {
+        $entityIds = array_unique(array_map('intval', $entityIds));
         foreach ($this->dimensionCollectionFactory->create() as $dimensions) {
             $select = $this->getConnection()->select()->from(
                 ['index_price' => $this->tableMaintainer->getMainTableByDimensions($dimensions)],
@@ -466,6 +469,7 @@ private function deleteIndexData(array $entityIds)
         }
     }
 
+    // phpcs:disable
     /**
      * Copy relations product index from primary index to temporary index table by parent entity
      *
@@ -516,6 +520,7 @@ protected function _copyRelationIndexData($parentIds, $excludeIds = null)
         return $this;
     }
 
+    // phpcs:enable
     /**
      * Retrieve index table by dimension that will be used for write operations.
      *

app/code/Magento/Catalog/view/adminhtml/ui_component/product_listing.xml

@@ -192,6 +192,16 @@
                 <label translate="true">Websites</label>
             </settings>
         </column>
+        <column name="updated_at"
+                class="Magento\Ui\Component\Listing\Columns\Date"
+                component="Magento_Ui/js/grid/columns/date"
+                sortOrder="110">
+            <settings>
+                <filter>dateRange</filter>
+                <dataType>date</dataType>
+                <label translate="true">Last Updated At</label>
+            </settings>
+        </column>
         <actionsColumn name="actions" class="Magento\Catalog\Ui\Component\Listing\Columns\ProductActions" sortOrder="200">
             <settings>
                 <indexField>entity_id</indexField>

app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/components/dynamic-rows-configurable.js

@@ -412,7 +412,7 @@ define([
             product = {
                 'id': row.productId,
                 'product_link': row.productUrl,
-                'name': $('<i></i>').text(row.name).html(),
+                'name': row.name,
                 'sku': row.sku,
                 'status': row.status,
                 'price': row.price,

app/code/Magento/SalesRule/Model/ResourceModel/Rule/Collection.php

@@ -29,6 +29,20 @@ class Collection extends \Magento\Rule\Model\ResourceModel\Rule\Collection\Abstr
      */
     protected $_associatedEntitiesMap;
 
+    /**
+     * SaleRule Event prefix
+     *
+     * @var string
+     */
+    protected $_eventPrefix = 'salesrule_rule_collection';
+
+    /**
+     * SaleRule Event object
+     *
+     * @var string
+     */
+    protected $_eventObject = 'rule_collection';
+
     /**
      * @var \Magento\SalesRule\Model\ResourceModel\Rule\DateApplier
      * @since 100.1.0
@@ -427,6 +441,7 @@ public function addCustomerGroupFilter($customerGroupId)
         return $this;
     }
 
+    // phpcs:disable
     /**
      * Getter for _associatedEntitiesMap property
      *
@@ -437,6 +452,7 @@ private function getAssociatedEntitiesMap()
     {
         if (!$this->_associatedEntitiesMap) {
             $this->_associatedEntitiesMap = \Magento\Framework\App\ObjectManager::getInstance()
+                // phpstan:ignore "Class Magento\SalesRule\Model\ResourceModel\Rule\AssociatedEntityMap not found."
                 ->get(\Magento\SalesRule\Model\ResourceModel\Rule\AssociatedEntityMap::class)
                 ->getData();
         }
@@ -458,4 +474,5 @@ private function getDateApplier()
 
         return $this->dateApplier;
     }
+    // phpcs:enable
 }

dev/tests/integration/testsuite/Magento/Email/Model/TemplateTest.php

@@ -8,8 +8,8 @@
 use Magento\Backend\App\Area\FrontNameResolver as BackendFrontNameResolver;
 use Magento\Framework\App\Area;
 use Magento\Framework\App\Filesystem\DirectoryList;
-use Magento\Framework\App\ObjectManager;
 use Magento\Framework\App\TemplateTypesInterface;
+use Magento\Framework\ObjectManagerInterface;
 use Magento\Framework\View\DesignInterface;
 use Magento\Store\Model\ScopeInterface;
 use Magento\Store\Model\Store;
@@ -26,12 +26,7 @@ class TemplateTest extends \PHPUnit\Framework\TestCase
     protected $model;
 
     /**
-     * @var \Zend_Mail|\PHPUnit\Framework\MockObject\MockObject
-     */
-    protected $mail;
-
-    /**
-     * @var \Magento\Framework\ObjectManagerInterface
+     * @var ObjectManagerInterface
      */
     protected $objectManager;
 
@@ -46,13 +41,8 @@ protected function mockModel($filesystem = null)
             $filesystem = $this->objectManager->create(\Magento\Framework\Filesystem::class);
         }
 
-        $this->mail = $this->getMockBuilder(\Zend_Mail::class)
-            ->setMethods(['send', 'addTo', 'addBcc', 'setReturnPath', 'setReplyTo'])
-            ->setConstructorArgs(['utf-8'])
-            ->getMock();
-
         $this->model = $this->getMockBuilder(\Magento\Email\Model\Template::class)
-            ->setMethods(['_getMail'])
+            ->addMethods([])
             ->setConstructorArgs(
                 [
                     $this->objectManager->get(\Magento\Framework\Model\Context::class),
@@ -73,25 +63,13 @@ protected function mockModel($filesystem = null)
             ->getMock();
 
         $this->objectManager->get(\Magento\Framework\App\State::class)->setAreaCode('frontend');
-
-        $this->model->expects($this->any())->method('_getMail')->willReturnCallback([$this, 'getMail']);
         $this->model
             ->setSenderName('sender')
             ->setSenderEmail('sender@example.com')
             ->setTemplateSubject('Subject')
             ->setTemplateId('abc');
     }
 
-    /**
-     * Return a disposable \Zend_Mail instance
-     *
-     * @return \PHPUnit\Framework\MockObject\MockObject|\Zend_Mail
-     */
-    public function getMail()
-    {
-        return clone $this->mail;
-    }
-
     public function testSetGetTemplateFilter()
     {
         $this->mockModel();

dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php

@@ -4245,6 +4245,7 @@
     ['Zend_Feed', 'Laminas\Feed'],
     ['Zend_Uri', 'Laminas\Uri\Uri'],
     ['Zend_Mime', 'Magento\Framework\HTTP\Mime'],
+    ['Zend_Mail'],
     ['Magento\Framework\Encryption\Crypt', 'Magento\Framework\Encryption\EncryptionAdapterInterface'],
     ['Magento\Wishlist\Setup\Patch\Schema\AddProductIdConstraint'],
     ['Magento\Elasticsearch\Block\Adminhtml\System\Config\TestConnection'],

lib/internal/Magento/Framework/Amqp/Config.php

@@ -5,12 +5,12 @@
  */
 namespace Magento\Framework\Amqp;
 
+use Magento\Framework\Amqp\Connection\Factory as ConnectionFactory;
 use Magento\Framework\Amqp\Connection\FactoryOptions;
 use Magento\Framework\App\DeploymentConfig;
 use Magento\Framework\App\ObjectManager;
-use PhpAmqpLib\Connection\AbstractConnection;
 use PhpAmqpLib\Channel\AMQPChannel;
-use Magento\Framework\Amqp\Connection\Factory as ConnectionFactory;
+use PhpAmqpLib\Connection\AbstractConnection;
 
 /**
  * Reads the Amqp config in the deployed environment configuration
@@ -140,7 +140,7 @@ public function getValue($key)
      */
     private function createConnection(): AbstractConnection
     {
-        $sslEnabled = $this->getValue(self::SSL) && trim($this->getValue(self::SSL)) === 'true';
+        $sslEnabled = trim($this->getValue(self::SSL) ?? '') === 'true';
         $options = new FactoryOptions();
         $options->setHost($this->getValue(self::HOST));
         $options->setPort($this->getValue(self::PORT));

lib/web/jquery/bootstrap/collapse.js

@@ -201,7 +201,7 @@ define([
             this._element.style[dimension] = '';
 
             EventHandler.trigger(this._element, EVENT_SHOWN);
-        }
+        };
 
         const capitalizedDimension = dimension[0].toUpperCase() + dimension.slice(1);
         const scrollSize = `scroll${capitalizedDimension}`;
@@ -246,7 +246,7 @@ define([
             this._element.classList.remove(CLASS_NAME_COLLAPSING);
             this._element.classList.add(CLASS_NAME_COLLAPSE);
             EventHandler.trigger(this._element, EVENT_HIDDEN);
-        }
+        };
 
         this._element.style[dimension] = '';
 

lib/web/jquery/bootstrap/dom/data.js

@@ -14,15 +14,15 @@ define([], function() {
      * ------------------------------------------------------------------------
      */
 
-    const elementMap = new Map()
+    const elementMap = new Map();
 
     return {
         set: function (element, key, instance) {
             if (!elementMap.has(element)) {
                 elementMap.set(element, new Map())
             }
 
-            const instanceMap = elementMap.get(element)
+            const instanceMap = elementMap.get(element);
 
             // make it clear we only want one instance per element
             // can be removed later when multiple key/instances are fine to be used
@@ -48,7 +48,7 @@ define([], function() {
                 return
             }
 
-            const instanceMap = elementMap.get(element)
+            const instanceMap = elementMap.get(element);
 
             instanceMap.delete(key)