From 0eae173d699ff0d9cbd9c7be6125d616c0c25f4a Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Tue, 12 Nov 2024 12:23:16 +0100
Subject: [PATCH 1/4] some fixes

- https://github.com/OpenMage/magento-lts/pull/4291#issuecomment-2470145411
---
 .phpstan.dist.baseline.neon                   | 55 -------------------
 .../Mage/Payment/Model/Method/Abstract.php    |  5 +-
 .../core/Mage/Paypal/Model/Payflowlink.php    |  2 +-
 .../Model/Resource/Helper/Interface.php       |  2 +-
 .../core/Mage/Sales/Model/Order/Payment.php   | 10 ++--
 .../Mage/SalesRule/Model/Quote/Discount.php   |  2 +-
 app/code/core/Mage/Weee/Helper/Data.php       |  4 +-
 app/code/core/Mage/Weee/Model/Tax.php         |  2 +-
 8 files changed, 14 insertions(+), 68 deletions(-)

diff --git a/.phpstan.dist.baseline.neon b/.phpstan.dist.baseline.neon
index 013eec00674..af9a8d63b4f 100644
--- a/.phpstan.dist.baseline.neon
+++ b/.phpstan.dist.baseline.neon
@@ -4770,11 +4770,6 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Paypal/Model/Direct.php
 
-		-
-			message: "#^Call to an undefined method Mage_Payment_Model_Info\\:\\:lookupTransaction\\(\\)\\.$#"
-			count: 2
-			path: app/code/core/Mage/Paypal/Model/Express.php
-
 		-
 			message: "#^If condition is always false\\.$#"
 			count: 1
@@ -4790,11 +4785,6 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Paypal/Model/Express.php
 
-		-
-			message: "#^Parameter \\#1 \\$txnId of method Mage_Sales_Model_Order_Payment\\:\\:lookupTransaction\\(\\) expects string, false given\\.$#"
-			count: 2
-			path: app/code/core/Mage/Paypal/Model/Express.php
-
 		-
 			message: "#^Property Mage_Paypal_Model_Express\\:\\:\\$_pro \\(Mage_Paypal_Model_Pro\\) does not accept Mage_Core_Model_Abstract\\|false\\.$#"
 			count: 1
@@ -4855,16 +4845,6 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Paypal/Model/Observer.php
 
-		-
-			message: "#^PHPDoc tag @param for parameter \\$payment with type Mage_Payment_Model_Info is not subtype of native type Mage_Sales_Model_Order_Payment\\.$#"
-			count: 1
-			path: app/code/core/Mage/Paypal/Model/Payflowlink.php
-
-		-
-			message: "#^Parameter \\#1 \\$payment of method Mage_Paypal_Model_Payflowlink\\:\\:_buildTokenRequest\\(\\) expects Mage_Sales_Model_Order_Payment, Mage_Payment_Model_Info given\\.$#"
-			count: 1
-			path: app/code/core/Mage/Paypal/Model/Payflowlink.php
-
 		-
 			message: "#^Return type \\(bool\\) of method Mage_Paypal_Model_Payflowlink\\:\\:validate\\(\\) should be compatible with return type \\(\\$this\\(Mage_Payment_Model_Method_Cc\\)\\) of method Mage_Payment_Model_Method_Cc\\:\\:validate\\(\\)$#"
 			count: 1
@@ -5050,11 +5030,6 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Reports/Model/Resource/Event.php
 
-		-
-			message: "#^Return type \\(int\\) of method Mage_Reports_Model_Resource_Helper_Mysql4\\:\\:mergeVisitorProductIndex\\(\\) should be compatible with return type \\(string\\) of method Mage_Reports_Model_Resource_Helper_Interface\\:\\:mergeVisitorProductIndex\\(\\)$#"
-			count: 1
-			path: app/code/core/Mage/Reports/Model/Resource/Helper/Mysql4.php
-
 		-
 			message: "#^Method Mage_Reports_Model_Resource_Order_Collection\\:\\:_prepareSummaryAggregated\\(\\) invoked with 4 parameters, 3 required\\.$#"
 			count: 1
@@ -5385,26 +5360,6 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Sales/Model/Order/Payment.php
 
-		-
-			message: "#^Method Mage_Sales_Model_Order_Payment\\:\\:_addTransaction\\(\\) should return Mage_Sales_Model_Order_Payment_Transaction\\|null but return statement is missing\\.$#"
-			count: 1
-			path: app/code/core/Mage/Sales/Model/Order/Payment.php
-
-		-
-			message: "#^Parameter \\#1 \\$invoice of method Mage_Sales_Model_Order_Payment\\:\\:capture\\(\\) expects Mage_Sales_Model_Order_Invoice, null given\\.$#"
-			count: 1
-			path: app/code/core/Mage/Sales/Model/Order/Payment.php
-
-		-
-			message: "#^Parameter \\#1 \\$txnId of method Mage_Sales_Model_Order_Payment\\:\\:_lookupTransaction\\(\\) expects string, false given\\.$#"
-			count: 1
-			path: app/code/core/Mage/Sales/Model/Order/Payment.php
-
-		-
-			message: "#^Parameter \\#1 \\$txnId of method Mage_Sales_Model_Order_Payment\\:\\:_lookupTransaction\\(\\) expects string, null given\\.$#"
-			count: 1
-			path: app/code/core/Mage/Sales/Model/Order/Payment.php
-
 		-
 			message: "#^Property Mage_Sales_Model_Order_Payment\\:\\:\\$_canVoidLookup \\(string\\) does not accept bool\\.$#"
 			count: 2
@@ -5795,11 +5750,6 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/SalesRule/Model/Observer.php
 
-		-
-			message: "#^Return type \\(array\\) of method Mage_SalesRule_Model_Quote_Nominal_Discount\\:\\:fetch\\(\\) should be compatible with return type \\(\\$this\\(Mage_SalesRule_Model_Quote_Discount\\)\\) of method Mage_SalesRule_Model_Quote_Discount\\:\\:fetch\\(\\)$#"
-			count: 1
-			path: app/code/core/Mage/SalesRule/Model/Quote/Nominal/Discount.php
-
 		-
 			message: "#^Negated boolean expression is always false\\.$#"
 			count: 1
@@ -6745,11 +6695,6 @@ parameters:
 			count: 1
 			path: app/design/adminhtml/default/default/template/catalog/product/price.phtml
 
-		-
-			message: "#^Parameter \\#4 \\$website of method Mage_Weee_Helper_Data\\:\\:getProductWeeeAttributesForRenderer\\(\\) expects int\\|null, Mage_Core_Model_Website given\\.$#"
-			count: 1
-			path: app/design/adminhtml/default/default/template/catalog/product/price.phtml
-
 		-
 			message: "#^Variable \\$_weeeTaxAttributes might not be defined\\.$#"
 			count: 9
