Merge remote-tracking branch 'origin/AC-3108-fix-deprecation-issues-part6' into delivery-bunch-w22

andrewbess · andrewbess · commit 061775434fd6 · 2022-05-31T07:45:17.000+02:00
diff --git a/app/code/Magento/Theme/view/frontend/templates/callouts/left_col.phtml b/app/code/Magento/Theme/view/frontend/templates/callouts/left_col.phtml
@@ -6,19 +6,19 @@
 ?>
 <div class="block block-banner">
     <div class="block-content">
-        <?php if (strtolower(substr($block->getLinkUrl(), 0, 4)) === 'http') : ?>
+        <?php if ($block->getLinkUrl() && strtolower(substr($block->getLinkUrl(), 0, 4)) === 'http'): ?>
             <a href="<?= $block->escapeUrl($block->getLinkUrl()) ?>"
                title="<?= $block->escapeHtmlAttr(__($block->getImgAlt())) ?>">
-        <?php elseif ($block->getLinkUrl()) : ?>
+        <?php elseif ($block->getLinkUrl()): ?>
             <a href="<?= $block->escapeUrl($block->getUrl($block->getLinkUrl())) ?>"
                title="<?= $block->escapeHtmlAttr(__($block->getImgAlt())) ?>">
         <?php endif; ?>
             <img src="<?= $block->escapeUrl($block->getViewFileUrl($block->getImgSrc())) ?>"
-                <?php if (!$block->getLinkUrl()) : ?>
+                <?php if (!$block->getLinkUrl()): ?>
                     title="<?= $block->escapeHtmlAttr(__($block->getImgAlt())) ?>"
                 <?php endif; ?>
                  alt="<?= $block->escapeHtmlAttr(__($block->getImgAlt())) ?>" />
-        <?php if ($block->getLinkUrl()) : ?>
+        <?php if ($block->getLinkUrl()): ?>
         </a>
         <?php endif ?>
     </div>
diff --git a/app/code/Magento/Theme/view/frontend/templates/callouts/right_col.phtml b/app/code/Magento/Theme/view/frontend/templates/callouts/right_col.phtml
@@ -6,19 +6,19 @@
 ?>
 <div class="block block-banner">
     <div class="block-content">
-        <?php if (strtolower(substr($block->getLinkUrl(), 0, 4)) === 'http') : ?>
+        <?php if ($block->getLinkUrl() && strtolower(substr($block->getLinkUrl(), 0, 4)) === 'http'): ?>
             <a href="<?= $block->escapeUrl($block->getLinkUrl()) ?>"
                title="<?= $block->escapeHtmlAttr(__($block->getImgAlt())) ?>">
-        <?php elseif ($block->getLinkUrl()) : ?>
+        <?php elseif ($block->getLinkUrl()): ?>
             <a href="<?= $block->escapeUrl($block->getUrl($block->getLinkUrl())) ?>"
                title="<?= $block->escapeHtmlAttr(__($block->getImgAlt())) ?>">
         <?php endif; ?>
             <img src="<?= $block->escapeUrl($block->getViewFileUrl($block->getImgSrc())) ?>"
-                <?php if (!$block->getLinkUrl()) : ?>
+                <?php if (!$block->getLinkUrl()): ?>
                     title="<?= $block->escapeHtmlAttr(__($block->getImgAlt())) ?>"
                 <?php endif; ?>
                  alt="<?= $block->escapeHtmlAttr(__($block->getImgAlt())) ?>" />
-        <?php if ($block->getLinkUrl()) : ?>
+        <?php if ($block->getLinkUrl()): ?>
         </a>
         <?php endif ?>
     </div>
diff --git a/app/code/Magento/Theme/view/frontend/templates/html/sections.phtml b/app/code/Magento/Theme/view/frontend/templates/html/sections.phtml
@@ -19,7 +19,7 @@ $groupCss = $block->getGroupCss();
             <?php foreach ($detailedInfoGroup as $name):?>
                 <?php
                     $html = $layout->renderElement($name);
