Merge remote-tracking branch 'origin/AC-3161-fix-potential-issues-php-p12' into delivery-bunch-w22

Author: andrewbess

lib/internal/Magento/Framework/Config/Composer/Package.php

@@ -65,7 +65,7 @@ public function getJson($formatted = true, $format = null)
      */
     public function get($propertyPath, $filter = null)
     {
-        $result = $this->traverseGet($this->json, explode('->', $propertyPath));
+        $result = $this->traverseGet($this->json, explode('->', $propertyPath ?: ''));
         if ($result && $filter) {
             foreach ($result as $key => $value) {
                 if (!preg_match($filter, $key)) {

lib/internal/Magento/Framework/Config/Converter.php

@@ -9,8 +9,6 @@
 
 /**
  * Class Converter convert xml to appropriate array
- *
- * @package Magento\Framework\Config
  */
 class Converter implements \Magento\Framework\Config\ConverterInterface
 {
@@ -103,9 +101,11 @@ protected function parseVarElement(\DOMElement $node)
             }
         }
         if (!count($result)) {
-            $result = (strtolower($node->nodeValue) !== 'true' && strtolower($node->nodeValue) !== 'false')
-                ? $node->nodeValue
-                : filter_var($node->nodeValue, FILTER_VALIDATE_BOOLEAN);
+            $result = (
+                $node->nodeValue !== null
+                && strtolower($node->nodeValue) !== 'true'
+                && strtolower($node->nodeValue) !== 'false'
+            ) ? $node->nodeValue : filter_var($node->nodeValue, FILTER_VALIDATE_BOOLEAN);
         }
         return $result;
     }

lib/internal/Magento/Framework/Config/Data/ConfigData.php

@@ -14,15 +14,11 @@
 class ConfigData
 {
     /**
-     * File key
-     *
      * @var string
      */
     private $fileKey;
 
     /**
-     * Data
-     *
      * @var array
      */
     private $data = [];
@@ -124,7 +120,7 @@ public function set($path, $value)
      */
     private function expand($path)
     {
-        $chunks = explode('/', $path);
+        $chunks = explode('/', $path ?: '');
 
         foreach ($chunks as $chunk) {
             if ('' == $chunk) {

lib/internal/Magento/Framework/Config/Dom.php

@@ -14,8 +14,6 @@
 use Magento\Framework\Phrase;
 
 /**
- * Class Dom
- *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @api
  * @since 100.0.2
@@ -25,12 +23,12 @@ class Dom
     /**
      * Prefix which will be used for root namespace
      */
-    const ROOT_NAMESPACE_PREFIX = 'x';
+    public const ROOT_NAMESPACE_PREFIX = 'x';
 
     /**
      * Format of items in errors array to be used by default. Available placeholders - fields of \LibXMLError.
      */
-    const ERROR_FORMAT_DEFAULT = "%message%\nLine: %line%\n";
+    public const ERROR_FORMAT_DEFAULT = "%message%\nLine: %line%\n";
 
     /**
      * @var \Magento\Framework\Config\ValidationStateInterface
@@ -262,6 +260,8 @@ private function findCdataSection($node)
                 return $childNode;
             }
         }
+
+        return null;
     }
 
     /**
@@ -407,9 +407,9 @@ private static function _renderErrorMessage(\LibXMLError $errorInfo, $format)
         foreach ($errorInfo as $field => $value) {
             $placeholder = '%' . $field . '%';
             $value = trim((string)$value);
-            $result = str_replace($placeholder, $value, $result);
+            $result = $result !== null ? str_replace($placeholder, $value, $result) : '';
         }
-        if (strpos($result, '%') !== false) {
+        if ($result && strpos($result, '%') !== false) {
             if (preg_match_all('/%.+%/', $result, $matches)) {
                 $unsupported = [];
                 foreach ($matches[0] as $placeholder) {

lib/internal/Magento/Framework/Config/Dom/NodePathMatcher.php

@@ -32,9 +32,9 @@ public function match($pathPattern, $xpathSubject)
      */
     protected function simplifyXpath($xpath)
     {
-        $result = $xpath;
+        $result = $xpath ?: '';
         $result = preg_replace('/\[@[^\]]+?\]/', '', $result);
-        $result = preg_replace('/\/[^:]+?\:/', '/', $result);
-        return $result;
+
+        return preg_replace('/\/[^:]+?\:/', '/', $result);
     }
 }

lib/internal/Magento/Framework/Config/Dom/UrnResolver.php

@@ -29,7 +29,7 @@ class UrnResolver
      */
     public function getRealPath($schema)
     {
-        if (strpos($schema, 'urn:') !== 0) {
+        if ($schema && strpos($schema, 'urn:') !== 0) {
             return $schema;
         }
 
@@ -75,7 +75,7 @@ public function getRealPath($schema)
      */
     public function registerEntityLoader($public, $system, $context)
     {
-        if (strpos($system, 'urn:') === 0) {
+        if ($system && strpos($system, 'urn:') === 0) {
             $filePath = $this->getRealPath($system);
         } else {
             if (file_exists($system)) {

lib/internal/Magento/Framework/Config/View.php

@@ -90,7 +90,7 @@ public function getVarValue($module, $var)
         }
 
         $value = $this->data['vars'][$module];
-        foreach (explode('/', $var) as $node) {
+        foreach (explode('/', $var ?: '') as $node) {
             if (is_array($value) && isset($value[$node])) {
                 $value = $value[$node];
             } else {
@@ -200,7 +200,8 @@ protected function initData()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
+     *
      * @since 100.1.0
      */
     public function read($scope = null)

lib/internal/Magento/Framework/Console/QuestionPerformer/YesNo.php

@@ -62,7 +62,7 @@ public function execute(array $messages, InputInterface $input, OutputInterface
         $question = $this->getConfirmationQuestion($messages);
         $answer = $this->questionHelper->ask($input, $output, $question);
 
-        return in_array(strtolower($answer), ['yes', 'y']);
+        return in_array(strtolower($answer ?? ''), ['yes', 'y']);
     }
 
     /**
@@ -80,7 +80,7 @@ private function getConfirmationQuestion(array $messages)
         ]);
 
         $question->setValidator(function ($answer) {
-            if (!in_array(strtolower($answer), ['yes', 'y', 'no', 'n'])) {
+            if (!in_array(strtolower($answer ?? ''), ['yes', 'y', 'no', 'n'])) {
                 throw new LocalizedException(
                     new Phrase('A [y]es or [n]o selection needs to be made. Select and try again.')
                 );

lib/internal/Magento/Framework/Convert/DataSize.php

@@ -13,14 +13,15 @@ class DataSize
 {
     /**
      * Converts a size value to bytes
+     *
      * Example input: 100 (bytes), 10K (kilobytes), 13M (megabytes), 2G (gigabytes)
      *
      * @param string $size
      * @return integer
      */
     public function convertSizeToBytes($size)
     {
-        if (!is_numeric($size)) {
+        if ($size && !is_numeric($size)) {
             $type = strtoupper(substr($size, -1));
             $size = (int)$size;
 

lib/internal/Magento/Framework/Crontab/CrontabManager.php

@@ -78,7 +78,7 @@ public function getTasks()
         $pattern = '!(' . $this->getTasksBlockStart() . ')(.*?)(' . $this->getTasksBlockEnd() . ')!s';
 
         if (preg_match($pattern, $content, $matches)) {
-            $tasks = trim($matches[2], PHP_EOL);
+            $tasks = trim($matches[2] ?? '', PHP_EOL);
             $tasks = explode(PHP_EOL, $tasks);
             return $tasks;
         }