diff --git a/app/code/core/Mage/Payment/Model/Method/Abstract.php b/app/code/core/Mage/Payment/Model/Method/Abstract.php
index ea39a616e77..89c5c98768c 100644
--- a/app/code/core/Mage/Payment/Model/Method/Abstract.php
+++ b/app/code/core/Mage/Payment/Model/Method/Abstract.php
@@ -370,12 +370,13 @@ public function getInfoBlockType()
     /**
      * Retrieve payment information model object
      *
-     * @return Mage_Payment_Model_Info
+     * @return Mage_Sales_Model_Order_Payment|Mage_Sales_Model_Quote_Payment
      */
     public function getInfoInstance()
     {
+        /** @var Mage_Sales_Model_Order_Payment|Mage_Sales_Model_Quote_Payment $instance */
         $instance = $this->getData('info_instance');
-        if (!($instance instanceof Mage_Payment_Model_Info)) {
+        if (!$instance instanceof Mage_Payment_Model_Info) {
             Mage::throwException(Mage::helper('payment')->__('Cannot retrieve the payment information object instance.'));
         }
         return $instance;
diff --git a/app/code/core/Mage/Paypal/Model/Payflowlink.php b/app/code/core/Mage/Paypal/Model/Payflowlink.php
index 78432d3390f..a82cdcef759 100644
--- a/app/code/core/Mage/Paypal/Model/Payflowlink.php
+++ b/app/code/core/Mage/Paypal/Model/Payflowlink.php
@@ -365,7 +365,7 @@ protected function _getOrderFromResponse()
     /**
      * Build request for getting token
      *
-     * @param Mage_Sales_Model_Order_Payment|Mage_Payment_Model_Info $payment
+     * @param Mage_Sales_Model_Order_Payment $payment
      * @return Varien_Object
      */
     protected function _buildTokenRequest(Mage_Sales_Model_Order_Payment $payment)
diff --git a/app/code/core/Mage/Reports/Model/Resource/Helper/Interface.php b/app/code/core/Mage/Reports/Model/Resource/Helper/Interface.php
index 302a1b3fa15..740472f81f2 100644
--- a/app/code/core/Mage/Reports/Model/Resource/Helper/Interface.php
+++ b/app/code/core/Mage/Reports/Model/Resource/Helper/Interface.php
@@ -27,7 +27,7 @@ interface Mage_Reports_Model_Resource_Helper_Interface
      * @param string $mainTable
      * @param array $data
      * @param mixed $matchFields
-     * @return string
+     * @return int
      */
     public function mergeVisitorProductIndex($mainTable, $data, $matchFields);
 
diff --git a/app/code/core/Mage/Sales/Model/Order/Payment.php b/app/code/core/Mage/Sales/Model/Order/Payment.php
index dadc3bd1a8d..8d296bb6701 100644
--- a/app/code/core/Mage/Sales/Model/Order/Payment.php
+++ b/app/code/core/Mage/Sales/Model/Order/Payment.php
@@ -433,7 +433,7 @@ public function place()
      *
      * TODO: eliminate logic duplication with registerCaptureNotification()
      *
-     * @param Mage_Sales_Model_Order_Invoice $invoice
+     * @param Mage_Sales_Model_Order_Invoice|null $invoice
      * @return $this
      * @throws Mage_Core_Exception
      */
@@ -1251,7 +1251,7 @@ protected function _void($isOnline, $amount = null, $gatewayCallback = 'void')
      * @param string $type
      * @param Mage_Sales_Model_Abstract $salesDocument
      * @param bool $failsafe
-     * @return null|Mage_Sales_Model_Order_Payment_Transaction
+     * @return null|Mage_Sales_Model_Order_Payment_Transaction|void
      */
     protected function _addTransaction($type, $salesDocument = null, $failsafe = false)
     {
@@ -1413,7 +1413,7 @@ protected function _isTransactionExists($txnId = null)
     /**
      * Append transaction ID (if any) message to the specified message
      *
-     * @param Mage_Sales_Model_Order_Payment_Transaction|null $transaction
+     * @param Mage_Sales_Model_Order_Payment_Transaction|string|null $transaction
      * @param string $message
      * @return string
      */
@@ -1479,7 +1479,7 @@ protected function _formatPrice($amount, $currency = null)
 
     /**
      * Find one transaction by ID or type
-     * @param string $txnId
+     * @param string|false|null $txnId
      * @param string|false $txnType
      * @return Mage_Sales_Model_Order_Payment_Transaction|false
      */
@@ -1518,7 +1518,7 @@ protected function _lookupTransaction($txnId, $txnType = false)
 
     /**
      * Find one transaction by ID or type
-     * @param string $txnId
+     * @param string|false $txnId
      * @param string|false $txnType
      * @return Mage_Sales_Model_Order_Payment_Transaction|false
      */
diff --git a/app/code/core/Mage/SalesRule/Model/Quote/Discount.php b/app/code/core/Mage/SalesRule/Model/Quote/Discount.php
index 62a68d2a0b7..2897cb44a1b 100644
--- a/app/code/core/Mage/SalesRule/Model/Quote/Discount.php
+++ b/app/code/core/Mage/SalesRule/Model/Quote/Discount.php
@@ -134,7 +134,7 @@ protected function _aggregateItemDiscount($item)
     /**
      * Add discount total information to address
      *
-     * @return $this
+     * @return $this|array
      */
     public function fetch(Mage_Sales_Model_Quote_Address $address)
     {
diff --git a/app/code/core/Mage/Weee/Helper/Data.php b/app/code/core/Mage/Weee/Helper/Data.php
index 44be568aa72..cfb178e96b3 100644
--- a/app/code/core/Mage/Weee/Helper/Data.php
+++ b/app/code/core/Mage/Weee/Helper/Data.php
@@ -220,7 +220,7 @@ public function typeOfDisplay($product, $compareTo = null, $zone = null, $store
      * @param Mage_Catalog_Model_Product $product
      * @param null|false|Varien_Object   $shipping
      * @param null|false|Varien_Object   $billing
-     * @param int|Mage_Core_Model_Website $website
+     * @param int|Mage_Core_Model_Website|null|string|true $website
      * @param bool                       $calculateTaxes
      * @return array
      */
@@ -300,7 +300,7 @@ public function getProductWeeeAttributesForDisplay($product)
      * @param Mage_Catalog_Model_Product $product
      * @param null|false|Varien_Object $shipping Shipping Address
      * @param null|false|Varien_Object $billing Billing Address
-     * @param null|int $website
+     * @param int|Mage_Core_Model_Website|null|string|true $website
      * @param mixed $calculateTaxes
      * @return array
      */
diff --git a/app/code/core/Mage/Weee/Model/Tax.php b/app/code/core/Mage/Weee/Model/Tax.php
index 7eb8ce16f70..017adc0c927 100644
--- a/app/code/core/Mage/Weee/Model/Tax.php
+++ b/app/code/core/Mage/Weee/Model/Tax.php
@@ -148,7 +148,7 @@ public function getWeeeTaxAttributeCodes($forceEnabled = false)
      * @param Mage_Catalog_Model_Product $product
      * @param Mage_Sales_Model_Quote_Address $shipping
      * @param Mage_Sales_Model_Quote_Address $billing
-     * @param int|Mage_Core_Model_Website $website
+     * @param int|Mage_Core_Model_Website|null|string|true $website
      * @param bool $calculateTax
      * @param bool $ignoreDiscount
      * @return array

From 6e703a164a7b12892f633ebdfbcf58160962f74d Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Tue, 12 Nov 2024 17:26:45 +0100
Subject: [PATCH 2/4] some fixes

---
 .phpstan.dist.baseline.neon                   | 535 +-----------------
 app/code/core/Mage/Weee/Helper/Data.php       |   2 +-
 .../permissions/role_users_grid_js.phtml      |   2 +
 .../template/permissions/rolesusers.phtml     |   2 +
 .../permissions/user_roles_grid_js.phtml      |   2 +
 .../template/report/refresh/statistics.phtml  |   2 +
 .../order/shipment/packaging/packed.phtml     |   2 +
 .../order/shipment/packaging/popup.phtml      |   2 +
 .../default/template/system/design/edit.phtml |   2 +
 .../template/system/design/index.phtml        |   2 +
 .../template/system/email/template/edit.phtml |   2 +
 .../template/system/email/template/list.phtml |   2 +
 .../system/email/template/preview.phtml       |   2 +
 .../default/template/tag/edit/container.phtml |   2 +
 .../default/default/template/tag/index.phtml  |   2 +
 .../default/template/tax/importExport.phtml   |   2 +
 .../default/template/tax/rate/form.phtml      |   2 +
 .../default/template/tax/rate/title.phtml     |   2 +
 .../template/tax/toolbar/rate/add.phtml       |   5 +
 .../template/tax/toolbar/rate/save.phtml      |   6 +
 .../default/template/widget/form.phtml        |   2 +
 .../default/template/catalog/msrp/popup.phtml |   4 +-
 .../catalog/product/list/related.phtml        |   2 +
 .../catalog/product/list/upsell.phtml         |   2 +
 .../template/catalog/product/view/addto.phtml |   2 +
 .../catalog/product/view/addtocart.phtml      |   2 +
 .../template/catalog/seo/sitemap.phtml        |   4 +-
 .../catalog/seo/sitemap/container.phtml       |   2 +
 .../default/template/catalog/seo/tree.phtml   |   4 +-
 .../catalogsearch/advanced/result.phtml       |   2 +
 .../template/catalogsearch/form.mini.phtml    |   2 +-
 .../template/catalogsearch/result.phtml       |   2 +
 .../default/template/catalogsearch/term.phtml |   2 +
 .../template/checkout/onepage/link.phtml      |   2 +
 .../template/checkout/onepage/payment.phtml   |   2 +
 .../template/checkout/onepage/progress.phtml  |   2 +
 .../checkout/onepage/progress/billing.phtml   |   2 +
 .../checkout/onepage/progress/payment.phtml   |   2 +
 .../checkout/onepage/progress/shipping.phtml  |   2 +
 .../onepage/progress/shipping_method.phtml    |   2 +
 .../checkout/onepage/review/button.phtml      |   2 +
 .../checkout/onepage/review/info.phtml        |   2 +
 .../checkout/onepage/review/item.phtml        |   2 +
 .../checkout/onepage/shipping_method.phtml    |   2 +
 .../template/cms/content_heading.phtml        |   2 +
 .../base/default/template/contacts/form.phtml |   2 +
 .../template/customer/account/dashboard.phtml |   2 +
 .../customer/account/dashboard/address.phtml  |   2 +
 .../customer/account/dashboard/hello.phtml    |   2 +
 .../customer/account/dashboard/info.phtml     |   2 +
 .../template/customer/account/link/back.phtml |   2 +
 .../customer/account/navigation.phtml         |   2 +
 .../default/template/customer/form/edit.phtml |   2 +
 .../customer/form/forgotpassword.phtml        |   2 +
 .../template/newsletter/subscribe.phtml       |   2 +
 .../template/wishlist/button/share.phtml      |   2 +
 .../template/wishlist/button/tocart.phtml     |   2 +
 .../template/wishlist/button/update.phtml     |   2 +
 .../template/wishlist/render/item/price.phtml |   4 +-
 .../template/catalog/layer/filter.phtml       |   4 +-
 .../default/template/catalog/msrp/popup.phtml |   4 +-
 .../catalog/product/list/related.phtml        |   2 +
 .../catalog/product/list/upsell.phtml         |   2 +
 .../template/catalog/product/view/addto.phtml |   2 +
 .../catalog/product/view/addtocart.phtml      |   2 +
 .../catalog/product/view/sharing.phtml        |   2 +
 .../view/type/availability/default.phtml      |   3 +
 .../view/type/options/configurable.phtml      |   2 +
 .../product/widget/new/content/new_grid.phtml |   2 +
 .../template/catalogsearch/form.mini.phtml    |   2 +-
 .../template/catalogsearch/result.phtml       |   2 +
 .../template/checkout/cart/item/default.phtml |   2 +
 .../checkout/cart/minicart/default.phtml      |   2 +
 .../template/checkout/onepage/payment.phtml   |   2 +
 .../template/checkout/onepage/progress.phtml  |   2 +
 .../checkout/onepage/review/info.phtml        |   2 +
 .../checkout/onepage/review/item.phtml        |   2 +
 .../catalog/layer/filter/swatches.phtml       |   4 +-
 .../catalog/product/list/swatches.phtml       |   2 +
 .../view/type/configurable/swatch-js.phtml    |   2 +
 .../type/options/configurable/swatches.phtml  |   2 +
 .../rwd/default/template/contacts/form.phtml  |   2 +
 .../template/customer/account/dashboard.phtml |   2 +
 .../customer/account/dashboard/address.phtml  |   2 +
 .../customer/account/navigation.phtml         |   2 +
 .../default/template/customer/form/edit.phtml |   2 +
 .../customer/form/forgotpassword.phtml        |   2 +
 .../template/newsletter/subscribe.phtml       |   2 +
 .../template/wishlist/button/update.phtml     |   2 +
 89 files changed, 191 insertions(+), 542 deletions(-)

diff --git a/.phpstan.dist.baseline.neon b/.phpstan.dist.baseline.neon
index af9a8d63b4f..e803ccd73cf 100644
--- a/.phpstan.dist.baseline.neon
+++ b/.phpstan.dist.baseline.neon
@@ -6931,18 +6931,18 @@ parameters:
 			path: app/design/adminhtml/default/default/template/payment/info/purchaseorder.phtml
 
 		-
-			message: "#^Variable \\$this might not be defined\\.$#"
-			count: 3
+			message: "#^Call to an undefined method Mage_Core_Block_Abstract\\:\\:_getUsers\\(\\)\\.$#"
+			count: 1
 			path: app/design/adminhtml/default/default/template/permissions/role_users_grid_js.phtml
 
 		-
-			message: "#^Variable \\$this might not be defined\\.$#"
-			count: 2
+			message: "#^Call to protected method _getGridHtml\\(\\) of class Mage_Adminhtml_Block_Permissions_Tab_Rolesusers\\.$#"
+			count: 1
 			path: app/design/adminhtml/default/default/template/permissions/rolesusers.phtml
 
 		-
-			message: "#^Variable \\$this might not be defined\\.$#"
-			count: 2
+			message: "#^Call to an undefined method Mage_Core_Block_Abstract\\:\\:_getSelectedRoles\\(\\)\\.$#"
+			count: 1
 			path: app/design/adminhtml/default/default/template/permissions/user_roles_grid_js.phtml
 
 		-
@@ -7005,11 +7005,6 @@ parameters:
 			count: 76
 			path: app/design/adminhtml/default/default/template/report/grid.phtml
 
-		-
-			message: "#^Variable \\$this might not be defined\\.$#"
-			count: 4
-			path: app/design/adminhtml/default/default/template/report/refresh/statistics.phtml
-
 		-
 			message: "#^Variable \\$this might not be defined\\.$#"
 			count: 7
@@ -7090,16 +7085,6 @@ parameters:
 			count: 5
 			path: app/design/adminhtml/default/default/template/sales/order/shipment/packaging/grid.phtml
 
-		-
-			message: "#^Variable \\$this might not be defined\\.$#"
-			count: 14
-			path: app/design/adminhtml/default/default/template/sales/order/shipment/packaging/packed.phtml
-
-		-
-			message: "#^Variable \\$this might not be defined\\.$#"
-			count: 13
-			path: app/design/adminhtml/default/default/template/sales/order/shipment/packaging/popup.phtml
-
 		-
 			message: "#^Variable \\$this might not be defined\\.$#"
 			count: 19
@@ -7200,31 +7185,6 @@ parameters:
 			count: 26
 			path: app/design/adminhtml/default/default/template/system/convert/profile/process.phtml
 
-		-
-			message: "#^Variable \\$this might not be defined\\.$#"
-			count: 7
-			path: app/design/adminhtml/default/default/template/system/design/edit.phtml
-
-		-
-			message: "#^Variable \\$this might not be defined\\.$#"
-			count: 2
-			path: app/design/adminhtml/default/default/template/system/design/index.phtml
-
-		-
-			message: "#^Variable \\$this might not be defined\\.$#"
-			count: 30
-			path: app/design/adminhtml/default/default/template/system/email/template/edit.phtml
-
-		-
-			message: "#^Variable \\$this might not be defined\\.$#"
-			count: 3
-			path: app/design/adminhtml/default/default/template/system/email/template/list.phtml
-
-		-
-			message: "#^Variable \\$this might not be defined\\.$#"
-			count: 2
-			path: app/design/adminhtml/default/default/template/system/email/template/preview.phtml
-
 		-
 			message: "#^Variable \\$this might not be defined\\.$#"
 			count: 1
@@ -7250,36 +7210,11 @@ parameters:
 			count: 2
 			path: app/design/adminhtml/default/default/template/system/store/tree.phtml
 
-		-
-			message: "#^Variable \\$this might not be defined\\.$#"
-			count: 13
-			path: app/design/adminhtml/default/default/template/tag/edit/container.phtml
-
-		-
-			message: "#^Variable \\$this might not be defined\\.$#"
-			count: 4
-			path: app/design/adminhtml/default/default/template/tag/index.phtml
-
 		-
 			message: "#^Variable \\$this might not be defined\\.$#"
 			count: 7
 			path: app/design/adminhtml/default/default/template/tax/class/page/edit.phtml
 
-		-
-			message: "#^Variable \\$this might not be defined\\.$#"
-			count: 8
-			path: app/design/adminhtml/default/default/template/tax/importExport.phtml
-
-		-
-			message: "#^Variable \\$this might not be defined\\.$#"
-			count: 2
-			path: app/design/adminhtml/default/default/template/tax/rate/form.phtml
-
-		-
-			message: "#^Variable \\$this might not be defined\\.$#"
-			count: 7
-			path: app/design/adminhtml/default/default/template/tax/rate/title.phtml
-
 		-
 			message: "#^Variable \\$createUrl might not be defined\\.$#"
 			count: 1
@@ -7305,31 +7240,6 @@ parameters:
 			count: 3
 			path: app/design/adminhtml/default/default/template/tax/toolbar/class/save.phtml
 
-		-
-			message: "#^Variable \\$header might not be defined\\.$#"
-			count: 1
-			path: app/design/adminhtml/default/default/template/tax/toolbar/rate/add.phtml
-
-		-
-			message: "#^Variable \\$this might not be defined\\.$#"
-			count: 1
-			path: app/design/adminhtml/default/default/template/tax/toolbar/rate/add.phtml
-
-		-
-			message: "#^Variable \\$form might not be defined\\.$#"
-			count: 1
-			path: app/design/adminhtml/default/default/template/tax/toolbar/rate/save.phtml
-
-		-
-			message: "#^Variable \\$header might not be defined\\.$#"
-			count: 1
-			path: app/design/adminhtml/default/default/template/tax/toolbar/rate/save.phtml
-
-		-
-			message: "#^Variable \\$this might not be defined\\.$#"
-			count: 4
-			path: app/design/adminhtml/default/default/template/tax/toolbar/rate/save.phtml
-
 		-
 			message: "#^Variable \\$createUrl might not be defined\\.$#"
 			count: 1
@@ -7365,11 +7275,6 @@ parameters:
 			count: 4
 			path: app/design/adminhtml/default/default/template/widget/breadcrumbs.phtml
 
-		-
-			message: "#^Variable \\$this might not be defined\\.$#"
-			count: 2
-			path: app/design/adminhtml/default/default/template/widget/form.phtml
-
 		-
 			message: "#^Variable \\$element might not be defined\\.$#"
 			count: 62
@@ -7605,11 +7510,6 @@ parameters:
 			count: 1
 			path: app/design/frontend/base/default/template/catalog/layer/filter.phtml
 
-		-
-			message: "#^Variable \\$this might not be defined\\.$#"
-			count: 5
-			path: app/design/frontend/base/default/template/catalog/msrp/popup.phtml
-
 		-
 			message: "#^Parameter \\#2 \\$attribute of method Mage_Catalog_Block_Product_Compare_List\\:\\:getProductAttributeValue\\(\\) expects Mage_Catalog_Model_Resource_Eav_Attribute, Mage_Eav_Model_Entity_Attribute_Abstract given\\.$#"
 			count: 2
@@ -7620,11 +7520,6 @@ parameters:
 			count: 24
 			path: app/design/frontend/base/default/template/catalog/product/gallery.phtml
 
-		-
-			message: "#^Variable \\$this might not be defined\\.$#"
-			count: 17
-			path: app/design/frontend/base/default/template/catalog/product/list/related.phtml
-
 		-
 			message: "#^Argument of an invalid type string supplied for foreach, only iterables are supported\\.$#"
 			count: 1
@@ -7640,11 +7535,6 @@ parameters:
 			count: 1
 			path: app/design/frontend/base/default/template/catalog/product/list/toolbar.phtml
 
-		-
-			message: "#^Variable \\$this might not be defined\\.$#"
-			count: 13
-			path: app/design/frontend/base/default/template/catalog/product/list/upsell.phtml
-
 		-
 			message: "#^Variable \\$this might not be defined\\.$#"
 			count: 21
@@ -7670,16 +7560,6 @@ parameters:
 			count: 1
 			path: app/design/frontend/base/default/template/catalog/product/view/additional.phtml
 
-		-
-			message: "#^Variable \\$this might not be defined\\.$#"
-			count: 10
-			path: app/design/frontend/base/default/template/catalog/product/view/addto.phtml
-
-		-
-			message: "#^Variable \\$this might not be defined\\.$#"
-			count: 6
-			path: app/design/frontend/base/default/template/catalog/product/view/addtocart.phtml
-
 		-
 			message: "#^Access to an undefined property Mage_Catalog_Model_Product_Option\\:\\:\\$decoratedIsLast\\.$#"
 			count: 1
@@ -7765,86 +7645,6 @@ parameters:
 			count: 21
 			path: app/design/frontend/base/default/template/catalog/product/widget/new/content/new_list.phtml
 
-		-
-			message: "#^Call to method __\\(\\) on an unknown class Mage_Catalog_Block_Seo_Sitemap_\\.$#"
-			count: 1
-			path: app/design/frontend/base/default/template/catalog/seo/sitemap.phtml
-
-		-
-			message: "#^Call to method escapeHtml\\(\\) on an unknown class Mage_Catalog_Block_Seo_Sitemap_\\.$#"
-			count: 1
-			path: app/design/frontend/base/default/template/catalog/seo/sitemap.phtml
-
-		-
-			message: "#^Call to method getCollection\\(\\) on an unknown class Mage_Catalog_Block_Seo_Sitemap_\\.$#"
-			count: 1
-			path: app/design/frontend/base/default/template/catalog/seo/sitemap.phtml
-
-		-
-			message: "#^Call to method getItemUrl\\(\\) on an unknown class Mage_Catalog_Block_Seo_Sitemap_\\.$#"
-			count: 1
-			path: app/design/frontend/base/default/template/catalog/seo/sitemap.phtml
-
-		-
-			message: "#^Call to method getItemsTitle\\(\\) on an unknown class Mage_Catalog_Block_Seo_Sitemap_\\.$#"
-			count: 1
-			path: app/design/frontend/base/default/template/catalog/seo/sitemap.phtml
-
-		-
-			message: "#^PHPDoc tag @var for variable \\$this contains unknown class Mage_Catalog_Block_Seo_Sitemap_\\.$#"
-			count: 1
-			path: app/design/frontend/base/default/template/catalog/seo/sitemap.phtml
-
-		-
-			message: "#^Variable \\$this might not be defined\\.$#"
-			count: 6
-			path: app/design/frontend/base/default/template/catalog/seo/sitemap/container.phtml
-
-		-
-			message: "#^Call to method __\\(\\) on an unknown class Mage_Catalog_Block_Seo_Sitemap_\\.$#"
-			count: 1
-			path: app/design/frontend/base/default/template/catalog/seo/tree.phtml
-
-		-
-			message: "#^Call to method getCollection\\(\\) on an unknown class Mage_Catalog_Block_Seo_Sitemap_\\.$#"
-			count: 1
-			path: app/design/frontend/base/default/template/catalog/seo/tree.phtml
-
-		-
-			message: "#^Call to method getItemUrl\\(\\) on an unknown class Mage_Catalog_Block_Seo_Sitemap_\\.$#"
-			count: 1
-			path: app/design/frontend/base/default/template/catalog/seo/tree.phtml
-
-		-
-			message: "#^Call to method getItemsTitle\\(\\) on an unknown class Mage_Catalog_Block_Seo_Sitemap_\\.$#"
-			count: 1
-			path: app/design/frontend/base/default/template/catalog/seo/tree.phtml
-
-		-
-			message: "#^Call to method getLevel\\(\\) on an unknown class Mage_Catalog_Block_Seo_Sitemap_\\.$#"
-			count: 3
-			path: app/design/frontend/base/default/template/catalog/seo/tree.phtml
-
-		-
-			message: "#^PHPDoc tag @var for variable \\$this contains unknown class Mage_Catalog_Block_Seo_Sitemap_\\.$#"
-			count: 1
-			path: app/design/frontend/base/default/template/catalog/seo/tree.phtml
-
-		-
-			message: "#^Variable \\$this might not be defined\\.$#"
-			count: 19
-			path: app/design/frontend/base/default/template/catalogsearch/advanced/result.phtml
-
-		-
-			message: "#^Variable \\$this might not be defined\\.$#"
-			count: 21
-			path: app/design/frontend/base/default/template/catalogsearch/result.phtml
-
-		-
-			message: "#^Variable \\$this might not be defined\\.$#"
-			count: 6
-			path: app/design/frontend/base/default/template/catalogsearch/term.phtml
-
 		-
 			message: "#^Variable \\$this might not be defined\\.$#"
 			count: 8
@@ -7950,11 +7750,6 @@ parameters:
 			count: 12
 			path: app/design/frontend/base/default/template/checkout/multishipping/overview/item.phtml
 
-		-
-			message: "#^Parameter \\#1 \\$product of method Mage_Weee_Helper_Data\\:\\:typeOfDisplay\\(\\) expects Mage_Catalog_Model_Product, Mage_Sales_Model_Quote_Item given\\.$#"
-			count: 24
-			path: app/design/frontend/base/default/template/checkout/multishipping/overview/item.phtml
-
 		-
 			message: "#^Method Mage_Checkout_Block_Multishipping_Shipping\\:\\:getItemsEditUrl\\(\\) invoked with 1 parameter, 0 required\\.$#"
 			count: 1
@@ -7975,11 +7770,6 @@ parameters:
 			count: 7
 			path: app/design/frontend/base/default/template/checkout/onepage/failure.phtml
 
-		-
-			message: "#^Variable \\$this might not be defined\\.$#"
-			count: 6
-			path: app/design/frontend/base/default/template/checkout/onepage/link.phtml
-
 		-
 			message: "#^If condition is always true\\.$#"
 			count: 1
@@ -7995,31 +7785,11 @@ parameters:
 			count: 40
 			path: app/design/frontend/base/default/template/checkout/onepage/login.phtml
 
-		-
-			message: "#^Variable \\$this might not be defined\\.$#"
-			count: 17
-			path: app/design/frontend/base/default/template/checkout/onepage/payment.phtml
-
-		-
-			message: "#^Variable \\$this might not be defined\\.$#"
-			count: 9
-			path: app/design/frontend/base/default/template/checkout/onepage/progress.phtml
-
-		-
-			message: "#^Variable \\$this might not be defined\\.$#"
-			count: 5
-			path: app/design/frontend/base/default/template/checkout/onepage/progress/billing.phtml
-
 		-
 			message: "#^File ends with a trailing whitespace\\. This may cause problems when running the code in the web browser\\. Remove the closing \\?\\> mark or remove the whitespace\\.$#"
 			count: 1
 			path: app/design/frontend/base/default/template/checkout/onepage/progress/payment.phtml
 
-		-
-			message: "#^Variable \\$this might not be defined\\.$#"
-			count: 5
-			path: app/design/frontend/base/default/template/checkout/onepage/progress/payment.phtml
-
 		-
 			message: "#^File ends with a trailing whitespace\\. This may cause problems when running the code in the web browser\\. Remove the closing \\?\\> mark or remove the whitespace\\.$#"
 			count: 1
@@ -8035,46 +7805,16 @@ parameters:
 			count: 1
 			path: app/design/frontend/base/default/template/checkout/onepage/progress/shipping.phtml
 
-		-
-			message: "#^Variable \\$this might not be defined\\.$#"
-			count: 7
-			path: app/design/frontend/base/default/template/checkout/onepage/progress/shipping.phtml
-
 		-
 			message: "#^File ends with a trailing whitespace\\. This may cause problems when running the code in the web browser\\. Remove the closing \\?\\> mark or remove the whitespace\\.$#"
 			count: 1
 			path: app/design/frontend/base/default/template/checkout/onepage/progress/shipping_method.phtml
 
-		-
-			message: "#^Variable \\$this might not be defined\\.$#"
-			count: 12
-			path: app/design/frontend/base/default/template/checkout/onepage/progress/shipping_method.phtml
-
-		-
-			message: "#^Variable \\$this might not be defined\\.$#"
-			count: 2
-			path: app/design/frontend/base/default/template/checkout/onepage/review/button.phtml
-
-		-
-			message: "#^Variable \\$this might not be defined\\.$#"
-			count: 27
-			path: app/design/frontend/base/default/template/checkout/onepage/review/info.phtml
-
 		-
 			message: "#^Method Mage_Checkout_Helper_Data\\:\\:formatPrice\\(\\) invoked with 3 parameters, 1 required\\.$#"
 			count: 12
 			path: app/design/frontend/base/default/template/checkout/onepage/review/item.phtml
 
-		-
-			message: "#^Variable \\$this might not be defined\\.$#"
-			count: 30
-			path: app/design/frontend/base/default/template/checkout/onepage/review/item.phtml
-
-		-
-			message: "#^Variable \\$this might not be defined\\.$#"
-			count: 9
-			path: app/design/frontend/base/default/template/checkout/onepage/shipping_method.phtml
-
 		-
 			message: "#^Variable \\$this might not be defined\\.$#"
 			count: 15
@@ -8095,11 +7835,6 @@ parameters:
 			count: 1
 			path: app/design/frontend/base/default/template/cms/content.phtml
 
-		-
-			message: "#^Variable \\$this might not be defined\\.$#"
-			count: 1
-			path: app/design/frontend/base/default/template/cms/content_heading.phtml
-
 		-
 			message: "#^Variable \\$pageData might not be defined\\.$#"
 			count: 4
@@ -8120,11 +7855,6 @@ parameters:
 			count: 1
 			path: app/design/frontend/base/default/template/cms/widget/static_block/default.phtml
 
-		-
-			message: "#^Variable \\$this might not be defined\\.$#"
-			count: 6
-			path: app/design/frontend/base/default/template/contacts/form.phtml
-
 		-
 			message: "#^Variable \\$this might not be defined\\.$#"
 			count: 3
@@ -8145,41 +7875,11 @@ parameters:
 			count: 1
 			path: app/design/frontend/base/default/template/core/messages.phtml
 
-		-
-			message: "#^Variable \\$this might not be defined\\.$#"
-			count: 10
-			path: app/design/frontend/base/default/template/customer/account/dashboard.phtml
-
-		-
-			message: "#^Variable \\$this might not be defined\\.$#"
-			count: 11
-			path: app/design/frontend/base/default/template/customer/account/dashboard/address.phtml
-
-		-
-			message: "#^Variable \\$this might not be defined\\.$#"
-			count: 4
-			path: app/design/frontend/base/default/template/customer/account/dashboard/hello.phtml
-
-		-
-			message: "#^Variable \\$this might not be defined\\.$#"
-			count: 17
-			path: app/design/frontend/base/default/template/customer/account/dashboard/info.phtml
-
 		-
 			message: "#^Variable \\$this might not be defined\\.$#"
 			count: 4
 			path: app/design/frontend/base/default/template/customer/account/dashboard/newsletter.phtml
 
-		-
-			message: "#^Variable \\$this might not be defined\\.$#"
-			count: 3
-			path: app/design/frontend/base/default/template/customer/account/link/back.phtml
-
-		-
-			message: "#^Variable \\$this might not be defined\\.$#"
-			count: 3
-			path: app/design/frontend/base/default/template/customer/account/navigation.phtml
-
 		-
 			message: "#^Variable \\$this might not be defined\\.$#"
 			count: 16
@@ -8241,15 +7941,10 @@ parameters:
 			path: app/design/frontend/base/default/template/customer/form/confirmation.phtml
 
 		-
-			message: "#^Variable \\$this might not be defined\\.$#"
-			count: 36
+			message: "#^Cannot call method isEnabled\\(\\) on Mage_Core_Block_Abstract\\|false\\.$#"
+			count: 3
 			path: app/design/frontend/base/default/template/customer/form/edit.phtml
 
-		-
-			message: "#^Variable \\$this might not be defined\\.$#"
-			count: 14
-			path: app/design/frontend/base/default/template/customer/form/forgotpassword.phtml
-
 		-
 			message: "#^Variable \\$this might not be defined\\.$#"
 			count: 16
@@ -8405,11 +8100,6 @@ parameters:
 			count: 1
 			path: app/design/frontend/base/default/template/googleanalytics/ga.phtml
 
-		-
-			message: "#^Variable \\$this might not be defined\\.$#"
-			count: 7
-			path: app/design/frontend/base/default/template/newsletter/subscribe.phtml
-
 		-
 			message: "#^Variable \\$crumbs might not be defined\\.$#"
 			count: 1
@@ -8780,21 +8470,6 @@ parameters:
 			count: 22
 			path: app/design/frontend/base/default/template/tax/order/tax.phtml
 
-		-
-			message: "#^Variable \\$this might not be defined\\.$#"
-			count: 3
-			path: app/design/frontend/base/default/template/wishlist/button/share.phtml
-
-		-
-			message: "#^Variable \\$this might not be defined\\.$#"
-			count: 4
-			path: app/design/frontend/base/default/template/wishlist/button/tocart.phtml
-
-		-
-			message: "#^Variable \\$this might not be defined\\.$#"
-			count: 3
-			path: app/design/frontend/base/default/template/wishlist/button/update.phtml
-
 		-
 			message: "#^Variable \\$this might not be defined\\.$#"
 			count: 6
@@ -8815,21 +8490,6 @@ parameters:
 			count: 4
 			path: app/design/frontend/base/default/template/wishlist/item/list.phtml
 
-		-
-			message: "#^Call to method getCleanProductPriceHtml\\(\\) on an unknown class Mage_Wishlist_Block_Customer_Wishlist_Render_Item_Price\\.$#"
-			count: 1
-			path: app/design/frontend/base/default/template/wishlist/render/item/price.phtml
-
-		-
-			message: "#^Call to method getProduct\\(\\) on an unknown class Mage_Wishlist_Block_Customer_Wishlist_Render_Item_Price\\.$#"
-			count: 1
-			path: app/design/frontend/base/default/template/wishlist/render/item/price.phtml
-
-		-
-			message: "#^PHPDoc tag @var for variable \\$this contains unknown class Mage_Wishlist_Block_Customer_Wishlist_Render_Item_Price\\.$#"
-			count: 1
-			path: app/design/frontend/base/default/template/wishlist/render/item/price.phtml
-
 		-
 			message: "#^Variable \\$this might not be defined\\.$#"
 			count: 19
@@ -8860,26 +8520,6 @@ parameters:
 			count: 1
 			path: app/design/frontend/rwd/default/template/bundle/catalog/product/view/type/bundle/option/select.phtml
 
-		-
-			message: "#^Call to method escapeUrl\\(\\) on an unknown class Mage_Catalog_Block_Layer_Filter\\.$#"
-			count: 1
-			path: app/design/frontend/rwd/default/template/catalog/layer/filter.phtml
-
-		-
-			message: "#^Call to method getItems\\(\\) on an unknown class Mage_Catalog_Block_Layer_Filter\\.$#"
-			count: 1
-			path: app/design/frontend/rwd/default/template/catalog/layer/filter.phtml
-
-		-
-			message: "#^Call to method shouldDisplayProductCount\\(\\) on an unknown class Mage_Catalog_Block_Layer_Filter\\.$#"
-			count: 2
-			path: app/design/frontend/rwd/default/template/catalog/layer/filter.phtml
-
-		-
-			message: "#^PHPDoc tag @var for variable \\$this contains unknown class Mage_Catalog_Block_Layer_Filter\\.$#"
-			count: 1
-			path: app/design/frontend/rwd/default/template/catalog/layer/filter.phtml
-
 		-
 			message: "#^Cannot call method setFilter\\(\\) on class\\-string\\|object\\.$#"
 			count: 1
@@ -8890,21 +8530,11 @@ parameters:
 			count: 1
 			path: app/design/frontend/rwd/default/template/catalog/layer/state.phtml
 
-		-
-			message: "#^Variable \\$this might not be defined\\.$#"
-			count: 5
-			path: app/design/frontend/rwd/default/template/catalog/msrp/popup.phtml
-
 		-
 			message: "#^Parameter \\#2 \\$attribute of method Mage_Catalog_Block_Product_Compare_List\\:\\:getProductAttributeValue\\(\\) expects Mage_Catalog_Model_Resource_Eav_Attribute, Mage_Eav_Model_Entity_Attribute_Abstract given\\.$#"
 			count: 2
 			path: app/design/frontend/rwd/default/template/catalog/product/compare/list.phtml
 
-		-
-			message: "#^Variable \\$this might not be defined\\.$#"
-			count: 17
-			path: app/design/frontend/rwd/default/template/catalog/product/list/related.phtml
-
 		-
 			message: "#^Argument of an invalid type string supplied for foreach, only iterables are supported\\.$#"
 			count: 1
@@ -8920,11 +8550,6 @@ parameters:
 			count: 1
 			path: app/design/frontend/rwd/default/template/catalog/product/list/toolbar.phtml
 
-		-
-			message: "#^Variable \\$this might not be defined\\.$#"
-			count: 12
-			path: app/design/frontend/rwd/default/template/catalog/product/list/upsell.phtml
-
 		-
 			message: "#^Left side of && is always true\\.$#"
 			count: 1
@@ -8940,26 +8565,6 @@ parameters:
 			count: 1
 			path: app/design/frontend/rwd/default/template/catalog/product/view.phtml
 
-		-
-			message: "#^Variable \\$this might not be defined\\.$#"
-			count: 8
-			path: app/design/frontend/rwd/default/template/catalog/product/view/addto.phtml
-
-		-
-			message: "#^Variable \\$this might not be defined\\.$#"
-			count: 6
-			path: app/design/frontend/rwd/default/template/catalog/product/view/addtocart.phtml
-
-		-
-			message: "#^Variable \\$this might not be defined\\.$#"
-			count: 12
-			path: app/design/frontend/rwd/default/template/catalog/product/view/sharing.phtml
-
-		-
-			message: "#^Variable \\$this might not be defined\\.$#"
-			count: 6
-			path: app/design/frontend/rwd/default/template/catalog/product/view/type/availability/default.phtml
-
 		-
 			message: "#^Variable \\$this might not be defined\\.$#"
 			count: 7
@@ -8980,11 +8585,6 @@ parameters:
 			count: 1
 			path: app/design/frontend/rwd/default/template/catalog/product/view/type/options/configurable.phtml
 
-		-
-			message: "#^Variable \\$this might not be defined\\.$#"
-			count: 7
-			path: app/design/frontend/rwd/default/template/catalog/product/view/type/options/configurable.phtml
-
 		-
 			message: "#^Variable \\$this might not be defined\\.$#"
 			count: 9
@@ -9000,21 +8600,11 @@ parameters:
 			count: 6
 			path: app/design/frontend/rwd/default/template/catalog/product/widget/new/column/new_names_list.phtml
 
-		-
-			message: "#^Variable \\$this might not be defined\\.$#"
-			count: 22
-			path: app/design/frontend/rwd/default/template/catalog/product/widget/new/content/new_grid.phtml
-
 		-
 			message: "#^Variable \\$this might not be defined\\.$#"
 			count: 8
 			path: app/design/frontend/rwd/default/template/catalog/product/widget/new/content/new_list.phtml
 
-		-
-			message: "#^Variable \\$this might not be defined\\.$#"
-			count: 22
-			path: app/design/frontend/rwd/default/template/catalogsearch/result.phtml
-
 		-
 			message: "#^Variable \\$this might not be defined\\.$#"
 			count: 4
@@ -9035,11 +8625,6 @@ parameters:
 			count: 1
 			path: app/design/frontend/rwd/default/template/checkout/cart/item/default.phtml
 
-		-
-			message: "#^Variable \\$this might not be defined\\.$#"
-			count: 81
-			path: app/design/frontend/rwd/default/template/checkout/cart/item/default.phtml
-
 		-
 			message: "#^Method Mage_Checkout_Helper_Data\\:\\:formatPrice\\(\\) invoked with 3 parameters, 1 required\\.$#"
 			count: 6
@@ -9050,11 +8635,6 @@ parameters:
 			count: 1
 			path: app/design/frontend/rwd/default/template/checkout/cart/minicart/default.phtml
 
-		-
-			message: "#^Variable \\$this might not be defined\\.$#"
-			count: 50
-			path: app/design/frontend/rwd/default/template/checkout/cart/minicart/default.phtml
-
 		-
 			message: "#^Call to an undefined method Mage_Checkout_Block_Cart_Minicart\\:\\:isPossibleOnepageCheckout\\(\\)\\.$#"
 			count: 1
@@ -9100,96 +8680,16 @@ parameters:
 			count: 12
 			path: app/design/frontend/rwd/default/template/checkout/multishipping/overview/item.phtml
 
-		-
-			message: "#^Parameter \\#1 \\$product of method Mage_Weee_Helper_Data\\:\\:typeOfDisplay\\(\\) expects Mage_Catalog_Model_Product, Mage_Sales_Model_Quote_Item given\\.$#"
-			count: 24
-			path: app/design/frontend/rwd/default/template/checkout/multishipping/overview/item.phtml
-
-		-
-			message: "#^Variable \\$this might not be defined\\.$#"
-			count: 18
-			path: app/design/frontend/rwd/default/template/checkout/onepage/payment.phtml
-
-		-
-			message: "#^Variable \\$this might not be defined\\.$#"
-			count: 10
-			path: app/design/frontend/rwd/default/template/checkout/onepage/progress.phtml
-
-		-
-			message: "#^Variable \\$this might not be defined\\.$#"
-			count: 29
-			path: app/design/frontend/rwd/default/template/checkout/onepage/review/info.phtml
-
 		-
 			message: "#^Method Mage_Checkout_Helper_Data\\:\\:formatPrice\\(\\) invoked with 3 parameters, 1 required\\.$#"
 			count: 12
 			path: app/design/frontend/rwd/default/template/checkout/onepage/review/item.phtml
 
-		-
-			message: "#^Variable \\$this might not be defined\\.$#"
-			count: 43
-			path: app/design/frontend/rwd/default/template/checkout/onepage/review/item.phtml
-
-		-
-			message: "#^Call to method escapeUrl\\(\\) on an unknown class Mage_Catalog_Block_Layer_Filter\\.$#"
-			count: 1
-			path: app/design/frontend/rwd/default/template/configurableswatches/catalog/layer/filter/swatches.phtml
-
-		-
-			message: "#^Call to method getItems\\(\\) on an unknown class Mage_Catalog_Block_Layer_Filter\\.$#"
-			count: 1
-			path: app/design/frontend/rwd/default/template/configurableswatches/catalog/layer/filter/swatches.phtml
-
-		-
-			message: "#^Call to method shouldDisplayProductCount\\(\\) on an unknown class Mage_Catalog_Block_Layer_Filter\\.$#"
-			count: 1
-			path: app/design/frontend/rwd/default/template/configurableswatches/catalog/layer/filter/swatches.phtml
-
-		-
-			message: "#^PHPDoc tag @var for variable \\$this contains unknown class Mage_Catalog_Block_Layer_Filter\\.$#"
-			count: 1
-			path: app/design/frontend/rwd/default/template/configurableswatches/catalog/layer/filter/swatches.phtml
-
 		-
 			message: "#^Variable \\$this might not be defined\\.$#"
 			count: 14
 			path: app/design/frontend/rwd/default/template/configurableswatches/catalog/layer/state/swatch.phtml
 
-		-
-			message: "#^Variable \\$this might not be defined\\.$#"
-			count: 1
-			path: app/design/frontend/rwd/default/template/configurableswatches/catalog/product/list/swatches.phtml
-
-		-
-			message: "#^Variable \\$this might not be defined\\.$#"
-			count: 1
-			path: app/design/frontend/rwd/default/template/configurableswatches/catalog/product/view/type/configurable/swatch-js.phtml
-
-		-
-			message: "#^Variable \\$this might not be defined\\.$#"
-			count: 8
-			path: app/design/frontend/rwd/default/template/configurableswatches/catalog/product/view/type/options/configurable/swatches.phtml
-
-		-
-			message: "#^Variable \\$this might not be defined\\.$#"
-			count: 6
-			path: app/design/frontend/rwd/default/template/contacts/form.phtml
-
-		-
-			message: "#^Variable \\$this might not be defined\\.$#"
-			count: 10
-			path: app/design/frontend/rwd/default/template/customer/account/dashboard.phtml
-
-		-
-			message: "#^Variable \\$this might not be defined\\.$#"
-			count: 11
-			path: app/design/frontend/rwd/default/template/customer/account/dashboard/address.phtml
-
-		-
-			message: "#^Variable \\$this might not be defined\\.$#"
-			count: 3
-			path: app/design/frontend/rwd/default/template/customer/account/navigation.phtml
-
 		-
 			message: "#^Variable \\$action might not be defined\\.$#"
 			count: 1
@@ -9236,15 +8736,10 @@ parameters:
 			path: app/design/frontend/rwd/default/template/customer/form/confirmation.phtml
 
 		-
-			message: "#^Variable \\$this might not be defined\\.$#"
-			count: 36
+			message: "#^Cannot call method isEnabled\\(\\) on Mage_Core_Block_Abstract\\|false\\.$#"
+			count: 3
 			path: app/design/frontend/rwd/default/template/customer/form/edit.phtml
 
-		-
-			message: "#^Variable \\$this might not be defined\\.$#"
-			count: 14
-			path: app/design/frontend/rwd/default/template/customer/form/forgotpassword.phtml
-
 		-
 			message: "#^Variable \\$this might not be defined\\.$#"
 			count: 10
@@ -9330,11 +8825,6 @@ parameters:
 			count: 1
 			path: app/design/frontend/rwd/default/template/email/order/totals/wrapper.phtml
 
-		-
-			message: "#^Variable \\$this might not be defined\\.$#"
-			count: 7
-			path: app/design/frontend/rwd/default/template/newsletter/subscribe.phtml
-
 		-
 			message: "#^Call to protected method _getRenderedMenuItemAttributes\\(\\) of class Mage_Page_Block_Html_Topmenu\\.$#"
 			count: 1
@@ -9455,11 +8945,6 @@ parameters:
 			count: 22
 			path: app/design/frontend/rwd/default/template/sales/order/shipment/items.phtml
 
-		-
-			message: "#^Variable \\$this might not be defined\\.$#"
-			count: 3
-			path: app/design/frontend/rwd/default/template/wishlist/button/update.phtml
-
 		-
 			message: "#^Variable \\$steps might not be defined\\.$#"
 			count: 1
diff --git a/app/code/core/Mage/Weee/Helper/Data.php b/app/code/core/Mage/Weee/Helper/Data.php
index cfb178e96b3..04ccc52071c 100644
--- a/app/code/core/Mage/Weee/Helper/Data.php
+++ b/app/code/core/Mage/Weee/Helper/Data.php
@@ -170,7 +170,7 @@ public function getAmount($product, $shipping = null, $billing = null, $website
     /**
      * Returns display type for price accordingly to current zone
      *
-     * @param Mage_Catalog_Model_Product $product
+     * @param mixed                      $product
      * @param array|int|null             $compareTo
      * @param string                     $zone
      * @param Mage_Core_Model_Store      $store
diff --git a/app/design/adminhtml/default/default/template/permissions/role_users_grid_js.phtml b/app/design/adminhtml/default/default/template/permissions/role_users_grid_js.phtml
index 12224fefc72..309f92856d8 100644
--- a/app/design/adminhtml/default/default/template/permissions/role_users_grid_js.phtml
+++ b/app/design/adminhtml/default/default/template/permissions/role_users_grid_js.phtml
@@ -12,6 +12,8 @@
  * @copyright   Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org)
  * @license     https://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
+
+/** @var Mage_Adminhtml_Block_Template $this */
 ?>
 <script type="text/javascript">
 <!--
diff --git a/app/design/adminhtml/default/default/template/permissions/rolesusers.phtml b/app/design/adminhtml/default/default/template/permissions/rolesusers.phtml
index 85b38c773ca..ab32836b51c 100644
--- a/app/design/adminhtml/default/default/template/permissions/rolesusers.phtml
+++ b/app/design/adminhtml/default/default/template/permissions/rolesusers.phtml
@@ -12,6 +12,8 @@
  * @copyright   Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org)
  * @license     https://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
+
+/** @var Mage_Adminhtml_Block_Permissions_Tab_Rolesusers $this */
 ?>
 <h4 class="icon-head head-edit-form fieldset-legend"><?php echo $this->__('Role Users') ?></h4>
 <?php echo $this->_getGridHtml() ?>
diff --git a/app/design/adminhtml/default/default/template/permissions/user_roles_grid_js.phtml b/app/design/adminhtml/default/default/template/permissions/user_roles_grid_js.phtml
index 3c30f9f6687..1b6427e0931 100644
--- a/app/design/adminhtml/default/default/template/permissions/user_roles_grid_js.phtml
+++ b/app/design/adminhtml/default/default/template/permissions/user_roles_grid_js.phtml
@@ -12,6 +12,8 @@
  * @copyright   Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org)
  * @license     https://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
+
+/** @var Mage_Adminhtml_Block_Template $this */
 ?>
 <script type="text/javascript">
 <!--
diff --git a/app/design/adminhtml/default/default/template/report/refresh/statistics.phtml b/app/design/adminhtml/default/default/template/report/refresh/statistics.phtml
index e4a4f2749c6..d69d3369b27 100644
--- a/app/design/adminhtml/default/default/template/report/refresh/statistics.phtml
+++ b/app/design/adminhtml/default/default/template/report/refresh/statistics.phtml
@@ -12,6 +12,8 @@
  * @copyright   Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org)
  * @license     https://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
+
+/** @var Mage_Adminhtml_Block_Report_Refresh_Statistics $this */
 ?>
 <div class="content-header">
     <table cellspacing="0">
diff --git a/app/design/adminhtml/default/default/template/sales/order/shipment/packaging/packed.phtml b/app/design/adminhtml/default/default/template/sales/order/shipment/packaging/packed.phtml
index 3e82eaeac91..48c385eeaae 100644
--- a/app/design/adminhtml/default/default/template/sales/order/shipment/packaging/packed.phtml
+++ b/app/design/adminhtml/default/default/template/sales/order/shipment/packaging/packed.phtml
@@ -12,6 +12,8 @@
  * @copyright   Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org)
  * @license     https://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
+
+/** @var Mage_Adminhtml_Block_Sales_Order_Shipment_Packaging $this */
 ?>
 
 <div id="packed_window" style="display:none;" class="packed-window">
diff --git a/app/design/adminhtml/default/default/template/sales/order/shipment/packaging/popup.phtml b/app/design/adminhtml/default/default/template/sales/order/shipment/packaging/popup.phtml
index 4f10c337e74..37a74d1e876 100644
--- a/app/design/adminhtml/default/default/template/sales/order/shipment/packaging/popup.phtml
+++ b/app/design/adminhtml/default/default/template/sales/order/shipment/packaging/popup.phtml
@@ -12,6 +12,8 @@
  * @copyright   Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org)
  * @license     https://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
+
+/** @var Mage_Adminhtml_Block_Sales_Order_Shipment_Packaging $this */
  ?>
 <?php
 $shippingMethod = $this->getShipment()->getOrder()->getShippingMethod();
diff --git a/app/design/adminhtml/default/default/template/system/design/edit.phtml b/app/design/adminhtml/default/default/template/system/design/edit.phtml
index 6166bb6253e..5599033ef2c 100644
--- a/app/design/adminhtml/default/default/template/system/design/edit.phtml
+++ b/app/design/adminhtml/default/default/template/system/design/edit.phtml
@@ -12,6 +12,8 @@
  * @copyright   Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org)
  * @license     https://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
