PHP8: fixes passing null in `Mage_Adminhtml_Block_System_Convert_Gui_…

…Edit_Tab_Wizard::getValue()` (#6) * PHP8: fixes passing null in Mage_Adminhtml_Block_System_Convert_Gui_Edit_Tab_Wizard::getValue() * Added docblock to template
openmage-strict · Feb 13, 2024 · c562b79 · c562b79
1 parent d59529b
commit c562b79
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 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(is_string($value) && 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
@@ -29,8 +29,8 @@
  * @method $this setUpdatedAt(string $value)
  * @method string getActionsXml()
  * @method $this setActionsXml(string $value)
- * @method string getGuiData()
- * @method $this setGuiData(string $value)
+ * @method mixed getGuiData()
+ * @method $this setGuiData(mixed $value)
  * @method string getDirection()
  * @method $this setDirection(string $value)
  * @method string getEntityType()
@@ -85,7 +85,7 @@ protected function _afterLoad()
     protected function _beforeSave()
     {
         parent::_beforeSave();
-        $actionsXML = $this->getData('actions_xml');
+        $actionsXML = $this->getData('actions_xml') ?? '';
         if (strlen($actionsXML) < 0 &&
             @simplexml_load_string('<data>' . $actionsXML . '</data>', null, LIBXML_NOERROR) === false
         ) {

diff --git a/app/design/adminhtml/default/default/template/system/convert/profile/wizard.phtml b/app/design/adminhtml/default/default/template/system/convert/profile/wizard.phtml
@@ -15,6 +15,8 @@
 ?>
 <?php
 /**
+ * @var Mage_Adminhtml_Block_System_Convert_Gui_Edit_Tab_Wizard $this
+ *
  * @methods
  * - getValue($key, $default)
  * - getSelected($key, $value)
-Original file line number
+Diff line change
@@ Expand Up @@
             }
             $value = $this->getData($key);
-            return $this->escapeHtml(strlen($value) > 0 ? $value : $default);
+            return $this->escapeHtml(is_string($value) && strlen($value) > 0 ? $value : $default);
         }
         /**
@@ Expand Down @@