Merge remote-tracking branch 'origin/AC-3110-p6' into delivery-bunch-w21

andrewbess · andrewbess · commit 6e83313a4c68 · 2022-05-26T14:26:05.000+02:00
diff --git a/app/code/Magento/Eav/Model/Entity/Increment/Alphanum.php b/app/code/Magento/Eav/Model/Entity/Increment/Alphanum.php
@@ -39,13 +39,14 @@ public function getAllowedChars()
      */
     public function getNextId()
     {
-        $lastId = $this->getLastId();
+        $lastId = (string)$this->getLastId();
+        $prefix = (string)$this->getPrefix();
 
-        if (strpos($lastId, (string) $this->getPrefix()) === 0) {
-            $lastId = substr($lastId, strlen($this->getPrefix()));
+        if (strpos($lastId, $prefix) === 0) {
+            $lastId = substr($lastId, strlen($prefix));
         }
 
-        $lastId = str_pad((string)$lastId, $this->getPadLength(), $this->getPadChar(), STR_PAD_LEFT);
+        $lastId = str_pad($lastId, $this->getPadLength(), $this->getPadChar(), STR_PAD_LEFT);
 
         $nextId = '';
         $bumpNextChar = true;
diff --git a/app/code/Magento/Eav/Model/Entity/Increment/NumericValue.php b/app/code/Magento/Eav/Model/Entity/Increment/NumericValue.php
@@ -27,9 +27,10 @@ class NumericValue extends \Magento\Eav\Model\Entity\Increment\AbstractIncrement
     public function getNextId()
     {
         $last = $this->getLastId();
+        $prefix = (string)$this->getPrefix();
 
-        if (is_string($last) && '' !== $last && strpos($last, (string) $this->getPrefix()) === 0) {
-            $last = (int)substr($last, strlen($this->getPrefix()));
+        if (is_string($last) && '' !== $last && strpos($last, $prefix) === 0) {
+            $last = (int)substr($last, strlen($prefix));
         } else {
             $last = (int)$last;
         }
diff --git a/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute.php b/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute.php
@@ -282,7 +282,7 @@ protected function _saveStoreLabels(AbstractModel $object)
                 $connection->delete($this->getTable('eav_attribute_label'), $condition);
             }
             foreach ($storeLabels as $storeId => $label) {
-                if ($storeId == 0 || !strlen($label)) {
+                if ($storeId == 0 || $label === null || !strlen($label)) {
                     continue;
                 }
                 $bind = ['attribute_id' => $object->getId(), 'store_id' => $storeId, 'value' => $label];
diff --git a/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute/Set.php b/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute/Set.php
@@ -14,7 +14,7 @@ class Set extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
     /**
      * EAV cache id
      */
-    const ATTRIBUTES_CACHE_ID = 'EAV_ENTITY_ATTRIBUTES_BY_SET_ID';
+    public const ATTRIBUTES_CACHE_ID = 'EAV_ENTITY_ATTRIBUTES_BY_SET_ID';
 
     /**
      * @var \Magento\Eav\Model\ResourceModel\Entity\Attribute\GroupFactory
@@ -121,7 +121,10 @@ protected function _beforeDelete(\Magento\Framework\Model\AbstractModel $object)
     public function validate($object, $attributeSetName)
     {
         $connection = $this->getConnection();
-        $bind = ['attribute_set_name' => trim($attributeSetName), 'entity_type_id' => $object->getEntityTypeId()];
+        $bind = [
+            'attribute_set_name' => $attributeSetName === null ? '' : trim($attributeSetName),
+            'entity_type_id' => $object->getEntityTypeId()
+        ];
         $select = $connection->select()->from(
             $this->getMainTable()
         )->where(
diff --git a/app/code/Magento/Eav/Model/Validator/Attribute/Code.php b/app/code/Magento/Eav/Model/Validator/Attribute/Code.php
@@ -9,7 +9,6 @@
 
 use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\AbstractModifier;
 use Magento\Eav\Model\Entity\Attribute;
-use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Validator\AbstractValidator;
 use Zend_Validate;
 
@@ -23,7 +22,7 @@ class Code extends AbstractValidator
     /**
      * Validation pattern for attribute code
      */
-    const VALIDATION_RULE_PATTERN = '/^[a-zA-Z]+[a-zA-Z0-9_]*$/u';
+    public const VALIDATION_RULE_PATTERN = '/^[a-zA-Z]+[a-zA-Z0-9_]*$/u';
 
     /**
      * Validates the correctness of the attribute code
@@ -38,6 +37,7 @@ public function isValid($attributeCode): bool
         /**
          * Check attribute_code for allowed characters
          */
+        $attributeCode = $attributeCode === null ? '' : $attributeCode;
         if (trim($attributeCode)
             && !preg_match(self::VALIDATION_RULE_PATTERN, trim($attributeCode))
         ) {
diff --git a/app/code/Magento/Eav/Setup/EavSetup.php b/app/code/Magento/Eav/Setup/EavSetup.php
@@ -612,7 +612,7 @@ public function addAttributeGroup($entityTypeId, $setId, $name, $sortOrder = nul
      */
     public function convertToAttributeGroupCode($groupName)
     {
-        return trim(preg_replace('/[^a-z0-9]+/', '-', strtolower($groupName)), '-');
+        return trim(preg_replace('/[^a-z0-9]+/', '-', strtolower((string)$groupName)), '-');
     }
 
     /**
diff --git a/app/code/Magento/Elasticsearch/Model/Config/Backend/MinimumShouldMatch.php b/app/code/Magento/Elasticsearch/Model/Config/Backend/MinimumShouldMatch.php
@@ -32,7 +32,10 @@ public function beforeSave()
      */
     public function validateValue(): void
     {
-        if (strlen($this->getValue()) && !preg_match('/^((\d+<)?-?\d+%?\s?)+$/', $this->getValue())) {
+        if ($this->getValue() !== null
+            && strlen($this->getValue())
+            && !preg_match('/^((\d+<)?-?\d+%?\s?)+$/', $this->getValue())
+        ) {
             throw new LocalizedException(
                 __(
                     'Value for the field "%1" was not saved because of the incorrect format.',
diff --git a/app/code/Magento/Elasticsearch/SearchAdapter/Query/Builder/Sort.php b/app/code/Magento/Elasticsearch/SearchAdapter/Query/Builder/Sort.php
@@ -117,7 +117,7 @@ public function getSort(RequestInterface $request)
             }
             $sorts[] = [
                 $fieldName => [
-                    'order' => strtolower($item['direction'])
+                    'order' => strtolower($item['direction'] ?? '')
                 ]
             ];
         }
diff --git a/app/code/Magento/Email/Block/Adminhtml/Template/Edit.php b/app/code/Magento/Email/Block/Adminhtml/Template/Edit.php
@@ -104,7 +104,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function updateButton($buttonId, $key, $data)
     {
@@ -113,15 +113,15 @@ public function updateButton($buttonId, $key, $data)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function canRender(\Magento\Backend\Block\Widget\Button\Item $item)
     {
         return !$item->isDeleted();
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function removeButton($buttonId)
     {
@@ -230,7 +230,7 @@ protected function _prepareLayout()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function addButton($buttonId, $data, $level = 0, $sortOrder = 0, $region = 'toolbar')
     {
@@ -413,7 +413,7 @@ public function getCurrentlyUsedForPaths($asJSON = true)
      * @return array
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
-    protected function _getSystemConfigPathsParts($paths)
+    protected function _getSystemConfigPathsParts($paths) // phpcs:ignore Generic.Metrics.NestingLevel
     {
         $result = $urlParams = $prefixParts = [];
         $scopeLabel = __('Default Config');
@@ -431,7 +431,7 @@ protected function _getSystemConfigPathsParts($paths)
 
             $pathParts = $prefixParts;
             foreach ($paths as $pathData) {
-                $pathDataParts = explode('/', $pathData['path']);
+                $pathDataParts = explode('/', $pathData['path'] ?? '');
                 $sectionName = array_shift($pathDataParts);
 
                 $urlParams = ['section' => $sectionName];
diff --git a/app/code/Magento/Email/Console/Command/DatabaseTemplateCompatibilityCommand.php b/app/code/Magento/Email/Console/Command/DatabaseTemplateCompatibilityCommand.php
@@ -116,7 +116,7 @@ protected function checkTemplate(AbstractTemplate $template, OutputInterface $ou
     private function renderErrors(OutputInterface $output, array $errors): void
     {
         foreach ($errors as $error) {
-            $error = str_replace(PHP_EOL, PHP_EOL . '   ', $error);
+            $error = str_replace(PHP_EOL, PHP_EOL . '   ', $error ?? '');
             $output->writeln(
                 '<error> - ' . $error . '</error>'
             );
diff --git a/app/code/Magento/Email/Model/Template/Config.php b/app/code/Magento/Email/Model/Template/Config.php
@@ -1,7 +1,5 @@
 <?php
 /**
- * High-level interface for email templates data that hides format from the client code
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
@@ -10,6 +8,9 @@
 use Magento\Framework\Filesystem\Directory\ReadFactory;
 use Magento\Framework\View\Design\Theme\ThemePackageList;
 
+/**
+ * High-level interface for email templates data that hides format from the client code
+ */
 class Config implements \Magento\Framework\Mail\Template\ConfigInterface
 {
     /**
@@ -78,6 +79,7 @@ public function getAvailableTemplates()
                 'group' => $this->getTemplateModule($templateId),
             ];
             $themeTemplates = $this->getThemeTemplates($templateId);
+            // phpcs:ignore Magento2.Performance.ForeachArrayMerge
             $templates = array_merge($templates, $themeTemplates);
         }
         return $templates;
@@ -137,7 +139,7 @@ public function parseTemplateIdParts($templateId)
             'theme' => null
         ];
         $pattern = "#^(?<templateId>[^/]+)/(?<themeVendor>[^/]+)/(?<themeName>[^/]+)#i";
-        if (preg_match($pattern, $templateId, $matches)) {
+        if ($templateId !== null && preg_match($pattern, $templateId, $matches)) {
             $parts['templateId'] = $matches['templateId'];
             $parts['theme'] = $matches['themeVendor'] . '/' . $matches['themeName'];
         }
diff --git a/app/code/Magento/Email/Model/Template/Css/Processor.php b/app/code/Magento/Email/Model/Template/Css/Processor.php
@@ -35,7 +35,7 @@ public function __construct(Repository $assetRepository)
     public function process($css)
     {
         $matches = [];
-        if (preg_match_all(Variable::VAR_REGEX, $css, $matches, PREG_SET_ORDER)) {
+        if ($css !== null && preg_match_all(Variable::VAR_REGEX, $css, $matches, PREG_SET_ORDER)) {
             $replacements = [];
             foreach ($matches as $match) {
                 if (!isset($replacements[$match[0]])) {

Original file line number	Diff line number	Diff line change
`@@ -27,9 +27,10 @@ class NumericValue extends \Magento\Eav\Model\Entity\Increment\AbstractIncrement`
`27`	`27`	`public function getNextId()`
`28`	`28`	`{`
`29`	`29`	`$last = $this->getLastId();`
	`30`	`+ $prefix = (string)$this->getPrefix();`
`30`	`31`
`31`		`- if (is_string($last) && '' !== $last && strpos($last, (string) $this->getPrefix()) === 0) {`
`32`		`- $last = (int)substr($last, strlen($this->getPrefix()));`
	`32`	`+ if (is_string($last) && '' !== $last && strpos($last, $prefix) === 0) {`
	`33`	`+ $last = (int)substr($last, strlen($prefix));`
`33`	`34`	`} else {`
`34`	`35`	`$last = (int)$last;`
`35`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -282,7 +282,7 @@ protected function _saveStoreLabels(AbstractModel $object)`
`282`	`282`	`$connection->delete($this->getTable('eav_attribute_label'), $condition);`
`283`	`283`	`}`
`284`	`284`	`foreach ($storeLabels as $storeId => $label) {`
`285`		`- if ($storeId == 0 \|\| !strlen($label)) {`
	`285`	`+ if ($storeId == 0 \|\| $label === null \|\| !strlen($label)) {`
`286`	`286`	`continue;`
`287`	`287`	`}`
`288`	`288`	`$bind = ['attribute_id' => $object->getId(), 'store_id' => $storeId, 'value' => $label];`
Original file line number	Diff line number	Diff line change
`@@ -612,7 +612,7 @@ public function addAttributeGroup($entityTypeId, $setId, $name, $sortOrder = nul`
`612`	`612`	`*/`
`613`	`613`	`public function convertToAttributeGroupCode($groupName)`
`614`	`614`	`{`
`615`		`- return trim(preg_replace('/[^a-z0-9]+/', '-', strtolower($groupName)), '-');`
	`615`	`+ return trim(preg_replace('/[^a-z0-9]+/', '-', strtolower((string)$groupName)), '-');`
`616`	`616`	`}`
`617`	`617`
`618`	`618`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@ public function getSort(RequestInterface $request)`
`117`	`117`	`}`
`118`	`118`	`$sorts[] = [`
`119`	`119`	`$fieldName => [`
`120`		`- 'order' => strtolower($item['direction'])`
	`120`	`+ 'order' => strtolower($item['direction'] ?? '')`
`121`	`121`	`]`
`122`	`122`	`];`
`123`	`123`	`}`
Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ public function __construct(`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`/**`
`107`		`- * {@inheritdoc}`
	`107`	`+ * @inheritdoc`
`108`	`108`	`*/`
`109`	`109`	`public function updateButton($buttonId, $key, $data)`
`110`	`110`	`{`
`@@ -113,15 +113,15 @@ public function updateButton($buttonId, $key, $data)`
`113`	`113`	`}`
`114`	`114`
`115`	`115`	`/**`
`116`		`- * {@inheritdoc}`
	`116`	`+ * @inheritdoc`
`117`	`117`	`*/`
`118`	`118`	`public function canRender(\Magento\Backend\Block\Widget\Button\Item $item)`
`119`	`119`	`{`
`120`	`120`	`return !$item->isDeleted();`
`121`	`121`	`}`
`122`	`122`
`123`	`123`	`/**`
`124`		`- * {@inheritdoc}`
	`124`	`+ * @inheritdoc`
`125`	`125`	`*/`
`126`	`126`	`public function removeButton($buttonId)`
`127`	`127`	`{`
`@@ -230,7 +230,7 @@ protected function _prepareLayout()`
`230`	`230`	`}`
`231`	`231`
`232`	`232`	`/**`
`233`		`- * {@inheritdoc}`
	`233`	`+ * @inheritdoc`
`234`	`234`	`*/`
`235`	`235`	`public function addButton($buttonId, $data, $level = 0, $sortOrder = 0, $region = 'toolbar')`
`236`	`236`	`{`
`@@ -413,7 +413,7 @@ public function getCurrentlyUsedForPaths($asJSON = true)`
`413`	`413`	`* @return array`
`414`	`414`	`* @SuppressWarnings(PHPMD.CyclomaticComplexity)`
`415`	`415`	`*/`
`416`		`- protected function _getSystemConfigPathsParts($paths)`
	`416`	`+ protected function _getSystemConfigPathsParts($paths) // phpcs:ignore Generic.Metrics.NestingLevel`
`417`	`417`	`{`
`418`	`418`	`$result = $urlParams = $prefixParts = [];`
`419`	`419`	`$scopeLabel = __('Default Config');`
`@@ -431,7 +431,7 @@ protected function _getSystemConfigPathsParts($paths)`
`431`	`431`
`432`	`432`	`$pathParts = $prefixParts;`
`433`	`433`	`foreach ($paths as $pathData) {`
`434`		`- $pathDataParts = explode('/', $pathData['path']);`
	`434`	`+ $pathDataParts = explode('/', $pathData['path'] ?? '');`
`435`	`435`	`$sectionName = array_shift($pathDataParts);`
`436`	`436`
`437`	`437`	`$urlParams = ['section' => $sectionName];`
Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@ protected function checkTemplate(AbstractTemplate $template, OutputInterface $ou`
`116`	`116`	`private function renderErrors(OutputInterface $output, array $errors): void`
`117`	`117`	`{`
`118`	`118`	`foreach ($errors as $error) {`
`119`		`- $error = str_replace(PHP_EOL, PHP_EOL . ' ', $error);`
	`119`	`+ $error = str_replace(PHP_EOL, PHP_EOL . ' ', $error ?? '');`
`120`	`120`	`$output->writeln(`
`121`	`121`	`'<error> - ' . $error . '</error>'`
`122`	`122`	`);`