Merge pull request #7304 from magento-cia/2.4.4-develop-2.4-develop-sync-120921

Sync of 2.4.4-develop with 2.4-develop

Author: dvoskoboinikov

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

@@ -303,7 +303,7 @@ script;
 script;
         endif;
 
-        if (strpos($block->getRowClickCallback(), 'order.') !== false):
+        if ($block->getRowClickCallback() && strpos($block->getRowClickCallback(), 'order.') !== false):
             $scriptString .= <<<script
 
     deps.push('Magento_Sales/order/create/form')

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

@@ -25,7 +25,7 @@
             endif;
             ?>
             <?php $_tabClass = 'tab-item-link ' . $block->getTabClass($_tab) . ' ' .
-                (preg_match('/\s?ajax\s?/', $_tab->getClass()) ? 'notloaded' : '') ?>
+                (preg_match('/\s?ajax\s?/', $_tab->getClass() ?? '') ? 'notloaded' : '') ?>
             <?php $_tabType = (!preg_match('/\s?ajax\s?/', $_tabClass) && $block->getTabUrl($_tab) != '#') ?
                 'link' : '' ?>
             <?php $_tabHref = $block->getTabUrl($_tab) == '#' ? '#' . $block->getTabId($_tab) . '_content' :

app/code/Magento/Bundle/Pricing/Price/BundleSelectionPrice.php

@@ -7,6 +7,7 @@
 
 use Magento\Bundle\Model\Product\Price;
 use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\Product\Type;
 use Magento\Catalog\Pricing\Price as CatalogPrice;
 use Magento\Framework\Event\ManagerInterface;
 use Magento\Framework\Pricing\Adjustment\CalculatorInterface;
@@ -25,16 +26,14 @@ class BundleSelectionPrice extends AbstractPrice
     /**
      * Price model code
      */
-    const PRICE_CODE = 'bundle_selection';
+    public const PRICE_CODE = 'bundle_selection';
 
     /**
      * @var \Magento\Catalog\Model\Product
      */
     protected $bundleProduct;
 
     /**
-     * Event manager
-     *
      * @var \Magento\Framework\Event\ManagerInterface
      */
     protected $eventManager;
@@ -162,10 +161,10 @@ public function getAmount()
         if ($product->hasData($bundleSelectionKey)) {
             return $product->getData($bundleSelectionKey);
         }