+
+/** @var Mage_Adminhtml_Block_System_Design_Edit $this */
 ?>
 <div class="content-header">
     <table cellspacing="0">
diff --git a/app/design/adminhtml/default/default/template/system/design/index.phtml b/app/design/adminhtml/default/default/template/system/design/index.phtml
index 86eda517a37..2d52e4cefd3 100644
--- a/app/design/adminhtml/default/default/template/system/design/index.phtml
+++ b/app/design/adminhtml/default/default/template/system/design/index.phtml
@@ -12,6 +12,8 @@
  * @copyright   Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org)
  * @license     https://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
+
+/** @var Mage_Adminhtml_Block_System_Design $this */
 ?>
 <div class="content-header">
 <table cellspacing="0">
diff --git a/app/design/adminhtml/default/default/template/system/email/template/edit.phtml b/app/design/adminhtml/default/default/template/system/email/template/edit.phtml
index 08336502137..bfb9630fe66 100644
--- a/app/design/adminhtml/default/default/template/system/email/template/edit.phtml
+++ b/app/design/adminhtml/default/default/template/system/email/template/edit.phtml
@@ -12,6 +12,8 @@
  * @copyright   Copyright (c) 2021-2023 The OpenMage Contributors (https://www.openmage.org)
  * @license     https://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
+
+/** @var Mage_Adminhtml_Block_System_Email_Template_Edit $this */
 ?>
 <div class="content-header">
     <h3 class="icon-head head-system-email-template"><?php echo $this->getHeaderText() ?></h3>
diff --git a/app/design/adminhtml/default/default/template/system/email/template/list.phtml b/app/design/adminhtml/default/default/template/system/email/template/list.phtml
index fea783d2a74..f920fbf8ece 100644
--- a/app/design/adminhtml/default/default/template/system/email/template/list.phtml
+++ b/app/design/adminhtml/default/default/template/system/email/template/list.phtml
@@ -12,6 +12,8 @@
  * @copyright   Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org)
  * @license     https://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
