Merge branch '2.4-develop' into B2B-2098

Author: dhaecker

app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/AbstractRenderer.php

@@ -97,7 +97,9 @@ protected function _getValue(DataObject $row)
             }
             return '';
         }
-        return $row->getData($this->getColumn()->getIndex());
+        return $this->getColumn()->getIndex() !== null
+            ? $row->getData($this->getColumn()->getIndex())
+            : null;
     }
 
     /**

app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Currency.php

@@ -102,7 +102,9 @@ protected function _getCurrencyCode($row)
         if ($code = $this->getColumn()->getCurrencyCode()) {
             return $code;
         }
-        if ($code = $row->getData($this->getColumn()->getCurrency())) {
+        $currency = $this->getColumn()->getCurrency();
+
+        if ($currency !== null && $code = $row->getData($currency)) {
             return $code;
         }
 
@@ -118,11 +120,14 @@ protected function _getCurrencyCode($row)
     protected function _getRate($row)
     {
         if ($rate = $this->getColumn()->getRate()) {
-            return (float)$rate;
+            return (float) $rate;
         }
-        if ($rate = $row->getData($this->getColumn()->getRateField())) {
-            return (float)$rate;
+        $rateField = $this->getColumn()->getRateField();
+
+        if ($rateField !== null && $rate = $row->getData($rateField)) {
+            return (float) $rate;
         }
+
         return $this->_defaultBaseCurrency->getRate($this->_getCurrencyCode($row));
     }
 

app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Price.php

@@ -60,7 +60,7 @@ public function render(\Magento\Framework\DataObject $row)
                 return $data;
             }
 
-            $data = (float)$data * $this->_getRate($row);
+            $data = (float) $data * $this->_getRate($row);
             $data = sprintf("%f", $data);
             $data = $this->_localeCurrency->getCurrency($currencyCode)->toCurrency($data);
             return $data;
@@ -79,7 +79,9 @@ protected function _getCurrencyCode($row)
         if ($code = $this->getColumn()->getCurrencyCode()) {
             return $code;
         }
-        if ($code = $row->getData($this->getColumn()->getCurrency())) {
+        $currency = $this->getColumn()->getCurrency();
+
+        if ($currency !== null && $code = $row->getData($currency)) {
             return $code;
         }
         return false;
@@ -94,10 +96,12 @@ protected function _getCurrencyCode($row)
     protected function _getRate($row)
     {
         if ($rate = $this->getColumn()->getRate()) {
-            return (float)$rate;
+            return (float) $rate;
         }
-        if ($rate = $row->getData($this->getColumn()->getRateField())) {
-            return (float)$rate;
+        $rateField = $this->getColumn()->getRateField();
+
+        if ($rateField !== null && $rate = $row->getData($rateField)) {
+            return (float) $rate;
         }
         return 1;
     }

app/code/Magento/Catalog/Setup/Patch/Data/UpdateMultiselectAttributesBackendTypes.php

@@ -59,9 +59,10 @@ public function getAliases()
     public function apply()
     {
         $this->dataSetup->startSetup();
+        $setup = $this->dataSetup;
+        $connection = $setup->getConnection();
 
-        $connection = $this->dataSetup->getConnection();
-        $attributeTable = $connection->getTableName('eav_attribute');
+        $attributeTable = $setup->getTable('eav_attribute');
         /** @var EavSetup $eavSetup */
         $eavSetup = $this->eavSetupFactory->create(['setup' => $this->dataSetup]);
         $entityTypeId = $eavSetup->getEntityTypeId(Product::ENTITY);
@@ -74,8 +75,8 @@ public function apply()
                 ->where('frontend_input = ?', 'multiselect')
         );
 
-        $varcharTable = $connection->getTableName('catalog_product_entity_varchar');
-        $textTable = $connection->getTableName('catalog_product_entity_text');
+        $varcharTable = $setup->getTable('catalog_product_entity_varchar');
+        $textTable = $setup->getTable('catalog_product_entity_text');
         $varcharTableDataSql = $connection
             ->select()
             ->from($varcharTable)

app/code/Magento/CatalogRule/Block/Adminhtml/Promo/Catalog/Edit/Tab/Conditions.php

@@ -5,15 +5,15 @@
  */
 namespace Magento\CatalogRule\Block\Adminhtml\Promo\Catalog\Edit\Tab;
 