-        $value = $this->getValue();
+        $value = (string) $this->getValue();
         if (!isset($this->amount[$value])) {
             $exclude = null;
-            if ($this->getProduct()->getTypeId() == \Magento\Catalog\Model\Product\Type::TYPE_BUNDLE) {
+            if ($this->getProduct()->getTypeId() === Type::TYPE_BUNDLE) {
                 $exclude = $this->excludeAdjustment;
             }
             $this->amount[$value] = $this->calculator->getAmount(
@@ -180,6 +179,8 @@ public function getAmount()
     }
 
     /**
+     * Returns the bundle product.
+     *
      * @return SaleableInterface
      */
     public function getProduct()

app/code/Magento/Catalog/Model/Indexer/Product/Flat/TableBuilder.php

@@ -6,6 +6,8 @@
 namespace Magento\Catalog\Model\Indexer\Product\Flat;
 
 use Magento\Catalog\Model\Indexer\Product\Flat\Table\BuilderInterfaceFactory;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Store\Model\Store;
 
 /**
@@ -26,7 +28,7 @@ class TableBuilder
     protected $_connection;
 
     /**
-     * @var \Magento\Framework\EntityManager\MetadataPool
+     * @var MetadataPool
      */
     protected $metadataPool;
 
@@ -46,17 +48,20 @@ class TableBuilder
      * @param \Magento\Catalog\Helper\Product\Flat\Indexer $productIndexerHelper
      * @param \Magento\Framework\App\ResourceConnection $resource
      * @param BuilderInterfaceFactory|null $tableBuilderFactory
+     * @param MetadataPool|null $metadataPool
      */
     public function __construct(
         \Magento\Catalog\Helper\Product\Flat\Indexer $productIndexerHelper,
         \Magento\Framework\App\ResourceConnection $resource,
-        BuilderInterfaceFactory $tableBuilderFactory = null
+        BuilderInterfaceFactory $tableBuilderFactory = null,
+        MetadataPool $metadataPool = null
     ) {
         $this->_productIndexerHelper = $productIndexerHelper;
         $this->resource = $resource;
         $this->_connection = $resource->getConnection();
-        $this->tableBuilderFactory = $tableBuilderFactory ?: \Magento\Framework\App\ObjectManager::getInstance()
+        $this->tableBuilderFactory = $tableBuilderFactory ?? ObjectManager::getInstance()
             ->get(BuilderInterfaceFactory::class);
+        $this->metadataPool = $metadataPool ?? ObjectManager::getInstance()->get(MetadataPool::class);
     }
 
     /**
@@ -73,7 +78,7 @@ public function build($storeId, $changedIds, $valueFieldSuffix)
         $attributes = $this->_productIndexerHelper->getAttributes();
         $eavAttributes = $this->_productIndexerHelper->getTablesStructure($attributes);
         $entityTableColumns = $eavAttributes[$entityTableName];
-        $linkField = $this->getMetadataPool()
+        $linkField = $this->metadataPool
             ->getMetadata(\Magento\Catalog\Api\Data\ProductInterface::class)
             ->getLinkField();
 
@@ -226,7 +231,7 @@ protected function _fillTemporaryEntityTable($tableName, array $columns, array $
         if (!empty($columns)) {
             $select = $this->_connection->select();
             $temporaryEntityTable = $this->_getTemporaryTableName($tableName);
-            $metadata = $this->getMetadataPool()->getMetadata(\Magento\Catalog\Api\Data\ProductInterface::class);
+            $metadata = $this->metadataPool->getMetadata(\Magento\Catalog\Api\Data\ProductInterface::class);
             $idsColumns = array_unique([$metadata->getLinkField(), 'entity_id', 'type_id', 'attribute_set_id']);
 
             $columns = array_merge($idsColumns, array_keys($columns));
@@ -269,6 +274,7 @@ protected function _addPrimaryKeyToTable($tableName, $columnName = 'entity_id')
      * @param int $storeId
      * @return void
      * @throws \Exception
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
     protected function _fillTemporaryTable(
         $tableName,
@@ -278,7 +284,11 @@ protected function _fillTemporaryTable(
         $storeId
     ) {
         if (!empty($tableColumns)) {
-            $columnsChunks = array_chunk($tableColumns, Action\Indexer::ATTRIBUTES_CHUNK_SIZE / 2, true);
+            $columnsChunks = array_chunk(
+                $tableColumns,
+                intdiv(Action\Indexer::ATTRIBUTES_CHUNK_SIZE, 2),
+                true
+            );
 
             $entityTableName = $this->_productIndexerHelper->getTable('catalog_product_entity');
             $entityTemporaryTableName = $this->_getTemporaryTableName($entityTableName);
@@ -288,7 +298,7 @@ protected function _fillTemporaryTable(
 
             $flatColumns = $this->_productIndexerHelper->getFlatColumns();
             $defaultStoreId = Store::DEFAULT_STORE_ID;
-            $linkField = $this->getMetadataPool()
+            $linkField = $this->metadataPool
                 ->getMetadata(\Magento\Catalog\Api\Data\ProductInterface::class)
                 ->getLinkField();
 
@@ -368,19 +378,4 @@ protected function _fillTemporaryTable(
             }
         }
     }
-
-    /**
-     * Get Metadata Pool
-     *
-     * @return \Magento\Framework\EntityManager\MetadataPool
-     * @deprecated 102.0.0
-     */
-    private function getMetadataPool()
-    {
-        if (null === $this->metadataPool) {
-            $this->metadataPool = \Magento\Framework\App\ObjectManager::getInstance()
-                ->get(\Magento\Framework\EntityManager\MetadataPool::class);
-        }
-        return $this->metadataPool;
-    }
 }

app/code/Magento/Catalog/Model/Product/Option/Type/Date.php

@@ -11,7 +11,6 @@
 /**
  * Catalog product option date type
  *
- * @author     Magento Core Team <core@magentocommerce.com>
  * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  */
 class Date extends \Magento\Catalog\Model\Product\Option\Type\DefaultType
@@ -218,32 +217,36 @@ public function prepareForCart()
     public function getFormattedOptionValue($optionValue)
     {
         if ($this->_formattedOptionValue === null) {
-            if ($this->getOption()->getType() == ProductCustomOptionInterface::OPTION_TYPE_DATE) {
-                $result = $this->_localeDate->formatDateTime(
-                    new \DateTime($optionValue),
-                    \IntlDateFormatter::MEDIUM,
-                    \IntlDateFormatter::NONE,
-                    null,
-                    'UTC'
-                );
-            } elseif ($this->getOption()->getType() == ProductCustomOptionInterface::OPTION_TYPE_DATE_TIME) {
-                $result = $this->_localeDate->formatDateTime(
-                    new \DateTime($optionValue),
-                    \IntlDateFormatter::SHORT,
-                    \IntlDateFormatter::SHORT,
-                    null,
-                    'UTC'
-                );
-            } elseif ($this->getOption()->getType() == ProductCustomOptionInterface::OPTION_TYPE_TIME) {
-                $result = $this->_localeDate->formatDateTime(
-                    new \DateTime($optionValue),
-                    \IntlDateFormatter::NONE,
-                    \IntlDateFormatter::SHORT,
-                    null,
-                    'UTC'
-                );
-            } else {
-                $result = $optionValue;
+            switch ($this->getOption()->getType()) {
+                case ProductCustomOptionInterface::OPTION_TYPE_DATE:
+                    $result = $this->_localeDate->formatDateTime(
+                        new \DateTime($optionValue),
+                        \IntlDateFormatter::MEDIUM,
+                        \IntlDateFormatter::NONE,
+                        null,
+                        'UTC'
+                    );
+                    break;
+                case ProductCustomOptionInterface::OPTION_TYPE_DATE_TIME:
+                    $result = $this->_localeDate->formatDateTime(
+                        new \DateTime($optionValue),
+                        \IntlDateFormatter::SHORT,
+                        \IntlDateFormatter::SHORT,
+                        null,
+                        'UTC'
+                    );
+                    break;
+                case ProductCustomOptionInterface::OPTION_TYPE_TIME:
+                    $result = $this->_localeDate->formatDateTime(
+                        new \DateTime($optionValue),
+                        \IntlDateFormatter::NONE,
+                        \IntlDateFormatter::SHORT,
+                        null,
+                        'UTC'
+                    );
+                    break;
+                default:
+                    $result = $optionValue;
             }
             $this->_formattedOptionValue = $result;
         }
@@ -302,8 +305,8 @@ public function prepareOptionValueForRequest($optionValue)
         $infoBuyRequest = $confItem->getOptionByCode('info_buyRequest');
         try {
             $value = $this->serializer->unserialize($infoBuyRequest->getValue());
-            if (is_array($value) && isset($value['options']) && isset($value['options'][$this->getOption()->getId()])
-            ) {
+
+            if (is_array($value) && isset($value['options'][$this->getOption()->getId()])) {
                 return $value['options'][$this->getOption()->getId()];
             } else {
                 return ['date_internal' => $optionValue];
@@ -340,12 +343,10 @@ public function is24hTimeFormat()
      */
     public function getYearStart()
     {
-        $_range = explode(',', $this->getConfigData('year_range'));
-        if (isset($_range[0]) && !empty($_range[0])) {
-            return $_range[0];
-        } else {
-            return date('Y');
-        }
+        $_range = $this->getConfigData('year_range') !== null
+            ? explode(',', $this->getConfigData('year_range'))
+            : [];
+        return (isset($_range[0]) && !empty($_range[0])) ? $_range[0] : date('Y');
     }
 
     /**
@@ -355,12 +356,10 @@ public function getYearStart()
      */
     public function getYearEnd()
     {
-        $_range = explode(',', $this->getConfigData('year_range'));
-        if (isset($_range[1]) && !empty($_range[1])) {
-            return $_range[1];
-        } else {
-            return date('Y');
-        }
+        $_range = $this->getConfigData('year_range') !== null
+            ? explode(',', $this->getConfigData('year_range'))
+            : [];
+        return (isset($_range[1]) && !empty($_range[1])) ? $_range[1] : date('Y');
     }
 
     /**

app/code/Magento/Catalog/Model/Product/Option/Type/Text.php

@@ -58,7 +58,7 @@ public function validateUserValue($values)
         parent::validateUserValue($values);
 
         $option = $this->getOption();
-        $value = trim($this->getUserValue());
+        $value = $this->getUserValue() !== null ? trim($this->getUserValue()) : '';
 
         // Check requires option to have some value
         if (strlen($value) == 0 && $option->getIsRequire() && !$this->getSkipCheckRequiredOption()) {

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

@@ -0,0 +1,43 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Model\Product;
+
+use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
+use Magento\Eav\Model\ReservedAttributeCheckerInterface;
+
+/**
+ * Adapter for \Magento\Catalog\Model\Product\ReservedAttributeList
+ *
+ * Is created to implement proper interface and to use api class ReservedAttributeList
+ * while keeping it backward compatible
+ * @see \Magento\Catalog\Model\Product\ReservedAttributeList
+ */
+class ReservedAttributeCheckerAdapter implements ReservedAttributeCheckerInterface
+{
+    /**
+     * @var ReservedAttributeList
+     */
+    private $reservedAttributeList;
+
+    /**
+     * @param ReservedAttributeList $reservedAttributeList
+     */
+    public function __construct(
+        ReservedAttributeList $reservedAttributeList
+    ) {
+        $this->reservedAttributeList = $reservedAttributeList;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function isReservedAttribute(AbstractAttribute $attribute): bool
+    {
+        return $this->reservedAttributeList->isReservedAttribute($attribute);
+    }
+}