diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Comments/View.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Comments/View.php
index f541bcd246a..f7e527db753 100644
--- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Comments/View.php
+++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Comments/View.php
@@ -69,9 +69,10 @@ public function canSendCommentEmail()
     /**
      * Replace links in string
      *
-     * @param  null|string|string[]                        $data
-     * @param  null|string[]                               $allowedTags
-     * @return ($data is array ? array<?string> : ?string)
+     * @param  null|string|string[]                $data
+     * @param  null|string[]                       $allowedTags
+     * @return null|array<int, null|string>|string
+     * @phpstan-return ($data is array ? array<?string> : ?string)
      */
     #[Override]
     public function escapeHtml($data, $allowedTags = null)
diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/History.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/History.php
index 1a75226612e..7a756060f32 100644
--- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/History.php
+++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/History.php
@@ -73,9 +73,10 @@ public function isCustomerNotificationNotApplicable(Mage_Sales_Model_Order_Statu
     /**
      * Replace links in string
      *
-     * @param  null|string|string[]                        $data
-     * @param  null|string[]                               $allowedTags
-     * @return ($data is array ? array<?string> : ?string)
+     * @param  null|string|string[]                $data
+     * @param  null|string[]                       $allowedTags
+     * @return null|array<int, null|string>|string
+     * @phpstan-return ($data is array ? array<?string> : ?string)
      */
     #[Override]
     public function escapeHtml($data, $allowedTags = null)
diff --git a/app/code/core/Mage/Adminhtml/Helper/Sales.php b/app/code/core/Mage/Adminhtml/Helper/Sales.php
index bff724341c7..44daaa2b015 100644
--- a/app/code/core/Mage/Adminhtml/Helper/Sales.php
+++ b/app/code/core/Mage/Adminhtml/Helper/Sales.php
@@ -99,9 +99,10 @@ public function applySalableProductTypesFilter($collection)
     /**
      * Escape string preserving links
      *
-     * @param  null|string|string[]                        $data
-     * @param  null|string[]                               $allowedTags
-     * @return ($data is array ? array<?string> : ?string)
+     * @param  null|string|string[]                $data
+     * @param  null|string[]                       $allowedTags
+     * @return null|array<int, null|string>|string
+     * @phpstan-return ($data is array ? array<?string> : ?string)
      */
     public function escapeHtmlWithLinks($data, $allowedTags = null)
     {
diff --git a/app/code/core/Mage/Core/Block/Abstract.php b/app/code/core/Mage/Core/Block/Abstract.php
index abff6a7b803..d5379a2adca 100644
--- a/app/code/core/Mage/Core/Block/Abstract.php
+++ b/app/code/core/Mage/Core/Block/Abstract.php
@@ -1213,9 +1213,10 @@ public function __()
 
     /**
      * Escape html entities
-     * @param  null|string|string[]                        $data
-     * @param  null|string[]                               $allowedTags
-     * @return ($data is array ? array<?string> : ?string)
+     * @param  null|string|string[]                $data
+     * @param  null|string[]                       $allowedTags
+     * @return null|array<int, null|string>|string
+     * @phpstan-return ($data is array ? array<?string> : ?string)
      */
     public function escapeHtml($data, $allowedTags = null)
     {
diff --git a/app/code/core/Mage/Core/Helper/Abstract.php b/app/code/core/Mage/Core/Helper/Abstract.php
index d907711ff55..1306ffa25c3 100644
--- a/app/code/core/Mage/Core/Helper/Abstract.php
+++ b/app/code/core/Mage/Core/Helper/Abstract.php
@@ -182,9 +182,10 @@ public function __()
      * Escape html entities
      *
      * @template T of mixed|string|string[]
-     * @param  T                                                                 $data
-     * @param  null|string[]                                                     $allowedTags
-     * @return (T is array ? string[] : (T is null|bool|int|string ? T : mixed))
+     * @param  T                     $data
+     * @param  null|string[]         $allowedTags
+     * @return mixed|string|string[]
+     * @phpstan-return (T is array ? string[] : (T is null|bool|int|string ? T : mixed))
      */
     public function escapeHtml($data, $allowedTags = null)
     {
@@ -299,9 +300,10 @@ public function escapeScriptIdentifiers($data)
     /**
      * Escape quotes in java script
      *
-     * @param  string|string[]                      $data
-     * @param  string                               $quote
-     * @return ($data is array ? string[] : string)
+     * @param  string|string[] $data
+     * @param  string          $quote
+     * @return string|string[]
+     * @phpstan-return ($data is array ? string[] : string)
      */
     public function jsQuoteEscape($data, $quote = "'")
     {