-use Magento\Backend\Block\Widget\Form;
 use Magento\Backend\Block\Widget\Form\Generic;
+use Magento\Backend\Block\Widget\Form\Renderer\Fieldset;
 use Magento\Ui\Component\Layout\Tabs\TabInterface;
 use Magento\Rule\Model\Condition\AbstractCondition;
 
 class Conditions extends Generic implements TabInterface
 {
     /**
-     * @var \Magento\Backend\Block\Widget\Form\Renderer\Fieldset
+     * @var Fieldset
      */
     protected $_rendererFieldset;
 
@@ -27,15 +27,15 @@ class Conditions extends Generic implements TabInterface
      * @param \Magento\Framework\Registry $registry
      * @param \Magento\Framework\Data\FormFactory $formFactory
      * @param \Magento\Rule\Block\Conditions $conditions
-     * @param \Magento\Backend\Block\Widget\Form\Renderer\Fieldset $rendererFieldset
+     * @param Fieldset $rendererFieldset
      * @param array $data
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
         \Magento\Framework\Registry $registry,
         \Magento\Framework\Data\FormFactory $formFactory,
         \Magento\Rule\Block\Conditions $conditions,
-        \Magento\Backend\Block\Widget\Form\Renderer\Fieldset $rendererFieldset,
+        Fieldset $rendererFieldset,
         array $data = []
     ) {
         $this->_rendererFieldset = $rendererFieldset;
@@ -121,7 +121,7 @@ public function isAjaxLoaded()
     }
 
     /**
-     * @return Form
+     * @inheritdoc
      */
     protected function _prepareForm()
     {
@@ -135,6 +135,8 @@ protected function _prepareForm()
     }
 
     /**
+     * Adds 'Conditions' to the form.
+     *
      * @param \Magento\CatalogRule\Api\Data\RuleInterface $model
      * @param string $fieldsetId
      * @param string $formName
@@ -154,7 +156,8 @@ protected function addTabToForm($model, $fieldsetId = 'conditions_fieldset', $fo
             ['form_namespace' => $formName]
         );
 
-        $renderer = $this->_rendererFieldset->setTemplate('Magento_CatalogRule::promo/fieldset.phtml')
+        $renderer = $this->getLayout()->createBlock(Fieldset::class);
+        $renderer->setTemplate('Magento_CatalogRule::promo/fieldset.phtml')
             ->setNewChildUrl($newChildUrl)
             ->setFieldSetId($conditionsFieldSetId);
 
@@ -183,6 +186,8 @@ protected function addTabToForm($model, $fieldsetId = 'conditions_fieldset', $fo
     }
 
     /**
+     * Sets form name for Condition section.
+     *
      * @param AbstractCondition $conditions
      * @param string $formName
      * @param string $jsFormName

app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext/Collection.php

@@ -177,8 +177,8 @@ public function __construct(
         TotalRecordsResolverFactory $totalRecordsResolverFactory = null,
         DefaultFilterStrategyApplyCheckerInterface $defaultFilterStrategyApplyChecker = null
     ) {
-        $this->searchResultFactory = $searchResultFactory ?? \Magento\Framework\App\ObjectManager::getInstance()
-                ->get(\Magento\Framework\Api\Search\SearchResultFactory::class);
+        $this->searchResultFactory = $searchResultFactory
+            ?? ObjectManager::getInstance()->get(SearchResultFactory::class);
         parent::__construct(
             $entityFactory,
             $logger,
@@ -368,13 +368,12 @@ public function _loadEntities($printQuery = false, $logQuery = false)
         $this->getEntity();
 
         $this->printLogQuery($printQuery, $logQuery);
-
+        /**
+         * Prepare select query
+         * @var string $query
+         */
+        $query = $this->getSelect();
         try {
-            /**
-             * Prepare select query
-             * @var string $query
-             */
-            $query = $this->getSelect();
             $rows = $this->_fetchAll($query);
         } catch (\Exception $e) {
             $this->printLogQuery(false, true, $query);
@@ -455,7 +454,7 @@ protected function _renderFiltersBefore()
         }
 
         if ($this->searchRequestName !== 'quick_search_container'
-            || strlen(trim($this->queryText))
+            || ($this->queryText && strlen(trim($this->queryText)))
         ) {
             $this->prepareSearchTermFilter();
             $this->preparePriceAggregation();

app/code/Magento/Checkout/view/frontend/web/template/minicart/item/default.html

@@ -42,7 +42,7 @@
                         <dt class="label"><!-- ko text: option.label --><!-- /ko --></dt>
                         <dd class="values">
                             <!-- ko if: Array.isArray(option.value) -->
-                                <span data-bind="html: $parents[1].getOptionValueUnsanitizedHtml(option.value.join('<br/>'))"></span>
+                                <span data-bind="html: $parents[1].getOptionValueUnsanitizedHtml(option.value.join('<br>'))"></span>
                             <!-- /ko -->
                             <!-- ko if: (!Array.isArray(option.value) && ['file', 'html'].includes(option.option_type)) -->
                                 <span data-bind="html: $parents[1].getOptionValueUnsanitizedHtml(option.value)"></span>
@@ -83,7 +83,7 @@
                            type="number"
                            size="4"
                            class="item-qty cart-item-qty"/>
-                    <button data-bind="attr: {
+                <button data-bind="attr: {
                            id: 'update-cart-item-'+item_id,
                            'data-cart-item': item_id,
                            title: $t('Update')

app/code/Magento/Config/Console/Command/ConfigShowCommand.php

@@ -31,12 +31,14 @@ class ConfigShowCommand extends Command
     /**#@+
      * Names of input arguments or options.
      */
-    const INPUT_OPTION_SCOPE = 'scope';
-    const INPUT_OPTION_SCOPE_CODE = 'scope-code';
-    const INPUT_ARGUMENT_PATH = 'path';
+    public const INPUT_OPTION_SCOPE = 'scope';
+    public const INPUT_OPTION_SCOPE_CODE = 'scope-code';
+    public const INPUT_ARGUMENT_PATH = 'path';
     /**#@-*/
 
-    /**#@-*/
+    /**
+     * @var ValidatorInterface
+     */
     private $scopeValidator;
 
     /**
@@ -165,7 +167,8 @@ protected function execute(InputInterface $input, OutputInterface $output)
         try {
             $this->scope = $input->getOption(self::INPUT_OPTION_SCOPE);
             $this->scopeCode = $input->getOption(self::INPUT_OPTION_SCOPE_CODE);
-            $this->inputPath = trim($input->getArgument(self::INPUT_ARGUMENT_PATH), '/');
+            $inputPath = $input->getArgument(self::INPUT_ARGUMENT_PATH);
+            $this->inputPath = $inputPath !== null ? trim($inputPath, '/') : '';
 
             $configValue = $this->emulatedAreaProcessor->process(function () {
                 $this->scopeValidator->isValid($this->scope, $this->scopeCode);

app/code/Magento/Cron/Model/Config/Converter/Db.php

@@ -29,7 +29,7 @@ public function convert($source)
     /**
      * Extract and prepare cron job data
      *
-     * @param array $jobs
+     * @param array $cronTab
      * @return array
      */
     protected function _extractParams(array $cronTab)
@@ -92,7 +92,8 @@ protected function _processScheduleParam(array $jobConfig, $jobName, array &$res
     protected function _processRunModel(array $jobConfig, $jobName, array &$result)
     {
         if (isset($jobConfig['run']) && is_array($jobConfig['run']) && array_key_exists('model', $jobConfig['run'])) {
-            $callPath = explode('::', $jobConfig['run']['model']);
+            $runModel = $jobConfig['run']['model'];
+            $callPath = $runModel ? explode('::', $runModel) : [];
 
             if (empty($callPath) || empty($callPath[0]) || empty($callPath[1])) {
                 unset($result[$jobName]['run']);

app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currency/Rate/Matrix.php

@@ -107,7 +107,7 @@ protected function _prepareRates($array)
 
         foreach ($array as $key => $rate) {
             foreach ($rate as $code => $value) {
-                $parts = explode('.', $value);
+                $parts = $value !== null ? explode('.', $value) : [];
                 if (count($parts) == 2) {
                     $parts[1] = str_pad(rtrim($parts[1], 0), 4, '0', STR_PAD_RIGHT);
                     $array[$key][$code] = join('.', $parts);