Fixed null parameter warning in DataFlow Profiles (#3827)

Co-authored-by: Ng Kiat Siong <[email protected]>
OpenMage · Feb 27, 2024 · 63293af · 63293af
1 parent fef1c08
commit 63293af
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 12 deletions.
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/Wizard.php b/app/code/core/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/Wizard.php
@@ -92,7 +92,7 @@ public function getValue($key, $default = '', $defaultNew = null)
         }
 
         $value = $this->getData($key);
-        return $this->escapeHtml(strlen($value) > 0 ? $value : $default);
+        return $this->escapeHtml($value !== null && strlen($value) > 0 ? $value : $default);
     }
 
     /**

diff --git a/app/code/core/Mage/Dataflow/Model/Profile.php b/app/code/core/Mage/Dataflow/Model/Profile.php
@@ -86,7 +86,8 @@ protected function _beforeSave()
     {
         parent::_beforeSave();
         $actionsXML = $this->getData('actions_xml');
-        if (strlen($actionsXML) < 0 &&
+        // @phpstan-ignore-next-line because of https://github.com/phpstan/phpstan/issues/10570
+        if ($actionsXML !== null && strlen($actionsXML) < 0 &&
             @simplexml_load_string('<data>' . $actionsXML . '</data>', null, LIBXML_NOERROR) === false
         ) {
             Mage::throwException(Mage::helper('dataflow')->__("Actions XML is not valid."));

diff --git a/phpstan.dist.baseline.neon b/phpstan.dist.baseline.neon
@@ -2915,16 +2915,6 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Dataflow/Model/Convert/Profile/Abstract.php
 
-		-
-			message: "#^Comparison operation \"\\<\" between int\\<0, max\\> and 0 is always false\\.$#"
-			count: 1
-			path: app/code/core/Mage/Dataflow/Model/Profile.php
-
-		-
-			message: "#^Result of && is always false\\.$#"
-			count: 1
-			path: app/code/core/Mage/Dataflow/Model/Profile.php
-
 		-
 			message: "#^Right side of && is always true\\.$#"
 			count: 1