+
+/** @var Mage_Adminhtml_Block_System_Email_Template $this */
 ?>
 <div class="content-header">
     <table cellspacing="0">
diff --git a/app/design/adminhtml/default/default/template/system/email/template/preview.phtml b/app/design/adminhtml/default/default/template/system/email/template/preview.phtml
index 22dcba6fc22..50a35af3008 100644
--- a/app/design/adminhtml/default/default/template/system/email/template/preview.phtml
+++ b/app/design/adminhtml/default/default/template/system/email/template/preview.phtml
@@ -12,6 +12,8 @@
  * @copyright   Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org)
  * @license     https://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
+
+/** @var Mage_Core_Block_Template $this */
 ?>
 <?php echo $this->getChildHtml('content') ?>
 <?php echo $this->getChildHtml('profiler') ?>
diff --git a/app/design/adminhtml/default/default/template/tag/edit/container.phtml b/app/design/adminhtml/default/default/template/tag/edit/container.phtml
index bbc9a5951cd..886aa5a5700 100644
--- a/app/design/adminhtml/default/default/template/tag/edit/container.phtml
+++ b/app/design/adminhtml/default/default/template/tag/edit/container.phtml
@@ -12,6 +12,8 @@
  * @copyright   Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org)
  * @license     https://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
+
+/** @var Mage_Adminhtml_Block_Tag_Edit $this */
 ?>
 <?php echo $this->getFormInitScripts() ?>
 <div class="content-header">
