Merge remote-tracking branch 'origin/AC-3162-p8' into delivery-bunch-w22

andrewbess · andrewbess · commit b352230508fb · 2022-05-30T10:02:37.000+02:00
diff --git a/app/code/Magento/SalesGraphQl/Model/Resolver/CustomerOrders/Query/OrderFilter.php b/app/code/Magento/SalesGraphQl/Model/Resolver/CustomerOrders/Query/OrderFilter.php
@@ -18,11 +18,6 @@
  */
 class OrderFilter
 {
-    /**
-     * @var ScopeConfigInterface
-     */
-    private $scopeConfig;
-
     /**
      * Translator field from graphql to collection field
      *
@@ -56,7 +51,6 @@ public function __construct(
     ) {
         $this->filterBuilder = $filterBuilder;
         $this->filterGroupBuilder = $filterGroupBuilder;
-        $this->scopeConfig = $scopeConfig;
         $this->fieldTranslatorArray = array_replace($this->fieldTranslatorArray, $fieldTranslatorArray);
     }
 
@@ -95,7 +89,7 @@ public function createFilterGroups(
                         if (is_array($value)) {
                             throw new InputException(__('Invalid match filter'));
                         }
-                        $searchValue = str_replace('%', '', $value);
+                        $searchValue = $value !== null ? str_replace('%', '', $value) : '';
                         $filters[] = $this->filterBuilder->setField($field)
                             ->setValue("%{$searchValue}%")
                             ->setConditionType('like')
diff --git a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/NewActionHtml.php b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/NewActionHtml.php
@@ -22,11 +22,12 @@ class NewActionHtml extends Quote implements HttpPostActionInterface
      */
     public function execute()
     {
-        $id = $this->getRequest()
-            ->getParam('id');
-        $formName = $this->getRequest()
-            ->getParam('form_namespace');
-        $typeArr = explode('|', str_replace('-', '/', $this->getRequest()->getParam('type')));
+        $id = $this->getRequest()->getParam('id');
+        $formName = $this->getRequest()->getParam('form_namespace');
+        $typeArr = explode(
+            '|',
+            str_replace('-', '/', $this->getRequest()->getParam('type', ''))
+        );
         $type = $typeArr[0];
 
         $model = $this->_objectManager->create(
diff --git a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/NewConditionHtml.php b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/NewConditionHtml.php
@@ -23,7 +23,10 @@ public function execute()
     {
         $id = $this->getRequest()->getParam('id');
         $formName = $this->getRequest()->getParam('form_namespace');
-        $typeArr = explode('|', str_replace('-', '/', $this->getRequest()->getParam('type')));
+        $typeArr = explode(
+            '|',
+            str_replace('-', '/', $this->getRequest()->getParam('type', ''))
+        );
         $type = $typeArr[0];
 
         $model = $this->_objectManager->create(
diff --git a/app/code/Magento/SalesRule/Model/Rule/Condition/Product.php b/app/code/Magento/SalesRule/Model/Rule/Condition/Product.php
@@ -38,7 +38,7 @@ protected function _addSpecialAttributes(array &$attributes)
     public function getAttribute(): string
     {
         $attribute = $this->getData('attribute');
-        if (strpos($attribute, '::') !== false) {
+        if ($attribute !== null && strpos($attribute, '::') !== false) {
             list(, $attribute) = explode('::', $attribute);
         }
 
diff --git a/app/code/Magento/SampleData/Model/Dependency.php b/app/code/Magento/SampleData/Model/Dependency.php
@@ -22,7 +22,7 @@ class Dependency
     /**
      * Sample data version text
      */
-    const SAMPLE_DATA_SUGGEST = 'Sample Data version:';
+    public const SAMPLE_DATA_SUGGEST = 'Sample Data version:';
 
     /**
      * @var ComposerInformation
@@ -80,7 +80,7 @@ public function getSampleDataPackages()
         $suggests = $this->composerInformation->getSuggestedPackages();
         $suggests = array_merge($suggests, $this->getSuggestsFromModules());
         foreach ($suggests as $name => $version) {
-            if (strpos($version, self::SAMPLE_DATA_SUGGEST) === 0) {
+            if ($version !== null && strpos($version, self::SAMPLE_DATA_SUGGEST) === 0) {
                 $installExtensions[$name] = trim(substr($version, strlen(self::SAMPLE_DATA_SUGGEST)));
             }
         }
diff --git a/app/code/Magento/Search/Controller/Adminhtml/Synonyms/Save.php b/app/code/Magento/Search/Controller/Adminhtml/Synonyms/Save.php
@@ -8,14 +8,17 @@
 
 use Magento\Search\Model\Synonym\MergeConflictException;
 
+/**
+ * @SuppressWarnings(PHPMD.AllPurposeAction)
+ */
 class Save extends \Magento\Backend\App\Action
 {
     /**
      * Authorization level of a basic admin session
      *
      * @see _isAllowed()
      */
-    const ADMIN_RESOURCE = 'Magento_Search::synonyms';
+    public const ADMIN_RESOURCE = 'Magento_Search::synonyms';
 
     /**
      * @var \Magento\Search\Api\SynonymGroupRepositoryInterface $synGroupRepository
@@ -66,12 +69,12 @@ public function execute()
             // Pre-process data and save it to model
             // Extract website_id and store_id out of scope_id
             // scope_id = website_id:store_id
-            $tokens = explode(':', $data['scope_id']);
+            $tokens = explode(':', $data['scope_id'] ?? '');
             $data['website_id'] = $tokens[0];
             $data['store_id'] = $tokens[1];
 
             // Remove unnecessary white spaces and convert synonyms to lower case
-            $words = explode(',', $data['synonyms']);
+            $words = explode(',', $data['synonyms'] ?? '');
             $words = array_map('trim', $words);
             $data['synonyms'] = strtolower(implode(',', $words));
 
diff --git a/app/code/Magento/Search/Model/ResourceModel/SynonymReader.php b/app/code/Magento/Search/Model/ResourceModel/SynonymReader.php
@@ -52,7 +52,7 @@ public function __construct(
      */
     public function loadByPhrase(\Magento\Search\Model\SynonymReader $object, $phrase)
     {
-        $rows = $this->queryByPhrase(strtolower($phrase));
+        $rows = $this->queryByPhrase($phrase !== null ? strtolower($phrase) : '');
         $synsPerScope = $this->getSynRowsPerScope($rows);
 
         if (!empty($synsPerScope[\Magento\Store\Model\ScopeInterface::SCOPE_STORES])) {
diff --git a/app/code/Magento/Search/Model/SynonymAnalyzer.php b/app/code/Magento/Search/Model/SynonymAnalyzer.php
@@ -51,7 +51,7 @@ public function getSynonymsForPhrase($phrase)
     {
         $result = [];
 
-        if (empty(trim($phrase))) {
+        if ($phrase === null || empty(trim($phrase))) {
             return $result;
         }
 
@@ -71,7 +71,7 @@ public function getSynonymsForPhrase($phrase)
                 $pattern = $this->getSearchPattern(\array_slice($words, $offset));
                 $position = $this->findInArray($pattern, $synonymGroups);
                 if ($position !== null) {
-                    $synonyms = explode(',', $synonymGroups[$position]);
+                    $synonyms = explode(',', $synonymGroups[$position] ?? '');
                 }
             }
 
@@ -94,7 +94,7 @@ private function findInArray(string $pattern, array $synonymGroupsToExamine)
     {
         $position = 0;
         foreach ($synonymGroupsToExamine as $synonymGroup) {
-            $matchingResultCode = preg_match($pattern, $synonymGroup);
+            $matchingResultCode = preg_match($pattern, $synonymGroup ?? '');
             if ($matchingResultCode === 1) {
                 return $position;
             }
diff --git a/app/code/Magento/Search/Model/SynonymGroupRepository.php b/app/code/Magento/Search/Model/SynonymGroupRepository.php
@@ -18,8 +18,6 @@
 class SynonymGroupRepository implements SynonymGroupRepositoryInterface
 {
     /**
-     * SynonymGroup Factory
-     *
      * @var SynonymGroupFactory
      */
     protected $synonymGroupFactory;
@@ -155,10 +153,10 @@ private function merge(SynonymGroupInterface $synonymGroupToMerge, array $matchi
             /** @var SynonymGroup $synonymGroupModel */
             $synonymGroupModel = $this->synonymGroupFactory->create();
             $synonymGroupModel->load($groupId);
-            $mergedSynonyms[] = explode(',', $synonymGroupModel->getSynonymGroup());
+            $mergedSynonyms[] = explode(',', $synonymGroupModel->getSynonymGroup() ?? '');
             $synonymGroupModel->delete();
         }
-        $mergedSynonyms[] = explode(',', $synonymGroupToMerge->getSynonymGroup());
+        $mergedSynonyms[] = explode(',', $synonymGroupToMerge->getSynonymGroup() ?? '');
 
         return array_unique(array_merge([], ...$mergedSynonyms));
     }
@@ -243,7 +241,7 @@ private function parseToArray($matchingSynonymGroups)
     {
         $parsedArray = [];
         foreach ($matchingSynonymGroups as $matchingSynonymGroup) {
-            $parsedArray[] = explode(',', $matchingSynonymGroup);
+            $parsedArray[] = explode(',', (string)$matchingSynonymGroup);
         }
         return $parsedArray;
     }
@@ -263,8 +261,8 @@ private function getMatchingSynonymGroups(SynonymGroupInterface $synonymGroup)
         $matchingSynonymGroups = [];
         foreach ($synonymGroupsInScope as $synonymGroupInScope) {
             if (array_intersect(
-                explode(',', $synonymGroup->getSynonymGroup()),
-                explode(',', $synonymGroupInScope['synonyms'])
+                explode(',', $synonymGroup->getSynonymGroup() ?? ''),
+                explode(',', $synonymGroupInScope['synonyms'] ?? '')
             )) {
                 $matchingSynonymGroups[$synonymGroupInScope['group_id']] = $synonymGroupInScope['synonyms'];
             }
diff --git a/app/code/Magento/Search/Model/SynonymReader.php b/app/code/Magento/Search/Model/SynonymReader.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\Search\Model;
 
-use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Data\Collection\AbstractDb as DbCollection;
 use Magento\Framework\Model\AbstractModel;
 use Magento\Framework\Model\ResourceModel\AbstractResource;
@@ -28,8 +27,6 @@
 class SynonymReader extends AbstractModel
 {
     /**
-     * Event prefix
-     *
      * @var string
      * @since 100.1.0
      */
@@ -52,7 +49,7 @@ class SynonymReader extends AbstractModel
      * @param DbCollection $resourceCollection
      * @param array $data
      */
-    public function __construct(
+    public function __construct( //phpcs:ignore Generic.CodeAnalysis.UselessOverridingMethod
         \Magento\Framework\Model\Context $context,
         Registry $registry,
         AbstractResource $resource = null,
@@ -83,7 +80,7 @@ protected function _construct()
      */
     public function loadByPhrase($phrase)
     {
-        $this->_getResource()->loadByPhrase($this, strtolower($phrase));
+        $this->_getResource()->loadByPhrase($this, $phrase !== null ? strtolower($phrase) : '');
         $this->_afterLoad();
         $this->setOrigData();
         return $this;
diff --git a/app/code/Magento/Shipping/Model/Simplexml/Element.php b/app/code/Magento/Shipping/Model/Simplexml/Element.php
@@ -52,8 +52,13 @@ public function addChild($name, $value = null, $namespace = null)
      */
     public function xmlentities($value = null)
     {
+        if ($value === null) {
+            return '';
+        }
+
         $value = str_replace('&amp;', '&', $value);
         $value = str_replace('&', '&amp;', $value);
+
         return $value;
     }
 }
diff --git a/app/code/Magento/Sitemap/Model/Sitemap.php b/app/code/Magento/Sitemap/Model/Sitemap.php
@@ -32,27 +32,29 @@
  * @method \Magento\Sitemap\Model\Sitemap setStoreId(int $value)
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.UnusedPrivateField)
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
  * @api
  * @since 100.0.2
  */
 class Sitemap extends \Magento\Framework\Model\AbstractModel implements \Magento\Framework\DataObject\IdentityInterface
 {
-    const OPEN_TAG_KEY = 'start';
+    public const OPEN_TAG_KEY = 'start';
 
-    const CLOSE_TAG_KEY = 'end';
+    public const CLOSE_TAG_KEY = 'end';
 
-    const INDEX_FILE_PREFIX = 'sitemap';
+    public const INDEX_FILE_PREFIX = 'sitemap';
 
-    const TYPE_INDEX = 'sitemap';
+    public const TYPE_INDEX = 'sitemap';
 
-    const TYPE_URL = 'url';
+    public const TYPE_URL = 'url';
 
     private const ROOT_DIRECTORY = 'sitemap';
 
     /**
      * Last mode date min value
      */
-    const LAST_MOD_MIN_VAL = '0000-01-01 00:00:00';
+    public const LAST_MOD_MIN_VAL = '0000-01-01 00:00:00';
 
     /**
      * Real file path
@@ -62,8 +64,6 @@ class Sitemap extends \Magento\Framework\Model\AbstractModel implements \Magento
     protected $_filePath;
 
     /**
-     * Sitemap items
-     *
      * @var array
      */
     protected $_sitemapItems = [];
@@ -114,8 +114,6 @@ class Sitemap extends \Magento\Framework\Model\AbstractModel implements \Magento
     protected $_stream;
 
     /**
-     * Sitemap data
-     *
      * @var \Magento\Sitemap\Helper\Data
      */
     protected $_sitemapData;
@@ -164,6 +162,8 @@ class Sitemap extends \Magento\Framework\Model\AbstractModel implements \Magento
      * @inheritdoc
      *
      * @since 100.1.5
+     *
+     * @var string|array|bool
      */
     protected $_cacheTag = [Value::CACHE_TAG];
 
@@ -182,8 +182,6 @@ class Sitemap extends \Magento\Framework\Model\AbstractModel implements \Magento
     private $configReader;
 
     /**
-     * Sitemap Item Factory
-     *
      * @var \Magento\Sitemap\Model\SitemapItemInterfaceFactory
      */
     private $sitemapItemFactory;
@@ -428,7 +426,7 @@ public function beforeSave()
         /**
          * Check allow filename
          */
-        if (!preg_match('#^[a-zA-Z0-9_\.]+$#', $this->getSitemapFilename())) {
+        if ($this->getSitemapFilename() === null || !preg_match('#^[a-zA-Z0-9_\.]+$#', $this->getSitemapFilename())) {
             throw new LocalizedException(
                 __(
                     'Please use only letters (a-z or A-Z), numbers (0-9) or underscores (_) in the filename.'
@@ -484,10 +482,9 @@ public function generateXml()
 
         if ($this->_sitemapIncrement == 1) {
             // In case when only one increment file was created use it as default sitemap
-            $path = rtrim($this->getSitemapPath(), '/')
-                . '/'
-                . $this->_getCurrentSitemapFilename($this->_sitemapIncrement);
-            $destination = rtrim($this->getSitemapPath(), '/') . '/' . $this->getSitemapFilename();
+            $sitemapPath = $this->getSitemapPath() !== null ? rtrim($this->getSitemapPath(), '/') : '';
+            $path = $sitemapPath . '/' . $this->_getCurrentSitemapFilename($this->_sitemapIncrement);
+            $destination = $sitemapPath . '/' . $this->getSitemapFilename();
 
             $this->_directory->renameFile($path, $destination);
         } else {
@@ -642,7 +639,7 @@ protected function _createSitemap($fileName = null, $type = self::TYPE_URL)
             $fileName = $this->_getCurrentSitemapFilename($this->_sitemapIncrement);
         }
 
-        $path = rtrim($this->getSitemapPath(), '/') . '/' . $fileName;
+        $path = ($this->getSitemapPath() !== null ? rtrim($this->getSitemapPath(), '/') : '') . '/' . $fileName;
         $this->_stream = $this->_directory->openFile($path);
 
         $fileHeader = sprintf($this->_tags[$type][self::OPEN_TAG_KEY], $type);
@@ -687,7 +684,8 @@ protected function _finalizeSitemap($type = self::TYPE_URL)
      */
     protected function _getCurrentSitemapFilename($index)
     {
-        return str_replace('.xml', '', $this->getSitemapFilename()) . '-' . $this->getStoreId() . '-' . $index . '.xml';
+        return ($this->getSitemapFilename() !== null ? str_replace('.xml', '', $this->getSitemapFilename()) : '')
+            . '-' . $this->getStoreId() . '-' . $index . '.xml';
     }
 
     /**
@@ -723,7 +721,7 @@ protected function _getStoreBaseUrl($type = UrlInterface::URL_TYPE_LINK)
      */
     protected function _getUrl($url, $type = UrlInterface::URL_TYPE_LINK)
     {
-        return $this->_getStoreBaseUrl($type) . ltrim($url, '/');
+        return $this->_getStoreBaseUrl($type) . ($url !== null ? ltrim($url, '/') : '');
     }
 
     /**
diff --git a/app/code/Magento/Store/App/Config/Type/Scopes.php b/app/code/Magento/Store/App/Config/Type/Scopes.php
@@ -15,7 +15,7 @@
  */
 class Scopes implements ConfigTypeInterface
 {
-    const CONFIG_TYPE = 'scopes';
+    public const CONFIG_TYPE = 'scopes';
 
     /**
      * @var ConfigSourceInterface
@@ -63,7 +63,7 @@ public function get($path = '')
             $this->data = new DataObject($this->source->get());
         }
 
-        $patchChunks = explode('/', $path);
+        $patchChunks = explode('/', (string)$path);
 
         if (isset($patchChunks[1])
             && is_numeric($patchChunks[1])
@@ -76,8 +76,7 @@ public function get($path = '')
     }
 
     /**
-     * Replace scope id with scope code.
-     * E.g. path 'websites/admin' will be converted to 'websites/0'
+     * Replace scope id with scope code. E.g. path 'websites/admin' will be converted to 'websites/0'
      *
      * @param array $patchChunks
      * @return string
diff --git a/app/code/Magento/Store/Model/Config/Placeholder.php b/app/code/Magento/Store/Model/Config/Placeholder.php

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ protected function _addSpecialAttributes(array &$attributes)`
`38`	`38`	`public function getAttribute(): string`
`39`	`39`	`{`
`40`	`40`	`$attribute = $this->getData('attribute');`
`41`		`- if (strpos($attribute, '::') !== false) {`
	`41`	`+ if ($attribute !== null && strpos($attribute, '::') !== false) {`
`42`	`42`	`list(, $attribute) = explode('::', $attribute);`
`43`	`43`	`}`
`44`	`44`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ public function __construct(`
`52`	`52`	`*/`
`53`	`53`	`public function loadByPhrase(\Magento\Search\Model\SynonymReader $object, $phrase)`
`54`	`54`	`{`
`55`		`- $rows = $this->queryByPhrase(strtolower($phrase));`
	`55`	`+ $rows = $this->queryByPhrase($phrase !== null ? strtolower($phrase) : '');`
`56`	`56`	`$synsPerScope = $this->getSynRowsPerScope($rows);`
`57`	`57`
`58`	`58`	`if (!empty($synsPerScope[\Magento\Store\Model\ScopeInterface::SCOPE_STORES])) {`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ public function getSynonymsForPhrase($phrase)`
`51`	`51`	`{`
`52`	`52`	`$result = [];`
`53`	`53`
`54`		`- if (empty(trim($phrase))) {`
	`54`	`+ if ($phrase === null \|\| empty(trim($phrase))) {`
`55`	`55`	`return $result;`
`56`	`56`	`}`
`57`	`57`
`@@ -71,7 +71,7 @@ public function getSynonymsForPhrase($phrase)`
`71`	`71`	`$pattern = $this->getSearchPattern(\array_slice($words, $offset));`
`72`	`72`	`$position = $this->findInArray($pattern, $synonymGroups);`
`73`	`73`	`if ($position !== null) {`
`74`		`- $synonyms = explode(',', $synonymGroups[$position]);`
	`74`	`+ $synonyms = explode(',', $synonymGroups[$position] ?? '');`
`75`	`75`	`}`
`76`	`76`	`}`
`77`	`77`
`@@ -94,7 +94,7 @@ private function findInArray(string $pattern, array $synonymGroupsToExamine)`
`94`	`94`	`{`
`95`	`95`	`$position = 0;`
`96`	`96`	`foreach ($synonymGroupsToExamine as $synonymGroup) {`
`97`		`- $matchingResultCode = preg_match($pattern, $synonymGroup);`
	`97`	`+ $matchingResultCode = preg_match($pattern, $synonymGroup ?? '');`
`98`	`98`	`if ($matchingResultCode === 1) {`
`99`	`99`	`return $position;`
`100`	`100`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,8 +18,6 @@`
`18`	`18`	`class SynonymGroupRepository implements SynonymGroupRepositoryInterface`
`19`	`19`	`{`
`20`	`20`	`/**`
`21`		`- * SynonymGroup Factory`
`22`		`- *`
`23`	`21`	`* @var SynonymGroupFactory`
`24`	`22`	`*/`
`25`	`23`	`protected $synonymGroupFactory;`
`@@ -155,10 +153,10 @@ private function merge(SynonymGroupInterface $synonymGroupToMerge, array $matchi`
`155`	`153`	`/** @var SynonymGroup $synonymGroupModel */`
`156`	`154`	`$synonymGroupModel = $this->synonymGroupFactory->create();`
`157`	`155`	`$synonymGroupModel->load($groupId);`
`158`		`- $mergedSynonyms[] = explode(',', $synonymGroupModel->getSynonymGroup());`
	`156`	`+ $mergedSynonyms[] = explode(',', $synonymGroupModel->getSynonymGroup() ?? '');`
`159`	`157`	`$synonymGroupModel->delete();`
`160`	`158`	`}`
`161`		`- $mergedSynonyms[] = explode(',', $synonymGroupToMerge->getSynonymGroup());`
	`159`	`+ $mergedSynonyms[] = explode(',', $synonymGroupToMerge->getSynonymGroup() ?? '');`
`162`	`160`
`163`	`161`	`return array_unique(array_merge([], ...$mergedSynonyms));`
`164`	`162`	`}`
`@@ -243,7 +241,7 @@ private function parseToArray($matchingSynonymGroups)`
`243`	`241`	`{`
`244`	`242`	`$parsedArray = [];`
`245`	`243`	`foreach ($matchingSynonymGroups as $matchingSynonymGroup) {`
`246`		`- $parsedArray[] = explode(',', $matchingSynonymGroup);`
	`244`	`+ $parsedArray[] = explode(',', (string)$matchingSynonymGroup);`
`247`	`245`	`}`
`248`	`246`	`return $parsedArray;`
`249`	`247`	`}`
`@@ -263,8 +261,8 @@ private function getMatchingSynonymGroups(SynonymGroupInterface $synonymGroup)`
`263`	`261`	`$matchingSynonymGroups = [];`
`264`	`262`	`foreach ($synonymGroupsInScope as $synonymGroupInScope) {`
`265`	`263`	`if (array_intersect(`
`266`		`- explode(',', $synonymGroup->getSynonymGroup()),`
`267`		`- explode(',', $synonymGroupInScope['synonyms'])`
	`264`	`+ explode(',', $synonymGroup->getSynonymGroup() ?? ''),`
	`265`	`+ explode(',', $synonymGroupInScope['synonyms'] ?? '')`
`268`	`266`	`)) {`
`269`	`267`	`$matchingSynonymGroups[$synonymGroupInScope['group_id']] = $synonymGroupInScope['synonyms'];`
`270`	`268`	`}`