-                if (!trim($html) && ($block->getUseForce() != true)) {
+                if (!($html !== null && trim($html)) && ($block->getUseForce() != true)) {
                     continue;
                 }
                     $alias = $layout->getElementAlias($name);
diff --git a/app/code/Magento/Translation/Model/Inline/Parser.php b/app/code/Magento/Translation/Model/Inline/Parser.php
@@ -344,7 +344,7 @@ protected function _getAttributeLocation($matches, $options)
      */
     protected function _getTagLocation($matches, $options)
     {
-        $tagName = strtolower($options['tagName']);
+        $tagName = isset($options['tagName']) ? strtolower($options['tagName']) : '';
 
         return $options['tagList'][$tagName] ?? (ucfirst($tagName) . ' Text');
     }
@@ -386,6 +386,8 @@ protected function _applySpecialTagsFormat($tagHtml, $tagName, $trArr)
      */
     protected function _applySimpleTagsFormat($tagHtml, $tagName, $trArr)
     {
+        $tagHtml = $tagHtml !== null ? $tagHtml : '';
+        $tagName = $tagName !== null ? $tagName : '';
         $simpleTags = substr(
             $tagHtml,
             0,
@@ -568,6 +570,7 @@ function ($tagHtml, $tagName, $trArr) {
      * @param callable $formatCallback
      *
      * @return void
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     private function _translateTags(string &$content, array $tagsList, callable $formatCallback)
     {
@@ -621,7 +624,7 @@ private function _translateTags(string &$content, array $tagsList, callable $for
                         && $tagBodyOpenStartPosition > $tagMatch[0][1]
                     ) {
                         $tagHtmlHead = $formatCallback($tagHtml, $tagName, $trArr);
-                        $headTranslateTags .= substr($tagHtmlHead, strlen($tagHtml));
+                        $headTranslateTags .= $tagHtmlHead !== null ? substr($tagHtmlHead, strlen($tagHtml)) : '';
                     } else {
                         $tagHtml = $formatCallback($tagHtml, $tagName, $trArr);
                     }
@@ -654,13 +657,14 @@ private function _translateTags(string &$content, array $tagsList, callable $for
      */
     private function _findEndOfTag($body, $tagName, $from)
     {
+        $body = $body !== null ? $body : '';
         $openTag = '<' . $tagName;
         $closeTag = ($this->_isJson ? '<\\/' : '</') . $tagName;
         $tagLength = strlen($tagName);
         $length = $tagLength + 1;
         $end = $from + 1;
         while (substr_count($body, $openTag, $from, $length) !== substr_count($body, $closeTag, $from, $length)) {
-            $end = strpos($body, (string) $closeTag, $end + $tagLength + 1);
+            $end = strpos($body, $closeTag, $end + $tagLength + 1);
             if ($end === false) {
                 return false;
             }
diff --git a/app/code/Magento/Translation/Model/Js/DataProvider.php b/app/code/Magento/Translation/Model/Js/DataProvider.php
@@ -30,8 +30,6 @@ class DataProvider implements DataProviderInterface
     protected $config;
 
     /**
-     * Files utility
-     *
      * @var \Magento\Framework\App\Utility\Files
      */
     protected $filesUtility;
@@ -142,7 +140,7 @@ protected function getPhrases($content)
             if ($result) {
                 if (isset($matches[2])) {
                     foreach ($matches[2] as $match) {
-                        $phrases[] = str_replace(["\'", '\"'], ["'", '"'], $match);
+                        $phrases[] = $match !== null ? str_replace(["\'", '\"'], ["'", '"'], $match) : '';
                     }
                 }
             }
diff --git a/app/code/Magento/Translation/Model/Json/PreProcessor.php b/app/code/Magento/Translation/Model/Json/PreProcessor.php
@@ -116,6 +116,6 @@ public function process(Chain $chain)
      */
     protected function isDictionaryPath($path)
     {
-        return (strpos($path, (string) $this->config->getDictionaryFileName()) !== false);
+        return $path !== null && strpos($path, (string) $this->config->getDictionaryFileName()) !== false;
     }
 }
diff --git a/app/code/Magento/Ui/Config/Argument/Parser/ConverterType.php b/app/code/Magento/Ui/Config/Argument/Parser/ConverterType.php
@@ -34,7 +34,7 @@ public function parse(array $data, \DOMNode $node)
     {
         $result = [];
         $domXPath = new \DOMXPath($node->ownerDocument);
-        $nodeList = $domXPath->query(trim($data['value']), $node);
+        $nodeList = $domXPath->query(trim($data['value'] ?? ''), $node);
         foreach ($nodeList as $itemNode) {
             $result = $this->converter->convert($itemNode, $data);
         }
diff --git a/app/code/Magento/Ui/Config/Argument/Parser/XpathType.php b/app/code/Magento/Ui/Config/Argument/Parser/XpathType.php
@@ -25,7 +25,7 @@ public function parse(array $data, \DOMNode $node)
         }
         unset($data['type']);
         $domXPath = new \DOMXPath($node->ownerDocument);
-        $nodeList = $domXPath->query(trim($data['value']), $node);
+        $nodeList = $domXPath->query(trim($data['value'] ?? ''), $node);
         if ($nodeList->length == 1) {
             $nodeItem = $nodeList->item(0);
             $data['xsi:type'] = $type;
diff --git a/app/code/Magento/Ui/Config/Reader/Dom.php b/app/code/Magento/Ui/Config/Reader/Dom.php
@@ -46,7 +46,7 @@ class Dom extends ConfigDom
      * @param ValidationStateInterface $validationState
      * @param SchemaLocatorInterface $schemaLocator
      * @param array $idAttributes
-     * @param null $typeAttributeName
+     * @param string|null $typeAttributeName
      * @param string $errorFormat
      */
     public function __construct(
@@ -142,7 +142,7 @@ private function processMatchedNodes(\DOMNodeList $rootMatchList, \DOMElement $i
     private function createXPath(\DOMNode $node)
     {
         $parentXPath = '';
-        $currentXPath = $node->getNodePath();
+        $currentXPath = $node->getNodePath() ?? '';
         if ($node->parentNode !== null && !$node->isSameNode($node->parentNode)) {
             $parentXPath = $this->createXPath($node->parentNode);
             $pathParts = explode('/', $currentXPath);
diff --git a/app/code/Magento/Ui/Controller/Adminhtml/Bookmark/Delete.php b/app/code/Magento/Ui/Controller/Adminhtml/Bookmark/Delete.php
@@ -13,6 +13,8 @@
 
 /**
  * Class Delete action
+ *
+ * @SuppressWarnings(PHPMD.AllPurposeAction)
  */
 class Delete extends AbstractAction
 {
@@ -50,7 +52,7 @@ public function __construct(
      */
     public function execute()
     {
-        $viewIds = explode('.', $this->_request->getParam('data'));
+        $viewIds = explode('.', $this->_request->getParam('data', ''));
         $bookmark = $this->bookmarkManagement->getByIdentifierNamespace(
             array_pop($viewIds),
             $this->_request->getParam('namespace')
diff --git a/app/code/Magento/Ups/Model/Carrier.php b/app/code/Magento/Ups/Model/Carrier.php
@@ -536,7 +536,7 @@ protected function _getCgiQuotes()
     {
         $rowRequest = $this->_rawRequest;
         if (self::USA_COUNTRY_ID == $rowRequest->getDestCountry()) {
-            $destPostal = substr((string)$rowRequest->getDestPostal(), 0, 5);
+            $destPostal = substr((string) $rowRequest->getDestPostal(), 0, 5);
         } else {
             $destPostal = $rowRequest->getDestPostal();
         }
@@ -616,7 +616,7 @@ protected function _parseCgiResponse($response)
     {
         $costArr = [];
         $priceArr = [];
-        if (strlen(trim($response)) > 0) {
+        if ($response !== null && strlen(trim($response)) > 0) {
             $rRows = explode("\n", $response);
             $allowedMethods = explode(",", (string)$this->getConfigData('allowed_methods'));
             foreach ($rRows as $rRow) {
@@ -910,7 +910,7 @@ protected function _parseXmlResponse($xmlResponse)
     {
         $costArr = [];
         $priceArr = [];
-        if (strlen(trim($xmlResponse)) > 0) {
+        if ($xmlResponse !== null && strlen(trim($xmlResponse)) > 0) {
             $xml = new \Magento\Framework\Simplexml\Config();
             $xml->loadString($xmlResponse);
             $arr = $xml->getXpath("//RatingServiceSelectionResponse/Response/ResponseStatusCode/text()");

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ $groupCss = $block->getGroupCss();`
`19`	`19`	`<?php foreach ($detailedInfoGroup as $name):?>`
`20`	`20`	`<?php`
`21`	`21`	`$html = $layout->renderElement($name);`
`22`		`- if (!trim($html) && ($block->getUseForce() != true)) {`
	`22`	`+ if (!($html !== null && trim($html)) && ($block->getUseForce() != true)) {`
`23`	`23`	`continue;`
`24`	`24`	`}`
`25`	`25`	`$alias = $layout->getElementAlias($name);`
Original file line number	Diff line number	Diff line change
`@@ -30,8 +30,6 @@ class DataProvider implements DataProviderInterface`
`30`	`30`	`protected $config;`
`31`	`31`
`32`	`32`	`/**`
`33`		`- * Files utility`
`34`		`- *`
`35`	`33`	`* @var \Magento\Framework\App\Utility\Files`
`36`	`34`	`*/`
`37`	`35`	`protected $filesUtility;`
`@@ -142,7 +140,7 @@ protected function getPhrases($content)`
`142`	`140`	`if ($result) {`
`143`	`141`	`if (isset($matches[2])) {`
`144`	`142`	`foreach ($matches[2] as $match) {`
`145`		`- $phrases[] = str_replace(["\'", '\"'], ["'", '"'], $match);`
	`143`	`+ $phrases[] = $match !== null ? str_replace(["\'", '\"'], ["'", '"'], $match) : '';`
`146`	`144`	`}`
`147`	`145`	`}`
`148`	`146`	`}`
Original file line number	Diff line number	Diff line change
`@@ -116,6 +116,6 @@ public function process(Chain $chain)`
`116`	`116`	`*/`
`117`	`117`	`protected function isDictionaryPath($path)`
`118`	`118`	`{`
`119`		`- return (strpos($path, (string) $this->config->getDictionaryFileName()) !== false);`
	`119`	`+ return $path !== null && strpos($path, (string) $this->config->getDictionaryFileName()) !== false;`
`120`	`120`	`}`
`121`	`121`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public function parse(array $data, \DOMNode $node)`
`34`	`34`	`{`
`35`	`35`	`$result = [];`
`36`	`36`	`$domXPath = new \DOMXPath($node->ownerDocument);`
`37`		`- $nodeList = $domXPath->query(trim($data['value']), $node);`
	`37`	`+ $nodeList = $domXPath->query(trim($data['value'] ?? ''), $node);`
`38`	`38`	`foreach ($nodeList as $itemNode) {`
`39`	`39`	`$result = $this->converter->convert($itemNode, $data);`
`40`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ public function parse(array $data, \DOMNode $node)`
`25`	`25`	`}`
`26`	`26`	`unset($data['type']);`
`27`	`27`	`$domXPath = new \DOMXPath($node->ownerDocument);`
`28`		`- $nodeList = $domXPath->query(trim($data['value']), $node);`
	`28`	`+ $nodeList = $domXPath->query(trim($data['value'] ?? ''), $node);`
`29`	`29`	`if ($nodeList->length == 1) {`
`30`	`30`	`$nodeItem = $nodeList->item(0);`
`31`	`31`	`$data['xsi:type'] = $type;`