diff --git a/app/design/adminhtml/default/default/template/tag/index.phtml b/app/design/adminhtml/default/default/template/tag/index.phtml
index 532e0d4ef46..7c264e49f98 100644
--- a/app/design/adminhtml/default/default/template/tag/index.phtml
+++ b/app/design/adminhtml/default/default/template/tag/index.phtml
@@ -12,6 +12,8 @@
  * @copyright   Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org)
  * @license     https://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
+
+/** @var Mage_Adminhtml_Block_Tag_Pending $this */
 ?>
 <div class="content-header">
 <table cellspacing="0">
diff --git a/app/design/adminhtml/default/default/template/tax/importExport.phtml b/app/design/adminhtml/default/default/template/tax/importExport.phtml
index cb9df8759aa..8055e7ed9bc 100644
--- a/app/design/adminhtml/default/default/template/tax/importExport.phtml
+++ b/app/design/adminhtml/default/default/template/tax/importExport.phtml
@@ -12,6 +12,8 @@
  * @copyright   Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org)
  * @license     https://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
+
+/** @var Mage_Adminhtml_Block_Tax_Rate_ImportExport $this */
 ?>
 <div class="content-header">
     <table cellspacing="0">
diff --git a/app/design/adminhtml/default/default/template/tax/rate/form.phtml b/app/design/adminhtml/default/default/template/tax/rate/form.phtml
index 2497ba505e3..82e639d7874 100644
--- a/app/design/adminhtml/default/default/template/tax/rate/form.phtml
+++ b/app/design/adminhtml/default/default/template/tax/rate/form.phtml
@@ -12,6 +12,8 @@
  * @copyright   Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org)
  * @license     https://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
+
+/** @var Mage_Adminhtml_Block_Tax_Rate_Form $this */
 ?>
 <div class="entry-edit">
     <?php echo $this->getFormHtml() ?>
diff --git a/app/design/adminhtml/default/default/template/tax/rate/title.phtml b/app/design/adminhtml/default/default/template/tax/rate/title.phtml
index 0e9ecd78482..4e636ac8b58 100644
--- a/app/design/adminhtml/default/default/template/tax/rate/title.phtml
+++ b/app/design/adminhtml/default/default/template/tax/rate/title.phtml
@@ -12,6 +12,8 @@
  * @copyright   Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org)
  * @license     https://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
+
+/** @var Mage_Adminhtml_Block_Tax_Rate_Title $this */
 ?>
 <?php /* <table class="dynamic-grid" cellspacing="0" id="tax-rate-titles-table"> */ ?>
     <tr class="dynamic-grid">
diff --git a/app/design/adminhtml/default/default/template/tax/toolbar/rate/add.phtml b/app/design/adminhtml/default/default/template/tax/toolbar/rate/add.phtml
index f7e09ade69f..1d7364cdbdd 100644
--- a/app/design/adminhtml/default/default/template/tax/toolbar/rate/add.phtml
+++ b/app/design/adminhtml/default/default/template/tax/toolbar/rate/add.phtml
@@ -12,6 +12,11 @@
  * @copyright   Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org)
  * @license     https://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
+
+/**
+ * @var Mage_Adminhtml_Block_Tax_Rate_Toolbar_Add $this
+ * @var string $header
+ */
 ?>
 <div class="content-header">
     <table cellspacing="0">
diff --git a/app/design/adminhtml/default/default/template/tax/toolbar/rate/save.phtml b/app/design/adminhtml/default/default/template/tax/toolbar/rate/save.phtml
index 3c25be0a728..2c82453919d 100644
--- a/app/design/adminhtml/default/default/template/tax/toolbar/rate/save.phtml
+++ b/app/design/adminhtml/default/default/template/tax/toolbar/rate/save.phtml
@@ -12,6 +12,12 @@
  * @copyright   Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org)
  * @license     https://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
+
+/**
+ * @var Mage_Adminhtml_Block_Tax_Rate_Toolbar_Save $this
+ * @var string $header
+ * @var Mage_Adminhtml_Block_Tax_Rate_Form $form
+ */
 ?>
 <div class="content-header">
     <table cellspacing="0">
diff --git a/app/design/adminhtml/default/default/template/widget/form.phtml b/app/design/adminhtml/default/default/template/widget/form.phtml
index f1efdb14be6..557e4a0f774 100644
--- a/app/design/adminhtml/default/default/template/widget/form.phtml
+++ b/app/design/adminhtml/default/default/template/widget/form.phtml
@@ -12,6 +12,8 @@
  * @copyright   Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org)
  * @license     https://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
+
+/** @var Mage_Adminhtml_Block_Tax_Rule_Edit_Form $this */
 ?>
 <div class="entry-edit">
     <?php echo $this->getFormHtml();?>
diff --git a/app/design/frontend/base/default/template/catalog/msrp/popup.phtml b/app/design/frontend/base/default/template/catalog/msrp/popup.phtml
index 7e4bda6850f..922512788da 100644
--- a/app/design/frontend/base/default/template/catalog/msrp/popup.phtml
+++ b/app/design/frontend/base/default/template/catalog/msrp/popup.phtml
@@ -12,11 +12,11 @@
  * @copyright   Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org)
  * @license     https://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
-?>
-<?php
+
 /**
  * Template for MAP popup
  *
+ * @var Mage_Core_Block_Template $this
  */
 ?>
 <?php if (Mage::helper('catalog')->isMsrpEnabled()): ?>
diff --git a/app/design/frontend/base/default/template/catalog/product/list/related.phtml b/app/design/frontend/base/default/template/catalog/product/list/related.phtml
index 53454d15b5b..b5fb37ea51c 100644
--- a/app/design/frontend/base/default/template/catalog/product/list/related.phtml
+++ b/app/design/frontend/base/default/template/catalog/product/list/related.phtml
@@ -12,6 +12,8 @@
  * @copyright   Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org)
  * @license     https://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
+
+/** @var Mage_Catalog_Block_Product_List_Related $this */
 ?>
 <?php if($this->getItems()->getSize()): ?>
 <div class="block block-related">
diff --git a/app/design/frontend/base/default/template/catalog/product/list/upsell.phtml b/app/design/frontend/base/default/template/catalog/product/list/upsell.phtml
index 15cab6704db..70d8ff50ef2 100644
--- a/app/design/frontend/base/default/template/catalog/product/list/upsell.phtml
+++ b/app/design/frontend/base/default/template/catalog/product/list/upsell.phtml
@@ -12,6 +12,8 @@
  * @copyright   Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org)
  * @license     https://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
+
+/** @var Mage_Catalog_Block_Product_List_Upsell $this */
 ?>
 <?php if(count($this->getItemCollection()->getItems())): ?>
 <div class="box-collateral box-up-sell">
diff --git a/app/design/frontend/base/default/template/catalog/product/view/addto.phtml b/app/design/frontend/base/default/template/catalog/product/view/addto.phtml
index b4e6af1324f..04d24e54bce 100644
--- a/app/design/frontend/base/default/template/catalog/product/view/addto.phtml
+++ b/app/design/frontend/base/default/template/catalog/product/view/addto.phtml
@@ -12,6 +12,8 @@
  * @copyright   Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org)
  * @license     https://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
+
+/** @var Mage_Catalog_Block_Product_View $this */
 ?>
 
 <?php $_product = $this->getProduct(); ?>
diff --git a/app/design/frontend/base/default/template/catalog/product/view/addtocart.phtml b/app/design/frontend/base/default/template/catalog/product/view/addtocart.phtml
index 128d3a99785..57ed6571760 100644
--- a/app/design/frontend/base/default/template/catalog/product/view/addtocart.phtml
+++ b/app/design/frontend/base/default/template/catalog/product/view/addtocart.phtml
@@ -12,6 +12,8 @@
  * @copyright   Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org)
  * @license     https://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
+
+/** @var Mage_Catalog_Block_Product_View $this */
 ?>
 <?php $_product = $this->getProduct(); ?>
 <?php $buttonTitle = $this->__('Add to Cart'); ?>
diff --git a/app/design/frontend/base/default/template/catalog/seo/sitemap.phtml b/app/design/frontend/base/default/template/catalog/seo/sitemap.phtml
index 5d2d22cdbbf..e3508536e41 100644
--- a/app/design/frontend/base/default/template/catalog/seo/sitemap.phtml
+++ b/app/design/frontend/base/default/template/catalog/seo/sitemap.phtml
@@ -15,8 +15,8 @@
 ?>
 <?php
 /**
- * @see Mage_Catalog_Block_Seo_Sitemap_
- * @var Mage_Catalog_Block_Seo_Sitemap_ $this
+ * @see Mage_Catalog_Block_Seo_Sitemap_Product
+ * @var Mage_Catalog_Block_Seo_Sitemap_Product $this
  */
 ?>
 <?php $_items = $this->getCollection(); ?>
diff --git a/app/design/frontend/base/default/template/catalog/seo/sitemap/container.phtml b/app/design/frontend/base/default/template/catalog/seo/sitemap/container.phtml
index 464bd3c8d9d..1ecb136e80f 100644
--- a/app/design/frontend/base/default/template/catalog/seo/sitemap/container.phtml
+++ b/app/design/frontend/base/default/template/catalog/seo/sitemap/container.phtml
@@ -12,6 +12,8 @@
  * @copyright   Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org)
  * @license     https://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
+
+/** @var Mage_Page_Block_Template_Container $this */
 ?>
 <div class="page-sitemap">
     <div class="page-title">
diff --git a/app/design/frontend/base/default/template/catalog/seo/tree.phtml b/app/design/frontend/base/default/template/catalog/seo/tree.phtml
index cb859057730..623d88cd4bc 100644
--- a/app/design/frontend/base/default/template/catalog/seo/tree.phtml
+++ b/app/design/frontend/base/default/template/catalog/seo/tree.phtml
@@ -15,8 +15,8 @@
 ?>
 <?php
 /**
- * @see Mage_Catalog_Block_Seo_Sitemap_
- * @var Mage_Catalog_Block_Seo_Sitemap_ $this 
+ * @see Mage_Catalog_Block_Seo_Sitemap_Tree_Category
+ * @var Mage_Catalog_Block_Seo_Sitemap_Tree_Category $this
  */
 ?>
 <?php $_items = $this->getCollection(); ?>
