[Magento Community Engineering] Community Contributions - 2.3-develop

 - merged latest code from mainline branch

Author: magento-engcom-team

app/code/Magento/AuthorizenetAcceptjs/view/adminhtml/templates/payment/script.phtml

@@ -6,12 +6,19 @@
 
 /** @var Magento\AuthorizenetAcceptjs\Block\Payment $block */
 ?>
-<script type="text/x-magento-init">
-    {
-        "#payment_form_<?= $block->escapeJs($block->escapeHtml($block->getMethodCode())) ?>": {
-            "Magento_AuthorizenetAcceptjs/js/payment-form": {
-                "config": <?= /* @noEscape */ $block->getPaymentConfig() ?>
-            }
-        }
-    }
-</script>
+<script>
+    //<![CDATA[
+    require(
+        [
+            'Magento_AuthorizenetAcceptjs/js/authorizenet',
+            'jquery',
+            'domReady!'
+        ], function(AuthorizenetAcceptjs, $) {
+            var config = <?= /* @noEscape */ $block->getPaymentConfig() ?>,
+                form = $('#payment_form_<?= /* @noEscape */ $block->escapeJs($block->escapeHtml($block->getMethodCode())) ?>');
+
+            config.active = form.length > 0 && !form.is(':hidden');
+            new AuthorizenetAcceptjs(config);
+        });
+    //]]>
+</script>

app/code/Magento/Catalog/Model/Product/Type/Price.php

@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Catalog\Model\Product\Type;
 
 use Magento\Catalog\Model\Product;
@@ -91,6 +93,11 @@ class Price
      */
     private $tierPriceExtensionFactory;
 
+    /**
+     * @var \Magento\CatalogRule\Model\RuleDateFormatterInterface
+     */
+    private $ruleDateFormatter;
+
     /**
      * Constructor
      *
@@ -104,6 +111,7 @@ class Price
      * @param \Magento\Catalog\Api\Data\ProductTierPriceInterfaceFactory $tierPriceFactory
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $config
      * @param ProductTierPriceExtensionFactory|null $tierPriceExtensionFactory
+     * @param \Magento\CatalogRule\Model\RuleDateFormatterInterface|null $ruleDateFormatter
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -116,7 +124,8 @@ public function __construct(
         GroupManagementInterface $groupManagement,
         \Magento\Catalog\Api\Data\ProductTierPriceInterfaceFactory $tierPriceFactory,
         \Magento\Framework\App\Config\ScopeConfigInterface $config,
-        ProductTierPriceExtensionFactory $tierPriceExtensionFactory = null
+        ProductTierPriceExtensionFactory $tierPriceExtensionFactory = null,
+        \Magento\CatalogRule\Model\RuleDateFormatterInterface $ruleDateFormatter = null
     ) {
         $this->_ruleFactory = $ruleFactory;
         $this->_storeManager = $storeManager;
@@ -129,6 +138,8 @@ public function __construct(
         $this->config = $config;
         $this->tierPriceExtensionFactory = $tierPriceExtensionFactory ?: ObjectManager::getInstance()
             ->get(ProductTierPriceExtensionFactory::class);
+        $this->ruleDateFormatter = $ruleDateFormatter ?: ObjectManager::getInstance()
+            ->get(\Magento\CatalogRule\Model\RuleDateFormatterInterface::class);
     }
 
     /**
@@ -502,10 +513,10 @@ public function getFormattedTierPrice($qty, $product)
     /**
      * Get formatted by currency tier price
      *
-     * @param   float $qty
-     * @param   Product $product
+     * @param float $qty
+     * @param Product $product
      *
-     * @return  array|float
+     * @return array|float
      *
      * @deprecated
      * @see getFormattedTierPrice()
@@ -529,8 +540,8 @@ public function getFormattedPrice($product)
     /**
      * Get formatted by currency product price
      *
-     * @param   Product $product
-     * @return  array || float
+     * @param Product $product
+     * @return array || float
      *
      * @deprecated
      * @see getFormattedPrice()
@@ -611,7 +622,7 @@ public function calculatePrice(
         );
 
         if ($rulePrice === false) {
-            $date = $this->_localeDate->scopeDate($sId);
+            $date = $this->ruleDateFormatter->getDate($sId);
             $rulePrice = $this->_ruleFactory->create()->getRulePrice($date, $wId, $gId, $productId);
         }
 

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

@@ -11,6 +11,7 @@
     <test name="AdminCloneProductWithDuplicateUrlTest">
         <annotations>
             <features value="Catalog"/>
+            <stories value="Product"/>
             <title value="Cloning a product with duplicate URL key"/>
             <description value="Check product cloning with duplicate URL key"/>
             <severity value="AVERAGE"/>

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

@@ -11,6 +11,7 @@
     <test name="AdminRestrictedUserAddCategoryFromProductPageTest">
         <annotations>
             <features value="Catalog"/>
+            <stories value="Category"/>
             <title value="Adding new category from product page by restricted user"/>
             <description value="Adding new category from product page by restricted user"/>
             <severity value="MAJOR"/>

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

@@ -11,6 +11,7 @@
     <test name="CheckCurrentCategoryIsHighlightedAndProductsDisplayed">
         <annotations>
             <features value="Catalog"/>
+            <stories value="Category"/>
             <title value="Сheck that current category is highlighted and all products displayed for it"/>
             <description value="Сheck that current category is highlighted and all products displayed for it"/>
             <severity value="MAJOR"/>

app/code/Magento/Catalog/view/frontend/templates/product/image.phtml

@@ -6,7 +6,7 @@
 ?>
 <?php /** @var $block \Magento\Catalog\Block\Product\Image */ ?>
 
