AC-3108: Fix possible deprecation issues with 8.1

karyna-t · andrewbess · commit b47541f746ae · 2022-05-26T14:18:38.000+02:00
diff --git a/app/code/Magento/Config/Model/Config/Backend/File/RequestData.php b/app/code/Magento/Config/Model/Config/Backend/File/RequestData.php
@@ -38,13 +38,15 @@ public function getName($path)
      */
     protected function _getParam($paramName, $path)
     {
-        $pathParts = explode('/', $path);
+        $pathParts = $path !== null ? explode('/', $path) : [];
         array_shift($pathParts);
         $fieldId = array_pop($pathParts);
         $firstGroupId = array_shift($pathParts);
+        // phpcs:ignore Magento2.Security.Superglobal
         if (!isset($_FILES['groups'][$paramName])) {
             return null;
         }
+        // phpcs:disable Magento2.Security.Superglobal
         $groupData = $_FILES['groups'][$paramName];
         if (isset($groupData[$firstGroupId])) {
             $groupData = $groupData[$firstGroupId];
diff --git a/app/code/Magento/Config/Model/Config/Backend/Locale.php b/app/code/Magento/Config/Model/Config/Backend/Locale.php
@@ -73,16 +73,18 @@ public function __construct(
     }
 
     /**
-     * @return $this
+     * @inheritdoc
+     *
      * @throws \Magento\Framework\Exception\LocalizedException
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     public function afterSave()
     {
         /** @var $collection \Magento\Config\Model\ResourceModel\Config\Data\Collection */
         $collection = $this->_configsFactory->create();
         $collection->addPathFilter('currency/options');
 
-        $values = explode(',', $this->getValue());
+        $values = $this->getValue() !== null ? explode(',', $this->getValue()) : [];
         $exceptions = [];
 
         foreach ($collection as $data) {
diff --git a/app/code/Magento/Config/Model/Config/Structure.php b/app/code/Magento/Config/Model/Config/Structure.php
@@ -49,7 +49,7 @@ class Structure implements \Magento\Config\Model\Config\Structure\SearchInterfac
     /**
      * Key that contains field type in structure array
      */
-    const TYPE_KEY = '_elementType';
+    public const TYPE_KEY = '_elementType';
 
     /**
      * Configuration structure represented as tree
@@ -177,7 +177,8 @@ public function getSectionList()
      */
     public function getElement($path)
     {
-        return $this->getElementByPathParts(explode('/', $path));
+        $parts = $path !== null ? explode('/', $path) : [];
+        return $this->getElementByPathParts($parts);
     }
 
     /**
@@ -195,7 +196,8 @@ public function getElementByConfigPath($path)
             $path = array_shift($allPaths[$path]);
         }
 
-        return $this->getElementByPathParts(explode('/', $path));
+        $parts = $path !== null ? explode('/', $path) : [];
+        return $this->getElementByPathParts($parts);
     }
 
     /**
diff --git a/app/code/Magento/Config/Model/Config/Structure/Converter.php b/app/code/Magento/Config/Model/Config/Structure/Converter.php
@@ -94,10 +94,12 @@ protected function _convertDOMDocument(\DOMNode $root)
             switch ($child->nodeType) {
                 case XML_COMMENT_NODE:
                     continue 2;
-                    break;
 
                 case XML_TEXT_NODE:
-                    if ($children->length && trim($child->nodeValue, "\n ") === '') {
+                    if (
+                        $children->length
+                        && ($child->nodeValue === null || trim($child->nodeValue, "\n ") === '')
+                    ) {
                         continue 2;
                     }
                     $childName = 'value';
diff --git a/app/code/Magento/Config/Model/Config/Structure/Element/Dependency/Field.php b/app/code/Magento/Config/Model/Config/Structure/Element/Dependency/Field.php
@@ -45,7 +45,7 @@ class Field
     public function __construct(array $fieldData = [], $fieldPrefix = "")
     {
         if (isset($fieldData['separator'])) {
-            $this->_values = explode($fieldData['separator'], $fieldData['value']);
+            $this->_values = isset($fieldData['value']) ? explode($fieldData['separator'], $fieldData['value']) : [''];
         } else {
             $this->_values = [isset($fieldData['value']) ? $fieldData['value'] : ''];
         }
diff --git a/app/code/Magento/Config/Model/Config/Structure/ElementVisibility/ConcealInProduction.php b/app/code/Magento/Config/Model/Config/Structure/ElementVisibility/ConcealInProduction.php
@@ -85,7 +85,7 @@ public function __construct(State $state, array $configs = [], array $exemptions
      */
     public function isHidden($path)
     {
-        $path = $this->normalizePath($path);
+        $path = $path !== null ? $this->normalizePath($path) : '';
         if ($this->state->getMode() === State::MODE_PRODUCTION
             && preg_match('/(?<group>(?<section>.*?)\/.*?)\/.*?/', $path, $match)) {
             $group = $match['group'];
@@ -110,7 +110,7 @@ public function isHidden($path)
      */
     public function isDisabled($path)
     {
-        $path = $this->normalizePath($path);
+        $path = $path !== null ? $this->normalizePath($path) : '';
         if ($this->state->getMode() === State::MODE_PRODUCTION) {
             while (true) {
                 if (!empty($this->configs[$path])) {
diff --git a/app/code/Magento/Customer/Ui/Component/Listing/Address/DataProvider.php b/app/code/Magento/Customer/Ui/Component/Listing/Address/DataProvider.php
@@ -87,7 +87,8 @@ public function addFilter(Filter $filter): void
         /** @var GridCollection $collection */
         $collection = $this->getCollection();
         if ($filter->getField() === 'fulltext') {
-            $collection->addFullTextFilter(trim($filter->getValue()));
+            $value = $filter->getValue() !== null ? trim($filter->getValue()) : '';
+            $collection->addFullTextFilter($value);
         } else {
             $collection->addFieldToFilter(
                 $filter->getField(),
diff --git a/app/code/Magento/Customer/Ui/Component/Listing/FulltextFilter.php b/app/code/Magento/Customer/Ui/Component/Listing/FulltextFilter.php
@@ -29,6 +29,7 @@ public function apply(Collection $collection, Filter $filter)
 
         /** @var GridCollection $gridCollection */
         $gridCollection = $collection;
-        $gridCollection->addFullTextFilter(trim($filter->getValue()));
+        $value = $filter->getValue() !== null ? trim($filter->getValue()) : '';
+        $gridCollection->addFullTextFilter($value);
     }
 }
diff --git a/app/code/Magento/Customer/view/frontend/templates/address/edit.phtml b/app/code/Magento/Customer/view/frontend/templates/address/edit.phtml
@@ -27,7 +27,8 @@ $regionProvider = $block->getRegionProvider();
 <?php $_postcodeValidationClass_value = $viewModel->addressGetAttributeValidationClass('postcode'); ?>
 <?php $_postcodeValidationClass = $_postcodeValidationClass_value; ?>
 <?php $_streetValidationClass = $viewModel->addressGetAttributeValidationClass('street'); ?>
-<?php $_streetValidationClassNotRequired = trim(str_replace('required-entry', '', $_streetValidationClass)); ?>
+<?php $_streetValidationClassNotRequired = $_streetValidationClass !== null ?
+    trim(str_replace('required-entry', '', $_streetValidationClass)) : ''; ?>
 <?php $_regionValidationClass = $viewModel->addressGetAttributeValidationClass('region'); ?>
 <form class="form-address-edit"
       action="<?= $escaper->escapeUrl($block->getSaveUrl()) ?>"
diff --git a/app/code/Magento/Customer/view/frontend/templates/form/register.phtml b/app/code/Magento/Customer/view/frontend/templates/form/register.phtml
@@ -113,7 +113,8 @@ $createAccountButtonViewModel = $block->getData('create_account_button_view_mode
                            class="input-text <?= $escaper->escapeHtmlAttr($_streetValidationClass) ?>">
                     <div class="nested">
                         <?php
-                            $_streetValidationClass = trim(str_replace('required-entry', '', $_streetValidationClass));
+                            $_streetValidationClass = $_streetValidationClass !== null ?
+                                trim(str_replace('required-entry', '', $_streetValidationClass)) : '';
                             $streetLines = $addressHelper->getStreetLines();
                         ?>
                         <?php for ($_i = 2, $_n = $streetLines; $_i <= $_n; $_i++): ?>
diff --git a/app/code/Magento/CustomerImportExport/Model/Import/Address.php b/app/code/Magento/CustomerImportExport/Model/Import/Address.php
@@ -442,8 +442,8 @@ protected function _initCountryRegions()
         /** @var $region \Magento\Directory\Model\Region */
         foreach ($this->_regionCollection as $region) {
             $countryNormalized = strtolower($region->getCountryId());
-            $regionCode = strtolower($region->getCode());
-            $regionName = strtolower($region->getDefaultName());
+            $regionCode = $region->getCode() !== null ? strtolower($region->getCode()) : '';
+            $regionName = $region->getDefaultName() !== null ? strtolower($region->getDefaultName()) : '';
             $this->_countryRegions[$countryNormalized][$regionCode] = $region->getId();
             $this->_countryRegions[$countryNormalized][$regionName] = $region->getId();
             $this->_regions[$region->getId()] = $region->getDefaultName();
diff --git a/app/code/Magento/CustomerImportExport/Model/Import/Customer.php b/app/code/Magento/CustomerImportExport/Model/Import/Customer.php
@@ -27,57 +27,53 @@ class Customer extends AbstractCustomer
     /**
      * Collection name attribute
      */
-    const ATTRIBUTE_COLLECTION_NAME = \Magento\Customer\Model\ResourceModel\Attribute\Collection::class;
+    public const ATTRIBUTE_COLLECTION_NAME = \Magento\Customer\Model\ResourceModel\Attribute\Collection::class;
 
     /**#@+
      * Permanent column names
      *
      * Names that begins with underscore is not an attribute. This name convention is for
      * to avoid interference with same attribute name.
      */
-    const COLUMN_EMAIL = 'email';
+    public const COLUMN_EMAIL = 'email';
 
-    const COLUMN_STORE = '_store';
+    public const COLUMN_STORE = '_store';
 
-    const COLUMN_PASSWORD = 'password';
+    public const COLUMN_PASSWORD = 'password';
 
     /**#@-*/
 
     /**#@+
      * Error codes
      */
-    const ERROR_DUPLICATE_EMAIL_SITE = 'duplicateEmailSite';
+    public const ERROR_DUPLICATE_EMAIL_SITE = 'duplicateEmailSite';
 
-    const ERROR_ROW_IS_ORPHAN = 'rowIsOrphan';
+    public const ERROR_ROW_IS_ORPHAN = 'rowIsOrphan';
 
-    const ERROR_INVALID_STORE = 'invalidStore';
+    public const ERROR_INVALID_STORE = 'invalidStore';
 
-    const ERROR_EMAIL_SITE_NOT_FOUND = 'emailSiteNotFound';
+    public const ERROR_EMAIL_SITE_NOT_FOUND = 'emailSiteNotFound';
 
-    const ERROR_PASSWORD_LENGTH = 'passwordLength';
-
-    /**#@-*/
+    public const ERROR_PASSWORD_LENGTH = 'passwordLength';
 
     /**#@+
      * Keys which used to build result data array for future update
      */
-    const ENTITIES_TO_CREATE_KEY = 'entities_to_create';
+    public const ENTITIES_TO_CREATE_KEY = 'entities_to_create';
 
-    const ENTITIES_TO_UPDATE_KEY = 'entities_to_update';
+    public const ENTITIES_TO_UPDATE_KEY = 'entities_to_update';
 
-    const ATTRIBUTES_TO_SAVE_KEY = 'attributes_to_save';
-
-    /**#@-*/
+    public const ATTRIBUTES_TO_SAVE_KEY = 'attributes_to_save';
 
     /**
      * Minimum password length
      */
-    const MIN_PASSWORD_LENGTH = 6;
+    public const MIN_PASSWORD_LENGTH = 6;
 
     /**
      * Default customer group
      */
-    const DEFAULT_GROUP_ID = 1;
+    public const DEFAULT_GROUP_ID = 1;
 
     /**
      * Customers information from import file
@@ -103,8 +99,6 @@ class Customer extends AbstractCustomer
     protected $_entityTable;
 
     /**
-     * Customer model
-     *
      * @var \Magento\Customer\Model\Customer
      */
     protected $_customerModel;
@@ -129,14 +123,12 @@ class Customer extends AbstractCustomer
     protected $_resourceHelper;
 
     /**
-     * {@inheritdoc}
+     * @var string
      */
     protected $masterAttributeCode = 'email';
 
     /**
-     * Valid column names
-     *
-     * @array
+     * @var array
      */
     protected $validColumnNames = [
         self::COLUMN_DEFAULT_BILLING,
@@ -146,6 +138,8 @@ class Customer extends AbstractCustomer
 
     /**
      * Customer fields in file
+     *
+     * @var array
      */
     protected $customerFields = [
         CustomerInterface::GROUP_ID,
@@ -445,7 +439,8 @@ protected function _prepareDataForUpdate(array $rowData)
                 }
             } elseif ('multiselect' == $attributeParameters['type']) {
                 $ids = [];
-                foreach (explode($multiSeparator, mb_strtolower($value)) as $subValue) {
+                $values = $value !== null ? explode($multiSeparator, mb_strtolower($value)) : [];
+                foreach ($values as $subValue) {
                     $ids[] = $this->getSelectAttrIdByValue($attributeParameters, $subValue);
                 }
                 $value = implode(',', $ids);
diff --git a/app/code/Magento/CustomerImportExport/Model/ResourceModel/Import/Customer/Storage.php b/app/code/Magento/CustomerImportExport/Model/ResourceModel/Import/Customer/Storage.php
@@ -113,7 +113,7 @@ private function loadCustomersData(array $customerIdentifiers): void
      */
     public function addCustomerByArray(array $customer): Storage
     {
-        $email = mb_strtolower(trim($customer['email']));
+        $email = isset($customer['email']) ? mb_strtolower(trim($customer['email'])) : '';
         if (!isset($this->_customerIds[$email])) {
             $this->_customerIds[$email] = [];
         }
@@ -205,7 +205,7 @@ public function prepareCustomers(array $customersToFind): void
     {
         $identifiers = [];
         foreach ($customersToFind as $customerToFind) {
-            $email = mb_strtolower($customerToFind['email']);
+            $email = isset($customerToFind['email']) ? mb_strtolower($customerToFind['email']) : '';
             $websiteId = $customerToFind['website_id'];
             if (!$this->isLoadedCustomerData($email, $websiteId)) {
                 //Only looking for customers we don't already have ID for.
diff --git a/app/code/Magento/Directory/Model/ResourceModel/Country.php b/app/code/Magento/Directory/Model/ResourceModel/Country.php
@@ -58,6 +58,7 @@ protected function _construct()
      */
     public function loadByCode(\Magento\Directory\Model\Country $country, $code)
     {
+        $code = $code !== null ? $code : '';
         switch (strlen($code)) {
             case 2:
                 $field = 'iso2_code';
diff --git a/app/code/Magento/Downloadable/Helper/Catalog/Product/Configuration.php b/app/code/Magento/Downloadable/Helper/Catalog/Product/Configuration.php
@@ -46,7 +46,8 @@ public function getLinks(\Magento\Catalog\Model\Product\Configuration\Item\ItemI
         $linkIds = $item->getOptionByCode('downloadable_link_ids');
         if ($linkIds) {
             $productLinks = $product->getTypeInstance()->getLinks($product);
-            foreach (explode(',', $linkIds->getValue()) as $linkId) {
+            $links = $linkIds->getValue() !== null ? explode(',', $linkIds->getValue()) : [];
+            foreach ($links as $linkId) {
                 if (isset($productLinks[$linkId])) {
                     $itemLinks[] = $productLinks[$linkId];
                 }
diff --git a/app/code/Magento/Downloadable/Test/Unit/Helper/Catalog/Product/ConfigurationTest.php b/app/code/Magento/Downloadable/Test/Unit/Helper/Catalog/Product/ConfigurationTest.php
@@ -117,7 +117,7 @@ public function testGetOptions()
         $item->expects($this->once())->method('getOptionByCode')->willReturn($option);
         $product->expects($this->once())->method('getTypeInstance')->willReturn($productType);
         $productType->expects($this->once())->method('getLinks')->with($product)->willReturn([1 => $productLink]);
-        $option->expects($this->once())->method('getValue')->willReturn(1);
+        $option->method('getValue')->willReturn(1);
         $product->expects($this->once())->method('getLinksTitle')->willReturn('links_title');
         $productLink->expects($this->once())->method('getTitle')->willReturn('title');
 

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ class Structure implements \Magento\Config\Model\Config\Structure\SearchInterfac`
`49`	`49`	`/**`
`50`	`50`	`* Key that contains field type in structure array`
`51`	`51`	`*/`
`52`		`- const TYPE_KEY = '_elementType';`
	`52`	`+ public const TYPE_KEY = '_elementType';`
`53`	`53`
`54`	`54`	`/**`
`55`	`55`	`* Configuration structure represented as tree`
`@@ -177,7 +177,8 @@ public function getSectionList()`
`177`	`177`	`*/`
`178`	`178`	`public function getElement($path)`
`179`	`179`	`{`
`180`		`- return $this->getElementByPathParts(explode('/', $path));`
	`180`	`+ $parts = $path !== null ? explode('/', $path) : [];`
	`181`	`+ return $this->getElementByPathParts($parts);`
`181`	`182`	`}`
`182`	`183`
`183`	`184`	`/**`
`@@ -195,7 +196,8 @@ public function getElementByConfigPath($path)`
`195`	`196`	`$path = array_shift($allPaths[$path]);`
`196`	`197`	`}`
`197`	`198`
`198`		`- return $this->getElementByPathParts(explode('/', $path));`
	`199`	`+ $parts = $path !== null ? explode('/', $path) : [];`
	`200`	`+ return $this->getElementByPathParts($parts);`
`199`	`201`	`}`
`200`	`202`
`201`	`203`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ class Field`
`45`	`45`	`public function __construct(array $fieldData = [], $fieldPrefix = "")`
`46`	`46`	`{`
`47`	`47`	`if (isset($fieldData['separator'])) {`
`48`		`- $this->_values = explode($fieldData['separator'], $fieldData['value']);`
	`48`	`+ $this->_values = isset($fieldData['value']) ? explode($fieldData['separator'], $fieldData['value']) : [''];`
`49`	`49`	`} else {`
`50`	`50`	`$this->_values = [isset($fieldData['value']) ? $fieldData['value'] : ''];`
`51`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@ public function apply(Collection $collection, Filter $filter)`
`29`	`29`
`30`	`30`	`/** @var GridCollection $gridCollection */`
`31`	`31`	`$gridCollection = $collection;`
`32`		`- $gridCollection->addFullTextFilter(trim($filter->getValue()));`
	`32`	`+ $value = $filter->getValue() !== null ? trim($filter->getValue()) : '';`
	`33`	`+ $gridCollection->addFullTextFilter($value);`
`33`	`34`	`}`
`34`	`35`	`}`