diff --git a/app/design/frontend/base/default/template/catalogsearch/advanced/result.phtml b/app/design/frontend/base/default/template/catalogsearch/advanced/result.phtml
index 7b22ecb21b1..a5aff178fdb 100644
--- a/app/design/frontend/base/default/template/catalogsearch/advanced/result.phtml
+++ b/app/design/frontend/base/default/template/catalogsearch/advanced/result.phtml
@@ -12,6 +12,8 @@
  * @copyright   Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org)
  * @license     https://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
+
+/** @var Mage_CatalogSearch_Block_Advanced_Result $this */
 ?>
 <div class="page-title">
     <h1><?php echo $this->__('Catalog Advanced Search') ?></h1>
diff --git a/app/design/frontend/base/default/template/catalogsearch/form.mini.phtml b/app/design/frontend/base/default/template/catalogsearch/form.mini.phtml
index 0b9eb095a9c..feecb07f49f 100644
--- a/app/design/frontend/base/default/template/catalogsearch/form.mini.phtml
+++ b/app/design/frontend/base/default/template/catalogsearch/form.mini.phtml
@@ -13,7 +13,7 @@
  * @license     https://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
 /** @var Mage_Core_Block_Template $this */
-/* @var $catalogSearchHelper Mage_CatalogSearch_Helper_Data */
+/** @var Mage_CatalogSearch_Helper_Data $catalogSearchHelper */
 $catalogSearchHelper =  $this->helper('catalogsearch');
 ?>
 <form id="search_mini_form" action="<?php echo $catalogSearchHelper->getResultUrl() ?>" method="get">
diff --git a/app/design/frontend/base/default/template/catalogsearch/result.phtml b/app/design/frontend/base/default/template/catalogsearch/result.phtml
index 30becee7389..35f3cd6508f 100644
--- a/app/design/frontend/base/default/template/catalogsearch/result.phtml
+++ b/app/design/frontend/base/default/template/catalogsearch/result.phtml
@@ -12,6 +12,8 @@
  * @copyright   Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org)
  * @license     https://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
+
+/** @var Mage_CatalogSearch_Block_Result $this */
 ?>
 <?php if($this->getResultCount()): ?>
 <?php echo $this->getMessagesBlock()->toHtml() ?>
diff --git a/app/design/frontend/base/default/template/catalogsearch/term.phtml b/app/design/frontend/base/default/template/catalogsearch/term.phtml
index a604508721e..7904fec5c7f 100644
--- a/app/design/frontend/base/default/template/catalogsearch/term.phtml
+++ b/app/design/frontend/base/default/template/catalogsearch/term.phtml
@@ -12,6 +12,8 @@
  * @copyright   Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org)
  * @license     https://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
+
+/** @var Mage_CatalogSearch_Block_Term $this */
 ?>
 <div class="page-title">
     <h1><?php echo $this->__('Popular Search Terms') ?></h1>
diff --git a/app/design/frontend/base/default/template/checkout/onepage/link.phtml b/app/design/frontend/base/default/template/checkout/onepage/link.phtml
index 5b17ed00fb5..7bd4280a50b 100644
--- a/app/design/frontend/base/default/template/checkout/onepage/link.phtml
+++ b/app/design/frontend/base/default/template/checkout/onepage/link.phtml
@@ -12,6 +12,8 @@
  * @copyright   Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org)
  * @license     https://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
+
+/** @var Mage_Checkout_Block_Onepage_Link $this */
 ?>
 <?php if ($this->isPossibleOnepageCheckout()):?>
     <button type="button" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Proceed to Checkout')) ?>" class="button btn-proceed-checkout btn-checkout<?php if ($this->isDisabled()):?> no-checkout<?php endif ?>"<?php if ($this->isDisabled()):?> disabled="disabled"<?php endif ?> onclick="window.location='<?php echo $this->getCheckoutUrl() ?>';"><span><span><?php echo $this->__('Proceed to Checkout') ?></span></span></button>
diff --git a/app/design/frontend/base/default/template/checkout/onepage/payment.phtml b/app/design/frontend/base/default/template/checkout/onepage/payment.phtml
index f61bbc8a5ad..baf4d933353 100644
--- a/app/design/frontend/base/default/template/checkout/onepage/payment.phtml
+++ b/app/design/frontend/base/default/template/checkout/onepage/payment.phtml
@@ -12,6 +12,8 @@
  * @copyright   Copyright (c) 2020-2022 The OpenMage Contributors (https://www.openmage.org)
  * @license     https://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
+
+/** @var Mage_Checkout_Block_Onepage_Payment $this */
 ?>
 <script type="text/javascript">
 //<![CDATA[
diff --git a/app/design/frontend/base/default/template/checkout/onepage/progress.phtml b/app/design/frontend/base/default/template/checkout/onepage/progress.phtml
index 2d9b2e921ad..3704687a68d 100644
--- a/app/design/frontend/base/default/template/checkout/onepage/progress.phtml
+++ b/app/design/frontend/base/default/template/checkout/onepage/progress.phtml
@@ -12,6 +12,8 @@
  * @copyright   Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org)
  * @license     https://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
+
+/** @var Mage_Checkout_Block_Onepage_Progress $this */
 ?>
 <div class="block block-progress opc-block-progress">
     <div class="block-title">
diff --git a/app/design/frontend/base/default/template/checkout/onepage/progress/billing.phtml b/app/design/frontend/base/default/template/checkout/onepage/progress/billing.phtml
index ff983a0124c..5e4c03638e5 100644
--- a/app/design/frontend/base/default/template/checkout/onepage/progress/billing.phtml
+++ b/app/design/frontend/base/default/template/checkout/onepage/progress/billing.phtml
@@ -12,6 +12,8 @@
  * @copyright   Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org)
  * @license     https://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
+
+/** @var Mage_Checkout_Block_Onepage_Progress $this */
 ?>
 <?php if ($this->getCheckout()->getStepData('billing', 'complete')): ?>
 <dt class="complete">
diff --git a/app/design/frontend/base/default/template/checkout/onepage/progress/payment.phtml b/app/design/frontend/base/default/template/checkout/onepage/progress/payment.phtml
index c2c2b6ac081..fd176a67ebf 100644
--- a/app/design/frontend/base/default/template/checkout/onepage/progress/payment.phtml
+++ b/app/design/frontend/base/default/template/checkout/onepage/progress/payment.phtml
@@ -12,6 +12,8 @@
  * @copyright   Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org)
  * @license     https://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
+
+/** @var Mage_Checkout_Block_Onepage_Progress $this */
 ?>
 <?php if ($this->getCheckout()->getStepData('payment', 'complete')): ?>
 <dt class="complete">
diff --git a/app/design/frontend/base/default/template/checkout/onepage/progress/shipping.phtml b/app/design/frontend/base/default/template/checkout/onepage/progress/shipping.phtml
index 122ddb0e112..577314d389a 100644
--- a/app/design/frontend/base/default/template/checkout/onepage/progress/shipping.phtml
+++ b/app/design/frontend/base/default/template/checkout/onepage/progress/shipping.phtml
@@ -12,6 +12,8 @@
  * @copyright   Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org)
  * @license     https://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
+
+/** @var Mage_Checkout_Block_Onepage_Progress $this */
 ?>
 <?php if ($this->getCheckout()->getStepData('shipping', 'complete')): ?>
 <?php $completeClass = $this->getCheckout()->getStepData('shipping', 'complete') ? 'complete' : ''; ?>
diff --git a/app/design/frontend/base/default/template/checkout/onepage/progress/shipping_method.phtml b/app/design/frontend/base/default/template/checkout/onepage/progress/shipping_method.phtml
index 89f9f8a7664..0cf5ce536a4 100644
--- a/app/design/frontend/base/default/template/checkout/onepage/progress/shipping_method.phtml
+++ b/app/design/frontend/base/default/template/checkout/onepage/progress/shipping_method.phtml
@@ -12,6 +12,8 @@
  * @copyright   Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org)
  * @license     https://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
+
+/** @var Mage_Checkout_Block_Onepage_Progress $this */
 ?>
 <?php if ($this->getCheckout()->getStepData('shipping_method', 'complete')): ?>
 <dt class="complete">
diff --git a/app/design/frontend/base/default/template/checkout/onepage/review/button.phtml b/app/design/frontend/base/default/template/checkout/onepage/review/button.phtml
index df549755ba5..aa36a85dcbd 100644
--- a/app/design/frontend/base/default/template/checkout/onepage/review/button.phtml
+++ b/app/design/frontend/base/default/template/checkout/onepage/review/button.phtml
@@ -12,5 +12,7 @@
  * @copyright   Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org)
  * @license     https://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
+
+/** @var Mage_Core_Block_Template $this */
 ?>
 <button type="submit" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Place Order')) ?>" class="button btn-checkout" onclick="review.save();"><span><span><?php echo $this->__('Place Order') ?></span></span></button>
diff --git a/app/design/frontend/base/default/template/checkout/onepage/review/info.phtml b/app/design/frontend/base/default/template/checkout/onepage/review/info.phtml
index 3b66d63e4d1..6d3cf778ade 100644
--- a/app/design/frontend/base/default/template/checkout/onepage/review/info.phtml
+++ b/app/design/frontend/base/default/template/checkout/onepage/review/info.phtml
@@ -12,6 +12,8 @@
  * @copyright   Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org)
  * @license     https://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
+
+/** @var Mage_Checkout_Block_Onepage_Review_Info $this */
 ?>
 <?php echo $this->getChildHtml('items_before'); ?>
 <div id="checkout-review-table-wrapper">
diff --git a/app/design/frontend/base/default/template/checkout/onepage/review/item.phtml b/app/design/frontend/base/default/template/checkout/onepage/review/item.phtml
index 63d1b7194ab..bcb2a8f9578 100644
--- a/app/design/frontend/base/default/template/checkout/onepage/review/item.phtml
+++ b/app/design/frontend/base/default/template/checkout/onepage/review/item.phtml
@@ -12,6 +12,8 @@
  * @copyright   Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org)
  * @license     https://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
+
+/** @var Mage_Checkout_Block_Cart_Item_Renderer $this */
 ?>
 <?php $_item = $this->getItem()?>
 <tr>
diff --git a/app/design/frontend/base/default/template/checkout/onepage/shipping_method.phtml b/app/design/frontend/base/default/template/checkout/onepage/shipping_method.phtml
index 5873785f186..565b38eec8b 100644
--- a/app/design/frontend/base/default/template/checkout/onepage/shipping_method.phtml
+++ b/app/design/frontend/base/default/template/checkout/onepage/shipping_method.phtml
@@ -12,6 +12,8 @@
  * @copyright   Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org)
  * @license     https://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
+
+/** @var Mage_Checkout_Block_Onepage_Shipping_Method $this */
 ?>
 <form id="co-shipping-method-form" action="">
     <div id="checkout-shipping-method-load">
diff --git a/app/design/frontend/base/default/template/cms/content_heading.phtml b/app/design/frontend/base/default/template/cms/content_heading.phtml
index ec7fbba92f0..02f396fd70a 100644
--- a/app/design/frontend/base/default/template/cms/content_heading.phtml
+++ b/app/design/frontend/base/default/template/cms/content_heading.phtml
@@ -12,6 +12,8 @@
  * @copyright   Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org)
  * @license     https://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
+
+/** @var Mage_Core_Block_Template $this */
 ?>
 <?php if($_heading = $this->getContentHeading()): ?>
     <div class="page-title">
diff --git a/app/design/frontend/base/default/template/contacts/form.phtml b/app/design/frontend/base/default/template/contacts/form.phtml
index 3c98afb1a34..383e7c2bfc1 100644
--- a/app/design/frontend/base/default/template/contacts/form.phtml
+++ b/app/design/frontend/base/default/template/contacts/form.phtml
@@ -12,6 +12,8 @@
  * @copyright   Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org)
  * @license     https://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
+
+/** @var Mage_Core_Block_Template $this */
 ?>
 <div id="messages_product_view"><?php echo $this->getMessagesBlock()->toHtml() ?></div>
 <div class="page-title">
diff --git a/app/design/frontend/base/default/template/customer/account/dashboard.phtml b/app/design/frontend/base/default/template/customer/account/dashboard.phtml
index 31321eeda23..c1b42c7df30 100644
--- a/app/design/frontend/base/default/template/customer/account/dashboard.phtml
+++ b/app/design/frontend/base/default/template/customer/account/dashboard.phtml
@@ -12,6 +12,8 @@
  * @copyright   Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org)
  * @license     https://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
+
+/** @var Mage_Customer_Block_Account_Dashboard $this */
 ?>
 <div class="dashboard">
     <div class="page-title">
diff --git a/app/design/frontend/base/default/template/customer/account/dashboard/address.phtml b/app/design/frontend/base/default/template/customer/account/dashboard/address.phtml
index 0f2a9314b39..70e2da9400d 100644
--- a/app/design/frontend/base/default/template/customer/account/dashboard/address.phtml
+++ b/app/design/frontend/base/default/template/customer/account/dashboard/address.phtml
@@ -12,6 +12,8 @@
  * @copyright   Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org)
  * @license     https://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
+
+/** @var Mage_Customer_Block_Account_Dashboard_Address $this */
 ?>
 <div class="col2-set">
     <div class="box">
diff --git a/app/design/frontend/base/default/template/customer/account/dashboard/hello.phtml b/app/design/frontend/base/default/template/customer/account/dashboard/hello.phtml
index 34b463ea4e9..3530d6f80e1 100644
--- a/app/design/frontend/base/default/template/customer/account/dashboard/hello.phtml
+++ b/app/design/frontend/base/default/template/customer/account/dashboard/hello.phtml
@@ -12,6 +12,8 @@
  * @copyright   Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org)
  * @license     https://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
+
+/** @var Mage_Customer_Block_Account_Dashboard_Hello $this */
 ?>
 <div class="welcome-msg">
     <p class="hello"><strong><?php echo $this->__('Hello, %s!', $this->escapeHtml($this->getCustomerName())) ?></strong></p>
diff --git a/app/design/frontend/base/default/template/customer/account/dashboard/info.phtml b/app/design/frontend/base/default/template/customer/account/dashboard/info.phtml
index 3fc1a5d168e..e5db2b395bc 100644
--- a/app/design/frontend/base/default/template/customer/account/dashboard/info.phtml
+++ b/app/design/frontend/base/default/template/customer/account/dashboard/info.phtml
@@ -12,6 +12,8 @@
  * @copyright   Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org)
  * @license     https://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
+
+/** @var Mage_Customer_Block_Account_Dashboard_Info $this */
 ?>
 <div class="col2-set">
     <div class="col-1">
diff --git a/app/design/frontend/base/default/template/customer/account/link/back.phtml b/app/design/frontend/base/default/template/customer/account/link/back.phtml
index 60da1d7f4fc..22d4a87e190 100644
--- a/app/design/frontend/base/default/template/customer/account/link/back.phtml
+++ b/app/design/frontend/base/default/template/customer/account/link/back.phtml
@@ -12,6 +12,8 @@
  * @copyright   Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org)
  * @license     https://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