-<img class="photo image"
+<img class="photo image <?= $block->escapeHtmlAttr($block->getClass()) ?>"
     <?= $block->escapeHtml($block->getCustomAttributes()) ?>
     src="<?= $block->escapeUrl($block->getImageUrl()) ?>"
     width="<?= $block->escapeHtmlAttr($block->getWidth()) ?>"

app/code/Magento/CatalogInventory/Model/ResourceModel/Indexer/Stock/DefaultStock.php

@@ -230,8 +230,6 @@ protected function _getStockStatusSelect($entityIds = null, $usePrimaryTable = f
     {
         $connection = $this->getConnection();
         $qtyExpr = $connection->getCheckSql('cisi.qty > 0', 'cisi.qty', 0);
-        $metadata = $this->getMetadataPool()->getMetadata(\Magento\Catalog\Api\Data\ProductInterface::class);
-        $linkField = $metadata->getLinkField();
 
         $select = $connection->select()->from(
             ['e' => $this->getTable('catalog_product_entity')],
@@ -245,12 +243,6 @@ protected function _getStockStatusSelect($entityIds = null, $usePrimaryTable = f
             ['cisi' => $this->getTable('cataloginventory_stock_item')],
             'cisi.stock_id = cis.stock_id AND cisi.product_id = e.entity_id',
             []
-        )->joinInner(
-            ['mcpei' => $this->getTable('catalog_product_entity_int')],
-            'e.' . $linkField . ' = mcpei.' . $linkField
-            . ' AND mcpei.attribute_id = ' . $this->_getAttribute('status')->getId()
-            . ' AND mcpei.value = ' . ProductStatus::STATUS_ENABLED,
-            []
         )->columns(
             ['qty' => $qtyExpr]
         )->where(

app/code/Magento/CatalogRule/Model/ResourceModel/Product/CollectionProcessor.php

@@ -4,13 +4,18 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\CatalogRule\Model\ResourceModel\Product;
 
 use Magento\Catalog\Model\ResourceModel\Product\Collection as ProductCollection;
 use Magento\CatalogRule\Pricing\Price\CatalogRulePrice;
+use Magento\Framework\App\ObjectManager;
 
 /**
  * Add catalog rule prices to collection
+ *
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  */
 class CollectionProcessor
 {
@@ -39,28 +44,39 @@ class CollectionProcessor
      */
     private $localeDate;
 
+    /**
+     * @var \Magento\CatalogRule\Model\RuleDateFormatterInterface
+     */
+    private $ruleDateFormatter;
+
     /**
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\App\ResourceConnection $resourceConnection
      * @param \Magento\Customer\Model\Session $customerSession
      * @param \Magento\Framework\Stdlib\DateTime $dateTime
      * @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
+     * @param \Magento\CatalogRule\Model\RuleDateFormatterInterface|null $ruleDateFormatter
      */
     public function __construct(
         \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\App\ResourceConnection $resourceConnection,
         \Magento\Customer\Model\Session $customerSession,
         \Magento\Framework\Stdlib\DateTime $dateTime,
-        \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
+        \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
+        \Magento\CatalogRule\Model\RuleDateFormatterInterface $ruleDateFormatter = null
     ) {
         $this->storeManager = $storeManager;
         $this->resource = $resourceConnection;
         $this->customerSession = $customerSession;
         $this->dateTime = $dateTime;
         $this->localeDate = $localeDate;
+        $this->ruleDateFormatter = $ruleDateFormatter ?: ObjectManager::getInstance()
+            ->get(\Magento\CatalogRule\Model\RuleDateFormatterInterface::class);
     }
 
     /**
+     * Join prices to collection
+     *
      * @param ProductCollection $productCollection
      * @param string $joinColumn
      * @return ProductCollection
@@ -73,18 +89,21 @@ public function addPriceData(ProductCollection $productCollection, $joinColumn =
             $productCollection->getSelect()
                 ->joinLeft(
                     ['catalog_rule' => $this->resource->getTableName('catalogrule_product_price')],
-                    implode(' AND ', [
-                        'catalog_rule.product_id = ' . $connection->quoteIdentifier($joinColumn),
-                        $connection->quoteInto('catalog_rule.website_id = ?', $store->getWebsiteId()),
-                        $connection->quoteInto(
-                            'catalog_rule.customer_group_id = ?',
-                            $this->customerSession->getCustomerGroupId()
-                        ),
-                        $connection->quoteInto(
-                            'catalog_rule.rule_date = ?',
-                            $this->dateTime->formatDate($this->localeDate->scopeDate($store->getId()), false)
-                        ),
-                    ]),
+                    implode(
+                        ' AND ',
+                        [
+                            'catalog_rule.product_id = ' . $connection->quoteIdentifier($joinColumn),
+                            $connection->quoteInto('catalog_rule.website_id = ?', $store->getWebsiteId()),
+                            $connection->quoteInto(
+                                'catalog_rule.customer_group_id = ?',
+                                $this->customerSession->getCustomerGroupId()
+                            ),
+                            $connection->quoteInto(
+                                'catalog_rule.rule_date = ?',
+                                $this->dateTime->formatDate($this->ruleDateFormatter->getDate($store->getId()), false)
+                            ),
+                        ]
+                    ),
                     [CatalogRulePrice::PRICE_CODE => 'rule_price']
                 );
             $productCollection->setFlag('catalog_rule_loaded', true);

app/code/Magento/CatalogRule/Model/ResourceModel/Product/LinkedProductSelectBuilderByCatalogRulePrice.php

@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\CatalogRule\Model\ResourceModel\Product;
 
 use Magento\Catalog\Api\Data\ProductInterface;
@@ -11,6 +13,11 @@
 use Magento\Framework\DB\Select;
 use Magento\Catalog\Model\ResourceModel\Product\LinkedProductSelectBuilderInterface;
 
+/**
+ * Provide Select object for retrieve product id with minimal price
+ *
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
+ */
 class LinkedProductSelectBuilderByCatalogRulePrice implements LinkedProductSelectBuilderInterface
 {
     /**
@@ -48,6 +55,11 @@ class LinkedProductSelectBuilderByCatalogRulePrice implements LinkedProductSelec
      */
     private $baseSelectProcessor;
 
+    /**
+     * @var \Magento\CatalogRule\Model\RuleDateFormatterInterface
+     */
+    private $ruleDateFormatter;
+
     /**
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\App\ResourceConnection $resourceConnection
@@ -56,6 +68,7 @@ class LinkedProductSelectBuilderByCatalogRulePrice implements LinkedProductSelec
      * @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
      * @param \Magento\Framework\EntityManager\MetadataPool $metadataPool
      * @param BaseSelectProcessorInterface $baseSelectProcessor
+     * @param \Magento\CatalogRule\Model\RuleDateFormatterInterface|null $ruleDateFormatter
      */
     public function __construct(
         \Magento\Store\Model\StoreManagerInterface $storeManager,
@@ -64,7 +77,8 @@ public function __construct(
         \Magento\Framework\Stdlib\DateTime $dateTime,
         \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
         \Magento\Framework\EntityManager\MetadataPool $metadataPool,
-        BaseSelectProcessorInterface $baseSelectProcessor = null
+        BaseSelectProcessorInterface $baseSelectProcessor = null,
+        \Magento\CatalogRule\Model\RuleDateFormatterInterface $ruleDateFormatter = null
     ) {
         $this->storeManager = $storeManager;
         $this->resource = $resourceConnection;
@@ -74,14 +88,16 @@ public function __construct(
         $this->metadataPool = $metadataPool;
         $this->baseSelectProcessor = (null !== $baseSelectProcessor)
             ? $baseSelectProcessor : ObjectManager::getInstance()->get(BaseSelectProcessorInterface::class);
+        $this->ruleDateFormatter = $ruleDateFormatter ?: ObjectManager::getInstance()
+            ->get(\Magento\CatalogRule\Model\RuleDateFormatterInterface::class);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function build($productId)
     {
-        $timestamp = $this->localeDate->scopeTimeStamp($this->storeManager->getStore());
+        $timestamp = $this->ruleDateFormatter->getTimeStamp($this->storeManager->getStore());
         $currentDate = $this->dateTime->formatDate($timestamp, false);
         $linkField = $this->metadataPool->getMetadata(ProductInterface::class)->getLinkField();
         $productTable = $this->resource->getTableName('catalog_product_entity');

app/code/Magento/CatalogRule/Model/RuleDateFormatter.php

@@ -0,0 +1,43 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogRule\Model;
+
+/**
+ * Local date for catalog rule
+ */
+class RuleDateFormatter implements \Magento\CatalogRule\Model\RuleDateFormatterInterface
+{
+    /**
+     * @var \Magento\Framework\Stdlib\DateTime\TimezoneInterface
+     */
+    private $localeDate;
+
+    /**
+     * @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
+     */
+    public function __construct(\Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate)
+    {
+        $this->localeDate = $localeDate;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getDate($scope = null): \DateTime
+    {
+        return $this->localeDate->scopeDate($scope, null, true);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getTimeStamp($scope = null): int
+    {
+        return $this->localeDate->scopeTimeStamp($scope);
+    }
+}