diff --git a/.phpstan.dist.baseline.neon b/.phpstan.dist.baseline.neon index 25680ef7a57..69bbb43b6cd 100644 --- a/.phpstan.dist.baseline.neon +++ b/.phpstan.dist.baseline.neon @@ -4765,11 +4765,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 @@ -4785,11 +4780,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 @@ -4850,16 +4840,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 @@ -5045,11 +5025,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 @@ -5380,26 +5355,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 @@ -5790,11 +5745,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 @@ -6740,11 +6690,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 @@ -6981,18 +6926,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 - @@ -7055,11 +7000,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 @@ -7140,16 +7080,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 @@ -7250,31 +7180,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 @@ -7300,36 +7205,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 @@ -7355,31 +7235,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 @@ -7415,11 +7270,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 @@ -7655,11 +7505,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 @@ -7670,11 +7515,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 @@ -7690,11 +7530,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 @@ -7720,16 +7555,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 @@ -7815,86 +7640,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 @@ -8000,11 +7745,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 @@ -8025,11 +7765,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 @@ -8045,31 +7780,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 @@ -8085,46 +7800,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 @@ -8145,11 +7830,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 @@ -8170,11 +7850,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 @@ -8195,41 +7870,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 @@ -8291,15 +7936,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 @@ -8455,11 +8095,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 @@ -8830,21 +8465,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 @@ -8865,21 +8485,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 @@ -8910,26 +8515,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 @@ -8940,21 +8525,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 @@ -8970,11 +8545,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 @@ -8990,26 +8560,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 @@ -9030,11 +8580,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 @@ -9050,21 +8595,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 @@ -9085,11 +8620,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 @@ -9100,11 +8630,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 @@ -9150,96 +8675,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 @@ -9286,15 +8731,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 @@ -9380,11 +8820,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 @@ -9505,11 +8940,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/Payment/Model/Method/Abstract.php b/app/code/core/Mage/Payment/Model/Method/Abstract.php index 60e3d3bad46..4b1b138f1e2 100644 --- a/app/code/core/Mage/Payment/Model/Method/Abstract.php +++ b/app/code/core/Mage/Payment/Model/Method/Abstract.php @@ -371,12 +371,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 e2d8c725a1a..daac4a42c20 100644 --- a/app/code/core/Mage/Paypal/Model/Payflowlink.php +++ b/app/code/core/Mage/Paypal/Model/Payflowlink.php @@ -366,8 +366,7 @@ protected function _getOrderFromResponse() /** * Build request for getting token * - * @param Mage_Sales_Model_Order_Payment|Mage_Payment_Model_Info $payment - * @return Varien_Object + * @return Mage_Paypal_Model_Payflow_Request */ 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 10cc17289f1..b09c89c70bf 100644 --- a/app/code/core/Mage/Reports/Model/Resource/Helper/Interface.php +++ b/app/code/core/Mage/Reports/Model/Resource/Helper/Interface.php @@ -28,7 +28,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 1f7965ebd79..1e311e65008 100644 --- a/app/code/core/Mage/Sales/Model/Order/Payment.php +++ b/app/code/core/Mage/Sales/Model/Order/Payment.php @@ -434,7 +434,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 */ @@ -1252,7 +1252,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) { @@ -1414,7 +1414,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 */ @@ -1480,7 +1480,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 */ @@ -1519,7 +1519,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 d0a0b2c6c7b..06b3b658a78 100644 --- a/app/code/core/Mage/SalesRule/Model/Quote/Discount.php +++ b/app/code/core/Mage/SalesRule/Model/Quote/Discount.php @@ -135,7 +135,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 85215ee747e..30a20d2f31c 100644 --- a/app/code/core/Mage/Weee/Helper/Data.php +++ b/app/code/core/Mage/Weee/Helper/Data.php @@ -171,7 +171,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 @@ -221,7 +221,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 */ @@ -301,7 +301,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 36e8b4d8e18..7ee65604352 100644 --- a/app/code/core/Mage/Weee/Model/Tax.php +++ b/app/code/core/Mage/Weee/Model/Tax.php @@ -149,7 +149,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 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 */ ?>