+
+/** @var Mage_Customer_Block_Account_Dashboard $this */
 ?>
 <div class="buttons-set">
     <p class="back-link"><a href="<?php echo $this->escapeUrl($this->getBackUrl()) ?>"><small>&laquo; </small><?php echo $this->__('Back') ?></a></p>
diff --git a/app/design/frontend/base/default/template/customer/account/navigation.phtml b/app/design/frontend/base/default/template/customer/account/navigation.phtml
index 21f47777d66..5e6fd8c6ed1 100644
--- a/app/design/frontend/base/default/template/customer/account/navigation.phtml
+++ b/app/design/frontend/base/default/template/customer/account/navigation.phtml
@@ -12,6 +12,8 @@
  * @copyright   Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org)
  * @license     https://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
+
+/** @var Mage_Customer_Block_Account_Navigation $this */
 ?>
 <div class="block block-account">
     <div class="block-title">
diff --git a/app/design/frontend/base/default/template/customer/form/edit.phtml b/app/design/frontend/base/default/template/customer/form/edit.phtml
index 1f98d285fd8..0be60dccbdd 100644
--- a/app/design/frontend/base/default/template/customer/form/edit.phtml
+++ b/app/design/frontend/base/default/template/customer/form/edit.phtml
@@ -12,6 +12,8 @@
  * @copyright   Copyright (c) 2021-2023 The OpenMage Contributors (https://www.openmage.org)
  * @license     https://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
+
+/** @var Mage_Customer_Block_Form_Edit $this */
 ?>
 <div class="page-title">
     <h1><?php echo $this->__('Edit Account Information') ?></h1>
diff --git a/app/design/frontend/base/default/template/customer/form/forgotpassword.phtml b/app/design/frontend/base/default/template/customer/form/forgotpassword.phtml
index 810a733e6ce..b15144d2b93 100644
--- a/app/design/frontend/base/default/template/customer/form/forgotpassword.phtml
+++ b/app/design/frontend/base/default/template/customer/form/forgotpassword.phtml
@@ -12,6 +12,8 @@
  * @copyright   Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org)
  * @license     https://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
+
+/** @var Mage_Customer_Block_Account_Forgotpassword $this */
 ?>
 <div class="page-title">
     <h1><?php echo $this->__('Forgot Your Password?') ?></h1>
diff --git a/app/design/frontend/base/default/template/newsletter/subscribe.phtml b/app/design/frontend/base/default/template/newsletter/subscribe.phtml
index bedc55113d2..060be363c7b 100644
--- a/app/design/frontend/base/default/template/newsletter/subscribe.phtml
+++ b/app/design/frontend/base/default/template/newsletter/subscribe.phtml
@@ -12,6 +12,8 @@
  * @copyright   Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org)
  * @license     https://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
+
+/** @var Mage_Newsletter_Block_Subscribe $this */
 ?>
 <div class="block block-subscribe">
     <div class="block-title">
diff --git a/app/design/frontend/base/default/template/wishlist/button/share.phtml b/app/design/frontend/base/default/template/wishlist/button/share.phtml
index ce1a128df00..c33f3a165e0 100644
--- a/app/design/frontend/base/default/template/wishlist/button/share.phtml
+++ b/app/design/frontend/base/default/template/wishlist/button/share.phtml
@@ -12,6 +12,8 @@
  * @copyright   Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org)
  * @license     https://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
+
+/** @var Mage_Wishlist_Block_Customer_Wishlist_Button $this */
 ?>
 
 <?php if($this->getWishlist()->getItemsCount()): ?>
diff --git a/app/design/frontend/base/default/template/wishlist/button/tocart.phtml b/app/design/frontend/base/default/template/wishlist/button/tocart.phtml
index 294835dd54f..7fcaf7b708c 100644
--- a/app/design/frontend/base/default/template/wishlist/button/tocart.phtml
+++ b/app/design/frontend/base/default/template/wishlist/button/tocart.phtml
@@ -12,6 +12,8 @@
  * @copyright   Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org)
  * @license     https://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
+
+/** @var Mage_Wishlist_Block_Customer_Wishlist_Button $this */
 ?>
 
 <?php if($this->getWishlist()->getItemsCount() && $this->getWishlist()->isSalable()): ?>
diff --git a/app/design/frontend/base/default/template/wishlist/button/update.phtml b/app/design/frontend/base/default/template/wishlist/button/update.phtml
index 3244f9d057d..48ad3e39031 100644
--- a/app/design/frontend/base/default/template/wishlist/button/update.phtml
+++ b/app/design/frontend/base/default/template/wishlist/button/update.phtml
@@ -12,6 +12,8 @@
  * @copyright   Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org)
  * @license     https://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
+
+/** @var Mage_Wishlist_Block_Customer_Wishlist_Button $this */
 ?>
 
 <?php if($this->getWishlist()->getItemsCount()): ?>
diff --git a/app/design/frontend/base/default/template/wishlist/render/item/price.phtml b/app/design/frontend/base/default/template/wishlist/render/item/price.phtml
index 9b5108e2e76..20f21f6a7a9 100644
--- a/app/design/frontend/base/default/template/wishlist/render/item/price.phtml
+++ b/app/design/frontend/base/default/template/wishlist/render/item/price.phtml
@@ -12,12 +12,12 @@
  * @copyright   Copyright (c) 2021-2024 The OpenMage Contributors (https://www.openmage.org)
  * @license     https://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
-/** @var Mage_Wishlist_Block_Customer_Wishlist_Render_Item_Price $this */
+/** @var Mage_Wishlist_Block_Render_Item_Price $this */
 ?>
 
 <?php echo $this->getCleanProductPriceHtml(); ?>
 
-<?php /* @var $product Mage_Catalog_Model_Product */ ?>
+<?php /** @var Mage_Catalog_Model_Product $product */ ?>
 <?php $product = $this->getProduct(); ?>
 <?php $finalPrice = $product->getFinalPrice(1); ?>
 <?php if ($product->canConfigure()): ?>
diff --git a/app/design/frontend/rwd/default/template/catalog/layer/filter.phtml b/app/design/frontend/rwd/default/template/catalog/layer/filter.phtml
index 62d9a46e664..99beb20c66f 100644
--- a/app/design/frontend/rwd/default/template/catalog/layer/filter.phtml
+++ b/app/design/frontend/rwd/default/template/catalog/layer/filter.phtml
@@ -17,8 +17,8 @@
 /**
  * Template for filter items block
  *
- * @see Mage_Catalog_Block_Layer_Filter
- * @var Mage_Catalog_Block_Layer_Filter $this
+ * @see Mage_Catalog_Block_Layer_Filter_Attribute
+ * @var Mage_Catalog_Block_Layer_Filter_Attribute $this
  */
 ?>
 
diff --git a/app/design/frontend/rwd/default/template/catalog/msrp/popup.phtml b/app/design/frontend/rwd/default/template/catalog/msrp/popup.phtml
index 590566b00c6..f36deb4416f 100644
--- a/app/design/frontend/rwd/default/template/catalog/msrp/popup.phtml
+++ b/app/design/frontend/rwd/default/template/catalog/msrp/popup.phtml
@@ -12,11 +12,11 @@
  * @copyright   Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org)
  * @license     https://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
-?>
-<?php
+
 /**
  * Template for MAP popup
  *
+ * @var Mage_Core_Block_Template $this
  */
 ?>
 <?php if (Mage::helper('catalog')->isMsrpEnabled()): ?>
diff --git a/app/design/frontend/rwd/default/template/catalog/product/list/related.phtml b/app/design/frontend/rwd/default/template/catalog/product/list/related.phtml
index fa8e0f54910..96577f8d6b3 100644
--- a/app/design/frontend/rwd/default/template/catalog/product/list/related.phtml
+++ b/app/design/frontend/rwd/default/template/catalog/product/list/related.phtml
@@ -12,6 +12,8 @@
  * @copyright   Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org)
  * @license     https://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
+
+/** @var Mage_Catalog_Block_Product_List_Related $this */
 ?>
 <?php if($this->getItems()->getSize()): ?>
 <div class="block block-related">
diff --git a/app/design/frontend/rwd/default/template/catalog/product/list/upsell.phtml b/app/design/frontend/rwd/default/template/catalog/product/list/upsell.phtml
index 98a7c0291d7..4e2248e34eb 100644
--- a/app/design/frontend/rwd/default/template/catalog/product/list/upsell.phtml
+++ b/app/design/frontend/rwd/default/template/catalog/product/list/upsell.phtml
@@ -12,6 +12,8 @@
  * @copyright   Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org)
  * @license     https://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
+
+/** @var Mage_Catalog_Block_Product_List_Upsell $this */
 ?>
 <?php if(count($this->getItemCollection()->getItems())): ?>
 <?php $_columnCount = $this->getColumnCount(); ?>
diff --git a/app/design/frontend/rwd/default/template/catalog/product/view/addto.phtml b/app/design/frontend/rwd/default/template/catalog/product/view/addto.phtml
index 4a5552c0719..77725498640 100644
--- a/app/design/frontend/rwd/default/template/catalog/product/view/addto.phtml
+++ b/app/design/frontend/rwd/default/template/catalog/product/view/addto.phtml
@@ -12,6 +12,8 @@
  * @copyright   Copyright (c) 2021-2023 The OpenMage Contributors (https://www.openmage.org)
  * @license     https://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
+
+/** @var Mage_Catalog_Block_Product_View $this */
 ?>
 
 <?php $_product = $this->getProduct(); ?>
diff --git a/app/design/frontend/rwd/default/template/catalog/product/view/addtocart.phtml b/app/design/frontend/rwd/default/template/catalog/product/view/addtocart.phtml
index c97eb0b251d..e7f395c3706 100644
--- a/app/design/frontend/rwd/default/template/catalog/product/view/addtocart.phtml
+++ b/app/design/frontend/rwd/default/template/catalog/product/view/addtocart.phtml
@@ -12,6 +12,8 @@
  * @copyright   Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org)
  * @license     https://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
+
+/** @var Mage_Catalog_Block_Product_View $this */
 ?>
 <?php $_product = $this->getProduct(); ?>
 <?php $buttonTitle = Mage::helper('core')->quoteEscape($this->__('Add to Cart')); ?>
diff --git a/app/design/frontend/rwd/default/template/catalog/product/view/sharing.phtml b/app/design/frontend/rwd/default/template/catalog/product/view/sharing.phtml
index f1e58d9ee6b..400168a9f63 100644
--- a/app/design/frontend/rwd/default/template/catalog/product/view/sharing.phtml
+++ b/app/design/frontend/rwd/default/template/catalog/product/view/sharing.phtml
@@ -12,6 +12,8 @@
  * @copyright   Copyright (c) 2021-2024 The OpenMage Contributors (https://www.openmage.org)
  * @license     https://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
+
+/** @var Mage_Catalog_Block_Product_View $this */
 ?>
 
 <?php $_product = $this->getProduct(); ?>
diff --git a/app/design/frontend/rwd/default/template/catalog/product/view/type/availability/default.phtml b/app/design/frontend/rwd/default/template/catalog/product/view/type/availability/default.phtml
index 5fe3e111e9b..a172d6eb479 100644
--- a/app/design/frontend/rwd/default/template/catalog/product/view/type/availability/default.phtml
+++ b/app/design/frontend/rwd/default/template/catalog/product/view/type/availability/default.phtml
@@ -12,6 +12,9 @@
  * @copyright   Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org)
  * @license     https://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
+
+/** @var Mage_Catalog_Block_Product_View_Type_Configurable $this */
+
 $_product = $this->getProduct(); ?>
 <?php if ($this->displayProductStockStatus()): ?>
     <?php if ($_product->isAvailable()): ?>
diff --git a/app/design/frontend/rwd/default/template/catalog/product/view/type/options/configurable.phtml b/app/design/frontend/rwd/default/template/catalog/product/view/type/options/configurable.phtml
index 2ddca277f95..94892e8960e 100644
--- a/app/design/frontend/rwd/default/template/catalog/product/view/type/options/configurable.phtml
+++ b/app/design/frontend/rwd/default/template/catalog/product/view/type/options/configurable.phtml
@@ -12,6 +12,8 @@
  * @copyright   Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org)
  * @license     https://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
+
+/** @var Mage_Catalog_Block_Product_View_Type_Configurable $this */
 ?>
 
 <?php
diff --git a/app/design/frontend/rwd/default/template/catalog/product/widget/new/content/new_grid.phtml b/app/design/frontend/rwd/default/template/catalog/product/widget/new/content/new_grid.phtml
index c3966d2445c..b3826b8760c 100644
--- a/app/design/frontend/rwd/default/template/catalog/product/widget/new/content/new_grid.phtml
+++ b/app/design/frontend/rwd/default/template/catalog/product/widget/new/content/new_grid.phtml
@@ -12,6 +12,8 @@
  * @copyright   Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org)
  * @license     https://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
+
+/** @var Mage_Catalog_Block_Product_Widget_New $this */
 ?>
 <?php if (($_products = $this->getProductCollection()) && $_products->getSize()): ?>
 <div class="widget widget-new-products">
diff --git a/app/design/frontend/rwd/default/template/catalogsearch/form.mini.phtml b/app/design/frontend/rwd/default/template/catalogsearch/form.mini.phtml
index dfdcae47f8d..59b2378ae97 100644
--- a/app/design/frontend/rwd/default/template/catalogsearch/form.mini.phtml
+++ b/app/design/frontend/rwd/default/template/catalogsearch/form.mini.phtml
@@ -13,7 +13,7 @@
  * @license     https://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
 /** @var Mage_Core_Block_Template $this */
-/* @var $catalogSearchHelper Mage_CatalogSearch_Helper_Data */
+/** @var Mage_CatalogSearch_Helper_Data $catalogSearchHelper */
 $catalogSearchHelper =  $this->helper('catalogsearch');
 ?>
 
diff --git a/app/design/frontend/rwd/default/template/catalogsearch/result.phtml b/app/design/frontend/rwd/default/template/catalogsearch/result.phtml
index 884a49f1a11..b80e04e30ed 100644
--- a/app/design/frontend/rwd/default/template/catalogsearch/result.phtml
+++ b/app/design/frontend/rwd/default/template/catalogsearch/result.phtml
@@ -12,6 +12,8 @@
  * @copyright   Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org)
  * @license     https://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
+
+/** @var Mage_CatalogSearch_Block_Result $this */
 ?>
 <?php if($this->getResultCount()): ?>
 <?php echo $this->getMessagesBlock()->toHtml() ?>
