[Magento Community Engineering] Community Contributions - 2.4-develop-prs

 - merged with '2.4-develop-express-lane-prs' branch

Author: magento-engcom-team

app/code/Magento/Catalog/Model/Product/Attribute/Backend/GroupPrice/AbstractGroupPrice.php

@@ -97,17 +97,16 @@ protected function _getWebsiteCurrencyRates()
             );
             foreach ($this->_storeManager->getWebsites() as $website) {
                 /* @var $website \Magento\Store\Model\Website */
-                if ($website->getBaseCurrencyCode() != $baseCurrency) {
+                $websiteBaseCurrency = $website->getBaseCurrencyCode();
+                if ($websiteBaseCurrency !== $baseCurrency) {
                     $rate = $this->_currencyFactory->create()->load(
                         $baseCurrency
-                    )->getRate(
-                        $website->getBaseCurrencyCode()
-                    );
+                    )->getRate($websiteBaseCurrency);
                     if (!$rate) {
                         $rate = 1;
                     }
                     $this->_rates[$website->getId()] = [
-                        'code' => $website->getBaseCurrencyCode(),
+                        'code' => $websiteBaseCurrency,
                         'rate' => $rate,
                     ];
                 } else {
@@ -187,6 +186,7 @@ public function validate($object)
             }
             $compare = implode(
                 '-',
+                // phpcs:ignore Magento2.Performance.ForeachArrayMerge
                 array_merge(
                     [$priceRow['website_id'], $priceRow['cust_group']],
                     $this->_getAdditionalUniqueFields($priceRow)
@@ -210,6 +210,7 @@ public function validate($object)
                     if ($price['website_id'] == 0) {
                         $compare = implode(
                             '-',
+                            // phpcs:ignore Magento2.Performance.ForeachArrayMerge
                             array_merge(
                                 [$price['website_id'], $price['cust_group']],
                                 $this->_getAdditionalUniqueFields($price)
@@ -234,6 +235,7 @@ public function validate($object)
 
             $globalCompare = implode(
                 '-',
+                // phpcs:ignore Magento2.Performance.ForeachArrayMerge
                 array_merge([0, $priceRow['cust_group']], $this->_getAdditionalUniqueFields($priceRow))
             );
             $websiteCurrency = $rates[$priceRow['website_id']]['code'];
@@ -279,6 +281,7 @@ public function preparePriceData(array $priceData, $productTypeId, $websiteId)
             if (!array_filter($v)) {
                 continue;
             }
+            // phpcs:ignore Magento2.Performance.ForeachArrayMerge
             $key = implode('-', array_merge([$v['cust_group']], $this->_getAdditionalUniqueFields($v)));
             if ($v['website_id'] == $websiteId) {
                 $data[$key] = $v;

app/code/Magento/Catalog/Model/ResourceModel/Eav/Attribute.php

@@ -38,6 +38,18 @@ class Attribute extends \Magento\Eav\Model\Entity\Attribute implements
 
     const KEY_IS_GLOBAL = 'is_global';
 
+    private const ALLOWED_INPUT_TYPES = [
+        'boolean'     => true,
+        'date'        => true,
+        'datetime'    => true,
+        'multiselect' => true,
+        'price'       => true,
+        'select'      => true,
+        'text'        => true,
+        'textarea'    => true,
+        'weight'      => true,
+    ];
+
     /**
      * @var LockValidatorInterface
      */
@@ -403,18 +415,7 @@ public function getSourceModel()
      */
     public function isAllowedForRuleCondition()
     {
-        $allowedInputTypes = [
-            'boolean',
-            'date',
-            'datetime',
-            'multiselect',
-            'price',
-            'select',
-            'text',
-            'textarea',
-            'weight',
-        ];
-        return $this->getIsVisible() && in_array($this->getFrontendInput(), $allowedInputTypes);
+        return $this->getIsVisible() && isset(self::ALLOWED_INPUT_TYPES[$this->getFrontendInput()]);
     }
 
     /**

lib/internal/Magento/Framework/App/ObjectManager/ConfigLoader/Compiled.php

@@ -1,16 +1,16 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\Framework\App\ObjectManager\ConfigLoader;
 
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\ObjectManager\ConfigLoaderInterface;
-use Magento\Framework\Serialize\SerializerInterface;
-use Magento\Framework\Serialize\Serializer\Serialize;
 
+/**
+ * Load configuration files
+ */
 class Compiled implements ConfigLoaderInterface
 {
     /**
@@ -21,7 +21,7 @@ class Compiled implements ConfigLoaderInterface
     private $configCache = [];
 
     /**
-     * {inheritdoc}
+     * @inheritdoc
      */
     public function load($area)
     {

lib/internal/Magento/Framework/DB/Select/SelectRenderer.php

@@ -8,10 +8,15 @@
 use Magento\Framework\DB\Select;
 
 /**
- * Class SelectRenderer
+ * Phrase renderer interface
  */
 class SelectRenderer implements RendererInterface
 {
+    private const MANDATORY_SELECT_PARTS = [
+        Select::COLUMNS => true,
+        Select::FROM    => true
+    ];
+
     /**
      * @var RendererInterface[]
      */
@@ -67,7 +72,8 @@ public function render(Select $select, $sql = '')
     {
         $sql = Select::SQL_SELECT;
         foreach ($this->renderers as $renderer) {
-            if (in_array($renderer['part'], [Select::COLUMNS, Select::FROM]) || $select->getPart($renderer['part'])) {
+            $part = $renderer['part'];
+            if (isset(self::MANDATORY_SELECT_PARTS[$part]) || $select->getPart($part)) {
                 $sql = $renderer['renderer']->render($select, $sql);
             }
         }

lib/internal/Magento/Framework/Module/Dir.php

@@ -1,7 +1,5 @@
 <?php
 /**
- * Encapsulates directories structure of a Magento module
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
@@ -10,6 +8,9 @@
 use Magento\Framework\Component\ComponentRegistrar;
 use Magento\Framework\Component\ComponentRegistrarInterface;
 
+/**
+ * Encapsulates directories structure of a Magento module
+ */
 class Dir
 {
     /**#@+
@@ -22,6 +23,14 @@ class Dir
     const MODULE_SETUP_DIR = 'Setup';
     /**#@-*/
 
+    private const ALLOWED_DIR_TYPES = [
+        self::MODULE_ETC_DIR => true,
+        self::MODULE_I18N_DIR => true,
+        self::MODULE_VIEW_DIR => true,
+        self::MODULE_CONTROLLER_DIR => true,
+        self::MODULE_SETUP_DIR => true
+    ];
+
     /**#@-*/
     private $componentRegistrar;
 
@@ -52,13 +61,7 @@ public function getDir($moduleName, $type = '')
         }
 
         if ($type) {
-            if (!in_array($type, [
-                self::MODULE_ETC_DIR,
-                self::MODULE_I18N_DIR,
-                self::MODULE_VIEW_DIR,
-                self::MODULE_CONTROLLER_DIR,
-                self::MODULE_SETUP_DIR
-            ])) {
+            if (!isset(self::ALLOWED_DIR_TYPES[$type])) {
                 throw new \InvalidArgumentException("Directory type '{$type}' is not recognized.");
             }
             $path .= '/' . $type;

lib/internal/Magento/Framework/Phrase/Renderer/Translate.php

@@ -1,7 +1,5 @@
 <?php
 /**
- * Translate Phrase renderer
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
@@ -11,6 +9,9 @@
 use Magento\Framework\TranslateInterface;
 use Psr\Log\LoggerInterface;
 
+/**
+ * Translate Phrase renderer
+ */
 class Translate implements RendererInterface
 {
     /**
@@ -50,8 +51,7 @@ public function render(array $source, array $arguments)
     {
         $text = end($source);
         /* If phrase contains escaped quotes then use translation for phrase with non-escaped quote */
-        $text = str_replace('\"', '"', $text);
-        $text = str_replace("\\'", "'", $text);
+        $text = strtr($text, ['\"' => '"', "\\'" => "'"]);
 
         try {
             $data = $this->translator->getData();