AC-3109 fixed logic affected by "RFC: Deprecate passing null"

magento · May 26, 2022 · f629205 · f629205
1 parent 9661597
commit f629205
Show file tree

Hide file tree

Showing 13 changed files with 52 additions and 60 deletions.
diff --git a/app/code/Magento/Config/Model/Config/Structure/Mapper/Helper/RelativePathConverter.php b/app/code/Magento/Config/Model/Config/Structure/Mapper/Helper/RelativePathConverter.php
@@ -22,11 +22,12 @@ class RelativePathConverter
      * @param string $relativePath
      * @return string
      * @throws \InvalidArgumentException
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     public function convert($nodePath, $relativePath)
     {
-        $nodePath = trim($nodePath);
-        $relativePath = trim($relativePath);
+        $nodePath = $nodePath !== null ? trim($nodePath) : '';
+        $relativePath = $relativePath !== null ? trim($relativePath) : '';
 
         if (empty($nodePath) || empty($relativePath)) {
             throw new \InvalidArgumentException('Invalid arguments');

diff --git a/app/code/Magento/Config/Setup/Patch/Data/UnsetTinymce3.php b/app/code/Magento/Config/Setup/Patch/Data/UnsetTinymce3.php
@@ -6,9 +6,9 @@
 
 namespace Magento\Config\Setup\Patch\Data;
 
+use Magento\Framework\Setup\ModuleDataSetupInterface;
 use Magento\Framework\Setup\Patch\DataPatchInterface;
 use Magento\Framework\Setup\Patch\PatchVersionInterface;
-use Magento\Framework\Setup\ModuleDataSetupInterface;
 
 /**
  * Update config to Tinymce4 if Tinymce3 adapter is used.
@@ -46,7 +46,7 @@ public function apply()
                 )
                 ->where('path = ?', 'cms/wysiwyg/editor');
 
-            if (strpos($connection->fetchOne($select), 'Tinymce3/tinymce3Adapter') !== false) {
+            if (strpos($connection->fetchOne($select) ?? '', 'Tinymce3/tinymce3Adapter') !== false) {
                 $row = [
                     'value' => 'mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter'
                 ];

diff --git a/app/code/Magento/ConfigurableImportExport/Model/Import/Product/Type/Configurable.php b/app/code/Magento/ConfigurableImportExport/Model/Import/Product/Type/Configurable.php
@@ -1,7 +1,5 @@
 <?php
 /**
- * Import entity configurable product type model
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
@@ -25,21 +23,21 @@ class Configurable extends \Magento\CatalogImportExport\Model\Import\Product\Typ
     /**
      * Error codes.
      */
-    const ERROR_ATTRIBUTE_CODE_DOES_NOT_EXIST = 'attrCodeDoesNotExist';
+    public const ERROR_ATTRIBUTE_CODE_DOES_NOT_EXIST = 'attrCodeDoesNotExist';
 
-    const ERROR_ATTRIBUTE_CODE_NOT_GLOBAL_SCOPE = 'attrCodeNotGlobalScope';
+    public const ERROR_ATTRIBUTE_CODE_NOT_GLOBAL_SCOPE = 'attrCodeNotGlobalScope';
 
-    const ERROR_ATTRIBUTE_CODE_NOT_TYPE_SELECT = 'attrCodeNotTypeSelect';
+    public const ERROR_ATTRIBUTE_CODE_NOT_TYPE_SELECT = 'attrCodeNotTypeSelect';
 
-    const ERROR_ATTRIBUTE_CODE_IS_NOT_SUPER = 'attrCodeIsNotSuper';
+    public const ERROR_ATTRIBUTE_CODE_IS_NOT_SUPER = 'attrCodeIsNotSuper';
 
-    const ERROR_INVALID_OPTION_VALUE = 'invalidOptionValue';
+    public const ERROR_INVALID_OPTION_VALUE = 'invalidOptionValue';
 
-    const ERROR_INVALID_WEBSITE = 'invalidSuperAttrWebsite';
+    public const ERROR_INVALID_WEBSITE = 'invalidSuperAttrWebsite';
 
-    const ERROR_DUPLICATED_VARIATIONS = 'duplicatedVariations';
+    public const ERROR_DUPLICATED_VARIATIONS = 'duplicatedVariations';
 
-    const ERROR_UNIDENTIFIABLE_VARIATION = 'unidentifiableVariation';
+    public const ERROR_UNIDENTIFIABLE_VARIATION = 'unidentifiableVariation';
 
     /**
      * Validation failure message template definitions
@@ -170,15 +168,11 @@ class Configurable extends \Magento\CatalogImportExport\Model\Import\Product\Typ
     protected $_productColFac;
 
     /**
-     * Product data.
-     *
      * @var array
      */
     protected $_productData;
 
     /**
-     * Product super data.
-     *
      * @var array
      */
     protected $_productSuperData;
@@ -191,8 +185,6 @@ class Configurable extends \Magento\CatalogImportExport\Model\Import\Product\Typ
     protected $_simpleIdsToDelete;
 
     /**
-     * Super attributes data.
-     *
      * @var array
      */
     protected $_superAttributesData;
@@ -205,8 +197,6 @@ class Configurable extends \Magento\CatalogImportExport\Model\Import\Product\Typ
     protected $_nextAttrId;
 
     /**
-     * Product entity identifier field
-     *
      * @var string
      */
     private $productEntityIdentifierField;
@@ -449,8 +439,8 @@ protected function _loadSkuSuperDataForBunch(array $bunch)
         $oldSku = $this->_entityModel->getOldSku();
         $productIds = [];
         foreach ($bunch as $rowData) {
-            $sku = strtolower($rowData[ImportProduct::COL_SKU]);
-            $productData = isset($newSku[$sku]) ? $newSku[$sku] : $oldSku[$sku];
+            $sku = isset($rowData[ImportProduct::COL_SKU]) ? strtolower($rowData[ImportProduct::COL_SKU]) : '';
+            $productData = $newSku[$sku] ?? $oldSku[$sku];
             $productIds[] = $productData[$this->getProductEntityLinkField()];
         }
 
@@ -574,10 +564,10 @@ protected function _parseVariations($rowData)
             $fieldAndValuePairs = [];
             foreach ($fieldAndValuePairsText as $nameAndValue) {
                 $nameAndValue = explode(ImportProduct::PAIR_NAME_VALUE_SEPARATOR, $nameAndValue, 2);
-                if (!empty($nameAndValue)) {
+                if ($nameAndValue) {
                     $value = isset($nameAndValue[1]) ? trim($nameAndValue[1]) : '';
                     // Ignoring field names' case.
-                    $fieldName  = strtolower(trim($nameAndValue[0]));
+                    $fieldName  = isset($nameAndValue[0]) ? strtolower(trim($nameAndValue[0])) : '';
                     if ($fieldName) {
                         $fieldAndValuePairs[$fieldName] = $value;
                     }
@@ -588,7 +578,7 @@ protected function _parseVariations($rowData)
                 $position = 0;
                 $additionalRow['_super_products_sku'] = strtolower($fieldAndValuePairs['sku']);
                 unset($fieldAndValuePairs['sku']);
-                $additionalRow['display'] = isset($fieldAndValuePairs['display']) ? $fieldAndValuePairs['display'] : 1;
+                $additionalRow['display'] = $fieldAndValuePairs['display'] ?? 1;
                 unset($fieldAndValuePairs['display']);
                 foreach ($fieldAndValuePairs as $attrCode => $attrValue) {
                     $additionalRow['_super_attribute_code'] = $attrCode;
@@ -635,9 +625,9 @@ protected function _parseVariationLabels($rowData)
 
         foreach ($pairFieldAndValue as $nameAndValue) {
             $nameAndValue = explode(ImportProduct::PAIR_NAME_VALUE_SEPARATOR, $nameAndValue);
-            if (!empty($nameAndValue)) {
+            if ($nameAndValue) {
                 $value = isset($nameAndValue[1]) ? trim($nameAndValue[1]) : '';
-                $attrCode  = trim($nameAndValue[0]);
+                $attrCode  = isset($nameAndValue[0]) ? trim($nameAndValue[0]) : '';
                 if ($attrCode) {
                     $labels[$attrCode] = $value;
                 }
@@ -790,8 +780,10 @@ protected function _collectAssocIds($data)
                 if (isset($data['display']) && $data['display'] == 0) {
                     $this->_simpleIdsToDelete[] = $superProductRowId;
                 } else {
-                    $this->_productSuperData['assoc_ids'][$superProductRowId] = true;
-                    $this->_productSuperData['assoc_entity_ids'][$superProductRowId] = $superProductEntityId;
+                    if (isset($superProductEntityId)) {
+                        $this->_productSuperData['assoc_ids'][$superProductRowId] = true;
+                        $this->_productSuperData['assoc_entity_ids'][$superProductRowId] = $superProductEntityId;
+                    }
                 }
             }
         }
@@ -814,9 +806,7 @@ protected function _collectSuperDataLabels($data, $productSuperAttrId, $productI
             'product_super_attribute_id' => $productSuperAttrId,
             'position' => $data['_super_attribute_position'],
         ];
-        $label = isset($variationLabels[$data['_super_attribute_code']])
-                ? $variationLabels[$data['_super_attribute_code']]
-                : $attrParams['frontend_label'];
+        $label = $variationLabels[$data['_super_attribute_code']] ?? $attrParams['frontend_label'];
         $this->_superAttributesData['labels'][$productSuperAttrId] = [
             'product_super_attribute_id' => $productSuperAttrId,
             'store_id' => 0,
@@ -868,7 +858,7 @@ public function saveData()
                 if (ImportProduct::SCOPE_DEFAULT == $scope &&
                     !empty($rowData[ImportProduct::COL_SKU])) {
                     $sku = strtolower($rowData[ImportProduct::COL_SKU]);
-                    $this->_productData = isset($newSku[$sku]) ? $newSku[$sku] : $oldSku[$sku];
+                    $this->_productData = $newSku[$sku] ?? $oldSku[$sku];
 
                     if ($this->_type != $this->_productData['type_id']) {
                         $this->_productData = null;
@@ -898,7 +888,7 @@ protected function configurableInBunch($bunch)
     {
         $newSku = $this->_entityModel->getNewSku();
         foreach ($bunch as $rowNum => $rowData) {
-            $productData = $newSku[strtolower($rowData[ImportProduct::COL_SKU])];
+            $productData = $newSku[strtolower($rowData[ImportProduct::COL_SKU] ?? '')];
             if (($this->_type == $productData['type_id']) &&
                 ($rowData == $this->_entityModel->isRowAllowedToImport($rowData, $rowNum))
             ) {

diff --git a/...agento/ConfigurableProduct/Block/Adminhtml/Product/Attribute/Edit/Tab/Variations/Main.php b/...agento/ConfigurableProduct/Block/Adminhtml/Product/Attribute/Edit/Tab/Variations/Main.php
@@ -31,9 +31,11 @@ protected function _prepareForm()
         $fieldsToRemove = ['attribute_code', 'is_unique', 'frontend_class'];
 
         foreach ($fieldset->getElements() as $element) {
+            $elementId = $element->getId() ?? '';
+
             /** @var \Magento\Framework\Data\Form\AbstractForm $element  */
-            if (substr($element->getId(), 0, strlen('default_value')) == 'default_value') {
-                $fieldsToRemove[] = $element->getId();
+            if (substr($elementId, 0, strlen('default_value')) == 'default_value') {
+                $fieldsToRemove[] = $elementId;
             }
         }
         foreach ($fieldsToRemove as $id) {

diff --git a/app/code/Magento/ConfigurableProduct/Block/Product/View/Type/Configurable.php b/app/code/Magento/ConfigurableProduct/Block/Product/View/Type/Configurable.php
@@ -268,7 +268,7 @@ protected function getOptionImages()
                         'caption' => $image->getLabel(),
                         'position' => $image->getPosition(),
                         'isMain' => $image->getFile() == $product->getImage(),
-                        'type' => str_replace('external-', '', $image->getMediaType()),
+                        'type' =>  $image->getMediaType() ? str_replace('external-', '', $image->getMediaType()) : '',
                         'videoUrl' => $image->getVideoUrl(),
                     ];
             }

diff --git a/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php b/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php
@@ -955,7 +955,7 @@ protected function _prepareProduct(\Magento\Framework\DataObject $buyRequest, $p
                      * to be sure that it will be unique as its parent
                      */
                     if ($optionIds = $product->getCustomOption('option_ids')) {
-                        $optionIds = explode(',', $optionIds->getValue());
+                        $optionIds = explode(',', $optionIds->getValue() ?? '');
                         foreach ($optionIds as $optionId) {
                             if ($option = $product->getCustomOption('option_' . $optionId)) {
                                 $_result[0]->addCustomOption('option_' . $optionId, $option->getValue());

diff --git a/app/code/Magento/ConfigurableProductGraphQl/Model/Options/SelectionUidFormatter.php b/app/code/Magento/ConfigurableProductGraphQl/Model/Options/SelectionUidFormatter.php
@@ -60,7 +60,8 @@ public function extract(array $selectionUids): array
     {
         $attributeOption = [];
         foreach ($selectionUids as $uid) {
-            $optionData = explode(self::UID_SEPARATOR, $this->idEncoder->decode($uid));
+            $decodedUid = $this->idEncoder->decode($uid);
+            $optionData = $decodedUid !== null ? explode(self::UID_SEPARATOR, $decodedUid) : [];
             if (count($optionData) === 3) {
                 $attributeOption[(int)$optionData[1]]  = (int)$optionData[2];
             }

diff --git a/app/code/Magento/Cron/Model/Schedule.php b/app/code/Magento/Cron/Model/Schedule.php
@@ -104,7 +104,7 @@ public function _construct()
      */
     public function setCronExpr($expr)
     {
-        $e = preg_split('#\s+#', $expr, -1, PREG_SPLIT_NO_EMPTY);
+        $e = $expr !== null ? preg_split('#\s+#', $expr, -1, PREG_SPLIT_NO_EMPTY) : [];
         if (count($e) < 5 || count($e) > 6) {
             throw new CronException(__('Invalid cron expression: %1', $expr));
         }
@@ -164,7 +164,7 @@ public function matchCronExpression($expr, $num)
         }
 
         // handle multiple options
-        if (strpos($expr, ',') !== false) {
+        if ($expr && strpos($expr, ',') !== false) {
             foreach (explode(',', $expr) as $e) {
                 if ($this->matchCronExpression($e, $num)) {
                     return true;
@@ -174,7 +174,7 @@ public function matchCronExpression($expr, $num)
         }
 
         // handle modulus
-        if (strpos($expr, '/') !== false) {
+        if ($expr && strpos($expr, '/') !== false) {
             $e = explode('/', $expr);
             if (count($e) !== 2) {
                 throw new CronException(__('Invalid cron expression, expecting \'match/modulus\': %1', $expr));
@@ -193,7 +193,7 @@ public function matchCronExpression($expr, $num)
         if ($expr === '*') {
             $from = 0;
             $to = 60;
-        } elseif (strpos($expr, '-') !== false) {
+        } elseif ($expr && strpos($expr, '-') !== false) {
             // handle range
             $e = explode('-', $expr);
             if (count($e) !== 2) {

diff --git a/app/code/Magento/Customer/Block/Widget/Name.php b/app/code/Magento/Customer/Block/Widget/Name.php
@@ -107,7 +107,7 @@ public function getPrefixOptions()
 
         if ($this->getObject() && !empty($prefixOptions)) {
             $prefixOption = $this->getObject()->getPrefix();
-            $oldPrefix = $this->escapeHtml(trim($prefixOption));
+            $oldPrefix = $this->escapeHtml(trim($prefixOption ?? ''));
             if ($prefixOption !== null && !isset($prefixOptions[$oldPrefix]) && !isset($prefixOptions[$prefixOption])) {
                 $prefixOptions[$oldPrefix] = $oldPrefix;
             }
@@ -165,7 +165,7 @@ public function getSuffixOptions()
         $suffixOptions = $this->options->getNameSuffixOptions();
         if ($this->getObject() && !empty($suffixOptions)) {
             $suffixOption = $this->getObject()->getSuffix();
-            $oldSuffix = $this->escapeHtml(trim($suffixOption));
+            $oldSuffix = $this->escapeHtml(trim($suffixOption ?? ''));
             if ($suffixOption !== null && !isset($suffixOptions[$oldSuffix]) && !isset($suffixOptions[$suffixOption])) {
                 $suffixOptions[$oldSuffix] = $oldSuffix;
             }

diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Address/Viewfile.php b/app/code/Magento/Customer/Controller/Adminhtml/Address/Viewfile.php
@@ -31,7 +31,7 @@ class Viewfile extends Action implements HttpGetActionInterface
     /**
      * Authorization level of a basic admin session
      */
-    const ADMIN_RESOURCE = 'Magento_Customer::manage';
+    public const ADMIN_RESOURCE = 'Magento_Customer::manage';
 
     /**
      * @var RawFactory
@@ -159,17 +159,16 @@ public function execute()
      */
     private function getFileParams() : array
     {
-        $file = null;
         $plain = false;
-        if ($this->getRequest()->getParam('file')) {
+        if ($this->getRequest()->getParam('file', '')) {
             // download file
             $file = $this->urlDecoder->decode(
-                $this->getRequest()->getParam('file')
+                $this->getRequest()->getParam('file', '')
             );
-        } elseif ($this->getRequest()->getParam('image')) {
+        } elseif ($this->getRequest()->getParam('image', '')) {
             // show plain image
             $file = $this->urlDecoder->decode(
-                $this->getRequest()->getParam('image')
+                $this->getRequest()->getParam('image', '')
             );
             $plain = true;
         } else {

diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/Save.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/Save.php
@@ -498,7 +498,7 @@ private function getMetadataForm($entityType, $formCode, $scope)
         }
 
         if ($entityType == AddressMetadataInterface::ENTITY_TYPE_ADDRESS) {
-            $scopeData = explode('/', $scope);
+            $scopeData = $scope !== null ? explode('/', $scope) : [];
             if (isset($scopeData[1]) && is_numeric($scopeData[1])) {
                 $customerAddress = $this->addressRepository->getById($scopeData[1]);
                 $attributeValues = $this->addressMapper->toFlatArray($customerAddress);

diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/Viewfile.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/Viewfile.php
@@ -199,17 +199,16 @@ public function execute()
      */
     private function getFileParams()
     {
-        $file = null;
         $plain = false;
-        if ($this->getRequest()->getParam('file')) {
+        if ($this->getRequest()->getParam('file', '')) {
             // download file
             $file = $this->urlDecoder->decode(
-                $this->getRequest()->getParam('file')
+                $this->getRequest()->getParam('file', '')
             );
-        } elseif ($this->getRequest()->getParam('image')) {
+        } elseif ($this->getRequest()->getParam('image', '')) {
             // show plain image
             $file = $this->urlDecoder->decode(
-                $this->getRequest()->getParam('image')
+                $this->getRequest()->getParam('image', '')
             );
             $plain = true;
         } else {

diff --git a/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/ViewfileTest.php b/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/ViewfileTest.php
@@ -177,7 +177,7 @@ public function testExecuteGetParamImage()
         $stat = ['size' => 10, 'mtime' => 10];
 
         $this->requestMock->expects($this->any())->method('getParam')
-            ->willReturnMap([['file', null, null], ['image', null, $decodedFile]]);
+            ->willReturnMap([['file', '', ''], ['image', '', $decodedFile]]);
 
         $this->directoryMock->expects($this->once())->method('getAbsolutePath')->with($fileName)->willReturn($path);
         $this->directoryMock->expects($this->once())->method('stat')->with($fileName)->willReturn($stat);