diff --git a/app/design/frontend/rwd/default/template/checkout/cart/item/default.phtml b/app/design/frontend/rwd/default/template/checkout/cart/item/default.phtml
index c9388771fba..eac1e2561cf 100644
--- a/app/design/frontend/rwd/default/template/checkout/cart/item/default.phtml
+++ b/app/design/frontend/rwd/default/template/checkout/cart/item/default.phtml
@@ -12,6 +12,8 @@
  * @copyright   Copyright (c) 2021-2023 The OpenMage Contributors (https://www.openmage.org)
  * @license     https://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
+
+/** @var Mage_Checkout_Block_Cart_Item_Renderer $this */
 ?>
 <?php
 $_item = $this->getItem();
diff --git a/app/design/frontend/rwd/default/template/checkout/cart/minicart/default.phtml b/app/design/frontend/rwd/default/template/checkout/cart/minicart/default.phtml
index 07d56712046..61565a23bdd 100644
--- a/app/design/frontend/rwd/default/template/checkout/cart/minicart/default.phtml
+++ b/app/design/frontend/rwd/default/template/checkout/cart/minicart/default.phtml
@@ -12,6 +12,8 @@
  * @copyright   Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org)
  * @license     https://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
+
+/** @var Mage_Checkout_Block_Cart_Item_Renderer $this */
 ?>
 <?php
     $_item = $this->getItem();
diff --git a/app/design/frontend/rwd/default/template/checkout/onepage/payment.phtml b/app/design/frontend/rwd/default/template/checkout/onepage/payment.phtml
index 84516b2e029..b22f8912a1a 100644
--- a/app/design/frontend/rwd/default/template/checkout/onepage/payment.phtml
+++ b/app/design/frontend/rwd/default/template/checkout/onepage/payment.phtml
@@ -12,6 +12,8 @@
  * @copyright   Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org)
  * @license     https://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
+
+/** @var Mage_Checkout_Block_Onepage_Payment $this */
 ?>
 <script type="text/javascript">
 //<![CDATA[
diff --git a/app/design/frontend/rwd/default/template/checkout/onepage/progress.phtml b/app/design/frontend/rwd/default/template/checkout/onepage/progress.phtml
index 3597e0198e0..99e81187c1f 100644
--- a/app/design/frontend/rwd/default/template/checkout/onepage/progress.phtml
+++ b/app/design/frontend/rwd/default/template/checkout/onepage/progress.phtml
@@ -12,6 +12,8 @@
  * @copyright   Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org)
  * @license     https://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
+
+/** @var Mage_Checkout_Block_Onepage_Progress $this */
 ?>
 <div class="block block-progress opc-block-progress<?php if (!$this->isCustomerLoggedIn()/* && !$this->getCheckout()->getStepData('billing', 'is_show')*/): ?> opc-block-progress-step-login<?php endif ?>">
     <div class="block-title">
diff --git a/app/design/frontend/rwd/default/template/checkout/onepage/review/info.phtml b/app/design/frontend/rwd/default/template/checkout/onepage/review/info.phtml
index db0baa418b1..04866f41016 100644
--- a/app/design/frontend/rwd/default/template/checkout/onepage/review/info.phtml
+++ b/app/design/frontend/rwd/default/template/checkout/onepage/review/info.phtml
@@ -12,6 +12,8 @@
  * @copyright   Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org)
  * @license     https://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
+
+/** @var Mage_Checkout_Block_Onepage_Review_Info $this */
 ?>
 <?php echo $this->getChildHtml('items_before'); ?>
 <div id="checkout-review-table-wrapper">
diff --git a/app/design/frontend/rwd/default/template/checkout/onepage/review/item.phtml b/app/design/frontend/rwd/default/template/checkout/onepage/review/item.phtml
index 128e9808502..dec3c89ad7f 100644
--- a/app/design/frontend/rwd/default/template/checkout/onepage/review/item.phtml
+++ b/app/design/frontend/rwd/default/template/checkout/onepage/review/item.phtml
@@ -12,6 +12,8 @@
  * @copyright   Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org)
  * @license     https://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
+
+/** @var Mage_Checkout_Block_Cart_Item_Renderer $this */
 ?>
 <?php $_item = $this->getItem()?>
 <tr>
diff --git a/app/design/frontend/rwd/default/template/configurableswatches/catalog/layer/filter/swatches.phtml b/app/design/frontend/rwd/default/template/configurableswatches/catalog/layer/filter/swatches.phtml
index 78f56091983..d8e1a6e1b0b 100644
--- a/app/design/frontend/rwd/default/template/configurableswatches/catalog/layer/filter/swatches.phtml
+++ b/app/design/frontend/rwd/default/template/configurableswatches/catalog/layer/filter/swatches.phtml
@@ -17,8 +17,8 @@
 /**
  * Template for filter items block
  *
- * @see Mage_Catalog_Block_Layer_Filter
- * @var Mage_Catalog_Block_Layer_Filter $this
+ * @see Mage_Catalog_Block_Layer_Filter_Attribute
+ * @var Mage_Catalog_Block_Layer_Filter_Attribute $this
  */
 
 $_dimHelper = Mage::helper('configurableswatches/swatchdimensions');
diff --git a/app/design/frontend/rwd/default/template/configurableswatches/catalog/product/list/swatches.phtml b/app/design/frontend/rwd/default/template/configurableswatches/catalog/product/list/swatches.phtml
index ca1738bd291..48b5be4bdd8 100644
--- a/app/design/frontend/rwd/default/template/configurableswatches/catalog/product/list/swatches.phtml
+++ b/app/design/frontend/rwd/default/template/configurableswatches/catalog/product/list/swatches.phtml
@@ -13,6 +13,8 @@
  * @license     https://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
 
+/** @var Mage_Core_Block_Template $this */
+
 $_product = $this->getProduct();
 
 if (Mage::helper('configurableswatches')->isEnabled() && $_product && $_product->getId()
diff --git a/app/design/frontend/rwd/default/template/configurableswatches/catalog/product/view/type/configurable/swatch-js.phtml b/app/design/frontend/rwd/default/template/configurableswatches/catalog/product/view/type/configurable/swatch-js.phtml
index fb004741408..587ce25fb51 100644
--- a/app/design/frontend/rwd/default/template/configurableswatches/catalog/product/view/type/configurable/swatch-js.phtml
+++ b/app/design/frontend/rwd/default/template/configurableswatches/catalog/product/view/type/configurable/swatch-js.phtml
@@ -12,6 +12,8 @@
  * @copyright   Copyright (c) 2022-2023 The OpenMage Contributors (https://www.openmage.org)
  * @license     https://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
+
+/** @var Mage_Core_Block_Template $this */
 ?>
 <?php if ($this->getLayout()->getBlock('head')->getItems('skin_js/js/configurableswatches/swatches-product.js')): ?>
     <script type="text/javascript">
diff --git a/app/design/frontend/rwd/default/template/configurableswatches/catalog/product/view/type/options/configurable/swatches.phtml b/app/design/frontend/rwd/default/template/configurableswatches/catalog/product/view/type/options/configurable/swatches.phtml
index 9b6fdea3c81..e7405553a72 100644
--- a/app/design/frontend/rwd/default/template/configurableswatches/catalog/product/view/type/options/configurable/swatches.phtml
+++ b/app/design/frontend/rwd/default/template/configurableswatches/catalog/product/view/type/options/configurable/swatches.phtml
@@ -12,6 +12,8 @@
  * @copyright   Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org)
  * @license     https://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
+
+/** @var Mage_ConfigurableSwatches_Block_Catalog_Product_View_Type_Configurable_Swatches $this */
 ?>
 <?php
 $_product    = $this->getProduct();
diff --git a/app/design/frontend/rwd/default/template/contacts/form.phtml b/app/design/frontend/rwd/default/template/contacts/form.phtml
index 95499047a70..b0546a0b9b1 100644
--- a/app/design/frontend/rwd/default/template/contacts/form.phtml
+++ b/app/design/frontend/rwd/default/template/contacts/form.phtml
@@ -12,6 +12,8 @@
  * @copyright   Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org)
  * @license     https://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
+
+/** @var Mage_Core_Block_Template $this */
 ?>
 <div id="messages_product_view"><?php echo $this->getMessagesBlock()->toHtml() ?></div>
 <div class="page-title">
diff --git a/app/design/frontend/rwd/default/template/customer/account/dashboard.phtml b/app/design/frontend/rwd/default/template/customer/account/dashboard.phtml
index f86fd2b211d..545f1eb8b6c 100644
--- a/app/design/frontend/rwd/default/template/customer/account/dashboard.phtml
+++ b/app/design/frontend/rwd/default/template/customer/account/dashboard.phtml
@@ -12,6 +12,8 @@
  * @copyright   Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org)
  * @license     https://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
+
+/** @var Mage_Customer_Block_Account_Dashboard $this */
 ?>
 <div class="dashboard">
     <div class="page-title">
diff --git a/app/design/frontend/rwd/default/template/customer/account/dashboard/address.phtml b/app/design/frontend/rwd/default/template/customer/account/dashboard/address.phtml
index 4d6d51762a2..3d1e0dbbd4f 100644
--- a/app/design/frontend/rwd/default/template/customer/account/dashboard/address.phtml
+++ b/app/design/frontend/rwd/default/template/customer/account/dashboard/address.phtml
@@ -12,6 +12,8 @@
  * @copyright   Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org)
  * @license     https://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
+
+/** @var Mage_Customer_Block_Account_Dashboard_Address $this */
 ?>
 <div class="box-account box-info">
     <div class="box-head">
diff --git a/app/design/frontend/rwd/default/template/customer/account/navigation.phtml b/app/design/frontend/rwd/default/template/customer/account/navigation.phtml
index d4b8027c612..40c914707df 100644
--- a/app/design/frontend/rwd/default/template/customer/account/navigation.phtml
+++ b/app/design/frontend/rwd/default/template/customer/account/navigation.phtml
@@ -12,6 +12,8 @@
  * @copyright   Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org)
  * @license     https://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
+
+/** @var Mage_Customer_Block_Account_Navigation $this */
 ?>
 <div class="block block-account">
     <div class="block-title">
diff --git a/app/design/frontend/rwd/default/template/customer/form/edit.phtml b/app/design/frontend/rwd/default/template/customer/form/edit.phtml
index 5c620c5a590..bfce82b26fe 100644
--- a/app/design/frontend/rwd/default/template/customer/form/edit.phtml
+++ b/app/design/frontend/rwd/default/template/customer/form/edit.phtml
@@ -12,6 +12,8 @@
  * @copyright   Copyright (c) 2021-2023 The OpenMage Contributors (https://www.openmage.org)
  * @license     https://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
+
+/** @var Mage_Customer_Block_Form_Edit $this */
 ?>
 <div class="page-title">
     <h1><?php echo $this->__('Edit Account Information') ?></h1>
diff --git a/app/design/frontend/rwd/default/template/customer/form/forgotpassword.phtml b/app/design/frontend/rwd/default/template/customer/form/forgotpassword.phtml
index 4029544666e..d13606bcaef 100644
--- a/app/design/frontend/rwd/default/template/customer/form/forgotpassword.phtml
+++ b/app/design/frontend/rwd/default/template/customer/form/forgotpassword.phtml
@@ -12,6 +12,8 @@
  * @copyright   Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org)
  * @license     https://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
+
+/** @var Mage_Customer_Block_Account_Forgotpassword $this */
 ?>
 <div class="page-title">
     <h1><?php echo $this->__('Forgot Your Password?') ?></h1>
diff --git a/app/design/frontend/rwd/default/template/newsletter/subscribe.phtml b/app/design/frontend/rwd/default/template/newsletter/subscribe.phtml
index d4317c07d9e..157cfc074ed 100644
--- a/app/design/frontend/rwd/default/template/newsletter/subscribe.phtml
+++ b/app/design/frontend/rwd/default/template/newsletter/subscribe.phtml
@@ -12,6 +12,8 @@
  * @copyright   Copyright (c) 2022 The OpenMage Contributors (https://www.openmage.org)
  * @license     https://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
+
+/** @var Mage_Newsletter_Block_Subscribe $this */
 ?>
 <div class="block block-subscribe">
     <div class="block-title">
diff --git a/app/design/frontend/rwd/default/template/wishlist/button/update.phtml b/app/design/frontend/rwd/default/template/wishlist/button/update.phtml
index bd3f727bd64..8650b4590a1 100644
--- a/app/design/frontend/rwd/default/template/wishlist/button/update.phtml
+++ b/app/design/frontend/rwd/default/template/wishlist/button/update.phtml
@@ -12,6 +12,8 @@
  * @copyright   Copyright (c) 2021-2022 The OpenMage Contributors (https://www.openmage.org)
  * @license     https://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
  */
+
+/** @var Mage_Wishlist_Block_Customer_Wishlist_Button $this */
 ?>
 
 <?php if($this->getWishlist()->getItemsCount()): ?>

From 4c875311492a395fc5d813b7703fd7f34c36f177 Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Tue, 12 Nov 2024 18:03:06 +0100
Subject: [PATCH 3/4] rector

---
 app/code/core/Mage/Paypal/Model/Payflowlink.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/code/core/Mage/Paypal/Model/Payflowlink.php b/app/code/core/Mage/Paypal/Model/Payflowlink.php
index a82cdcef759..d22e789687a 100644
--- a/app/code/core/Mage/Paypal/Model/Payflowlink.php
+++ b/app/code/core/Mage/Paypal/Model/Payflowlink.php
@@ -365,7 +365,6 @@ protected function _getOrderFromResponse()
     /**
      * Build request for getting token
      *
-     * @param Mage_Sales_Model_Order_Payment $payment
      * @return Varien_Object
      */
     protected function _buildTokenRequest(Mage_Sales_Model_Order_Payment $payment)

From 10d4d9c259bdb04689386f4b499aea26a2e1bac2 Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Thu, 14 Nov 2024 18:11:52 +0100
Subject: [PATCH 4/4] Update app/code/core/Mage/Paypal/Model/Payflowlink.php

Co-authored-by: Ng Kiat Siong <kiatsiong.ng@gmail.com>
---
 app/code/core/Mage/Paypal/Model/Payflowlink.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/core/Mage/Paypal/Model/Payflowlink.php b/app/code/core/Mage/Paypal/Model/Payflowlink.php
index d22e789687a..fea18013816 100644
--- a/app/code/core/Mage/Paypal/Model/Payflowlink.php
+++ b/app/code/core/Mage/Paypal/Model/Payflowlink.php
@@ -365,7 +365,7 @@ protected function _getOrderFromResponse()
     /**
      * Build request for getting token
      *
-     * @return Varien_Object
+     * @return Mage_Paypal_Model_Payflow_Request
      */
     protected function _buildTokenRequest(Mage_Sales_Model_Order_Payment $payment)
     {