diff --git a/.github/phpstan-baseline.neon b/.github/phpstan-baseline.neon
index 822de5e2efe..a09c2cbf013 100644
--- a/.github/phpstan-baseline.neon
+++ b/.github/phpstan-baseline.neon
@@ -125,26 +125,11 @@ parameters:
 			count: 1
 			path: ../app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Gallery.php
 
-		-
-			message: "#^Method Mage_Adminhtml_Block_Catalog_Product_Helper_Form_Price\\:\\:getEscapedValue\\(\\) should return string but returns null\\.$#"
-			count: 1
-			path: ../app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Price.php
-
 		-
 			message: "#^PHPDoc type Mage_Core_Model_Abstract of property Mage_Adminhtml_Block_Customer_Edit_Renderer_Region\\:\\:\\$_factory is not covariant with PHPDoc type Mage_Core_Model_Factory of overridden property Mage_Core_Block_Abstract\\:\\:\\$_factory\\.$#"
 			count: 1
 			path: ../app/code/core/Mage/Adminhtml/Block/Customer/Edit/Renderer/Region.php
 
-		-
-			message: "#^Method Mage_Adminhtml_Block_Customer_Edit_Tab_Newsletter_Grid_Filter_Status\\:\\:getCondition\\(\\) should return array but returns null\\.$#"
-			count: 1
-			path: ../app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter/Grid/Filter/Status.php
-
-		-
-			message: "#^Method Mage_Adminhtml_Block_Customer_Edit_Tab_View\\:\\:getCreateDate\\(\\) should return string but returns null\\.$#"
-			count: 1
-			path: ../app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View.php
-
 		-
 			message: "#^Property Mage_Adminhtml_Block_Customer_Edit_Tab_View_Sales\\:\\:\\$_collection \\(Mage_Sales_Model_Entity_Sale_Collection\\) does not accept Varien_Data_Collection_Db\\.$#"
 			count: 1
@@ -155,21 +140,6 @@ parameters:
 			count: 1
 			path: ../app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Wishlist.php
 
-		-
-			message: "#^Method Mage_Adminhtml_Block_Customer_Form_Element_File\\:\\:getEscapedValue\\(\\) should return string but returns false\\.$#"
-			count: 1
-			path: ../app/code/core/Mage/Adminhtml/Block/Customer/Form/Element/File.php
-
-		-
-			message: "#^Parameter \\#1 \\$index \\(int\\) of method Mage_Adminhtml_Block_Customer_Form_Element_File\\:\\:getEscapedValue\\(\\) should be compatible with parameter \\$index \\(string\\|null\\) of method Varien_Data_Form_Element_Abstract\\:\\:getEscapedValue\\(\\)$#"
-			count: 1
-			path: ../app/code/core/Mage/Adminhtml/Block/Customer/Form/Element/File.php
-
-		-
-			message: "#^Method Mage_Adminhtml_Block_Customer_Form_Element_Image\\:\\:_getPreviewUrl\\(\\) should return string but returns false\\.$#"
-			count: 1
-			path: ../app/code/core/Mage/Adminhtml/Block/Customer/Form/Element/Image.php
-
 		-
 			message: "#^Method Mage_Adminhtml_Block_Customer_Sales_Order_Address_Form_Renderer_Vat\\:\\:getValidateButton\\(\\) should return Mage_Adminhtml_Block_Widget_Button but returns Mage_Core_Block_Abstract\\.$#"
 			count: 1
@@ -200,11 +170,6 @@ parameters:
 			count: 1
 			path: ../app/code/core/Mage/Adminhtml/Block/Dashboard/Graph.php
 
-		-
-			message: "#^Method Mage_Adminhtml_Block_Newsletter_Subscriber_Grid_Filter_Website\\:\\:getCondition\\(\\) should return array but returns null\\.$#"
-			count: 1
-			path: ../app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid/Filter/Website.php
-
 		-
 			message: "#^Variable \\$class might not be defined\\.$#"
 			count: 1
@@ -316,8 +281,8 @@ parameters:
 			path: ../app/code/core/Mage/Adminhtml/Block/Review/Grid.php
 
 		-
-			message: "#^Method Mage_Adminhtml_Block_Review_Grid_Filter_Type\\:\\:getCondition\\(\\) should return array but returns int\\.$#"
-			count: 3
+			message: "#^Return type \\(int\\) of method Mage_Adminhtml_Block_Review_Grid_Filter_Type\\:\\:getCondition\\(\\) should be compatible with return type \\(array\\|null\\) of method Mage_Adminhtml_Block_Widget_Grid_Column_Filter_Select\\:\\:getCondition\\(\\)$#"
+			count: 1
 			path: ../app/code/core/Mage/Adminhtml/Block/Review/Grid/Filter/Type.php
 
 		-
@@ -325,21 +290,6 @@ parameters:
 			count: 1
 			path: ../app/code/core/Mage/Adminhtml/Block/Review/Product/Grid.php
 
-		-
-			message: "#^Method Mage_Adminhtml_Block_Sales_Creditmemo_Grid\\:\\:getRowUrl\\(\\) should return string but returns false\\.$#"
-			count: 1
-			path: ../app/code/core/Mage/Adminhtml/Block/Sales/Creditmemo/Grid.php
-
-		-
-			message: "#^Method Mage_Adminhtml_Block_Sales_Invoice_Grid\\:\\:getRowUrl\\(\\) should return string but returns false\\.$#"
-			count: 1
-			path: ../app/code/core/Mage/Adminhtml/Block/Sales/Invoice/Grid.php
-
-		-
-			message: "#^Method Mage_Adminhtml_Block_Sales_Items_Abstract\\:\\:getColumnRenderer\\(\\) should return Mage_Core_Block_Abstract but returns false\\.$#"
-			count: 1
-			path: ../app/code/core/Mage/Adminhtml/Block/Sales/Items/Abstract.php
-
 		-
 			message: "#^Method Mage_Adminhtml_Block_Sales_Order_Create_Billing_Address\\:\\:getAddress\\(\\) should return Mage_Customer_Model_Address but returns Mage_Sales_Model_Quote_Address\\.$#"
 			count: 1
@@ -385,11 +335,6 @@ parameters:
 			count: 1
 			path: ../app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar.php
 
-		-
-			message: "#^Method Mage_Adminhtml_Block_Sales_Order_Create_Sidebar_Abstract\\:\\:canDisplay\\(\\) should return bool but returns int\\.$#"
-			count: 1
-			path: ../app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Abstract.php
-
 		-
 			message: "#^Method Mage_Catalog_Model_Resource_Product_Compare_Item_Collection\\:\\:useProductItem\\(\\) invoked with 1 parameter, 0 required\\.$#"
 			count: 1
@@ -420,11 +365,6 @@ parameters:
 			count: 1
 			path: ../app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/View/Items.php
 
-		-
-			message: "#^Method Mage_Adminhtml_Block_Sales_Order_Grid\\:\\:getRowUrl\\(\\) should return string but returns false\\.$#"
-			count: 1
-			path: ../app/code/core/Mage/Adminhtml/Block/Sales/Order/Grid.php
-
 		-
 			message: "#^Return type \\(Mage_Sales_Model_Order_Shipment\\) of method Mage_Adminhtml_Block_Sales_Order_Shipment_Create_Items\\:\\:getSource\\(\\) should be compatible with return type \\(Mage_Sales_Model_Order_Invoice\\) of method Mage_Adminhtml_Block_Sales_Items_Abstract\\:\\:getSource\\(\\)$#"
 			count: 1
@@ -510,11 +450,6 @@ parameters:
 			count: 2
 			path: ../app/code/core/Mage/Adminhtml/Block/System/Config/Form.php
 
-		-
-			message: "#^Method Mage_Adminhtml_Block_System_Config_Form_Fieldset\\:\\:_getCollapseState\\(\\) should return bool but returns int\\.$#"
-			count: 1
-			path: ../app/code/core/Mage/Adminhtml/Block/System/Config/Form/Fieldset.php
-
 		-
 			message: "#^Variable \\$attributes might not be defined\\.$#"
 			count: 1
@@ -530,11 +465,6 @@ parameters:
 			count: 1
 			path: ../app/code/core/Mage/Adminhtml/Block/System/Convert/Profile/Run.php
 
-		-
-			message: "#^Method Mage_Adminhtml_Block_System_Email_Template_Edit\\:\\:getEditMode\\(\\) should return bool but returns int\\|string\\.$#"
-			count: 1
-			path: ../app/code/core/Mage/Adminhtml/Block/System/Email/Template/Edit.php
-
 		-
 			message: "#^Method Mage_Adminhtml_Block_System_Email_Template_Edit\\:\\:getUsedCurrentlyForPaths\\(\\) should return string but returns array\\.$#"
 			count: 1
@@ -545,11 +475,6 @@ parameters:
 			count: 1
 			path: ../app/code/core/Mage/Adminhtml/Block/System/Email/Template/Edit.php
 
-		-
-			message: "#^Method Mage_Adminhtml_Block_System_Email_Template_Grid_Filter_Type\\:\\:getCondition\\(\\) should return array but returns null\\.$#"
-			count: 1
-			path: ../app/code/core/Mage/Adminhtml/Block/System/Email/Template/Grid/Filter/Type.php
-
 		-
 			message: "#^Method Mage_Core_Model_Email_Template\\:\\:getProcessedTemplate\\(\\) invoked with 2 parameters, 0\\-1 required\\.$#"
 			count: 1
@@ -610,16 +535,6 @@ parameters:
 			count: 15
 			path: ../app/code/core/Mage/Adminhtml/Block/System/Store/Edit/Form.php
 
-		-
-			message: "#^Method Mage_Adminhtml_Block_System_Store_Grid_Render_Group\\:\\:render\\(\\) should return string but returns null\\.$#"
-			count: 1
-			path: ../app/code/core/Mage/Adminhtml/Block/System/Store/Grid/Render/Group.php
-
-		-
-			message: "#^Method Mage_Adminhtml_Block_System_Store_Grid_Render_Store\\:\\:render\\(\\) should return string but returns null\\.$#"
-			count: 1
-			path: ../app/code/core/Mage/Adminhtml/Block/System/Store/Grid/Render/Store.php
-
 		-
 			message: "#^Call to an undefined method Mage_Tag_Model_Resource_Tag_Collection\\:\\:addAttributeToFilter\\(\\)\\.$#"
 			count: 1
@@ -630,21 +545,11 @@ parameters:
 			count: 1
 			path: ../app/code/core/Mage/Adminhtml/Block/Tax/Rate/Grid/Renderer/Data.php
 
-		-
-			message: "#^Method Mage_Adminhtml_Block_Urlrewrite_Category_Tree\\:\\:getTreeArray\\(\\) should return array but returns string\\.$#"
-			count: 1
-			path: ../app/code/core/Mage/Adminhtml/Block/Urlrewrite/Category/Tree.php
-
 		-
 			message: "#^Variable \\$category in empty\\(\\) always exists and is not falsy\\.$#"
 			count: 1
 			path: ../app/code/core/Mage/Adminhtml/Block/Urlrewrite/Category/Tree.php
 
-		-
-			message: "#^Method Mage_Adminhtml_Block_Urlrewrite_Selector\\:\\:getSelectorLabel\\(\\) should return array but returns string\\.$#"
-			count: 1
-			path: ../app/code/core/Mage/Adminhtml/Block/Urlrewrite/Selector.php
-
 		-
 			message: "#^Method Mage_Adminhtml_Block_Widget_Container\\:\\:_addButtonChildBlock\\(\\) should return Mage_Adminhtml_Block_Widget_Button but returns Mage_Core_Block_Abstract\\|false\\.$#"
 			count: 1
@@ -685,26 +590,11 @@ parameters:
 			count: 1
 			path: ../app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Datetime.php
 
-		-
-			message: "#^Method Mage_Adminhtml_Block_Widget_Grid_Column_Filter_Select\\:\\:getCondition\\(\\) should return array but returns null\\.$#"
-			count: 1
-			path: ../app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Select.php
-
-		-
-			message: "#^Method Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Country\\:\\:render\\(\\) should return string but returns null\\.$#"
-			count: 1
-			path: ../app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Country.php
-
 		-
 			message: "#^Binary operation \"\\*\" between string and 1 results in an error\\.$#"
 			count: 1
 			path: ../app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Number.php
 
-		-
-			message: "#^Method Mage_Adminhtml_Block_Widget_Grid_Serializer\\:\\:getColumnInputNames\\(\\) should return array but returns string\\.$#"
-			count: 1
-			path: ../app/code/core/Mage/Adminhtml/Block/Widget/Grid/Serializer.php
-
 		-
 			message: "#^Call to an undefined method Mage_Adminhtml_Block_Widget_Tab_Interface\\:\\:getSkipGenerateContent\\(\\)\\.$#"
 			count: 1
@@ -760,11 +650,6 @@ parameters:
 			count: 1
 			path: ../app/code/core/Mage/Adminhtml/Model/Giftmessage/Save.php
 
-		-
-			message: "#^Method Mage_Adminhtml_Model_Sales_Order_Create\\:\\:_getQuoteItem\\(\\) should return Mage_Sales_Model_Quote_Item but returns false\\.$#"
-			count: 1
-			path: ../app/code/core/Mage/Adminhtml/Model/Sales/Order/Create.php
-
 		-
 			message: "#^Method Mage_Adminhtml_Model_Sales_Order_Create\\:\\:initFromOrderItem\\(\\) should return Mage_Sales_Model_Quote_Item\\|string but returns \\$this\\(Mage_Adminhtml_Model_Sales_Order_Create\\)\\.$#"
 			count: 2
@@ -835,11 +720,6 @@ parameters:
 			count: 1
 			path: ../app/code/core/Mage/Adminhtml/Model/System/Store.php
 
-		-
-			message: "#^Method Mage_Adminhtml_Catalog_CategoryController\\:\\:_initCategory\\(\\) should return Mage_Catalog_Model_Category but returns false\\.$#"
-			count: 1
-			path: ../app/code/core/Mage/Adminhtml/controllers/Catalog/CategoryController.php
-
 		-
 			message: "#^Argument of an invalid type string supplied for foreach, only iterables are supported\\.$#"
 			count: 1
@@ -890,11 +770,6 @@ parameters:
 			count: 1
 			path: ../app/code/core/Mage/Adminhtml/controllers/Permissions/VariableController.php
 
-		-
-			message: "#^Method Mage_Adminhtml_Promo_WidgetController\\:\\:_initCategory\\(\\) should return Mage_Catalog_Model_Category but returns false\\.$#"
-			count: 1
-			path: ../app/code/core/Mage/Adminhtml/controllers/Promo/WidgetController.php
-
 		-
 			message: "#^Cannot call method aggregate\\(\\) on Mage_Core_Model_Resource_Db_Collection_Abstract\\|false\\.$#"
 			count: 2
@@ -1170,11 +1045,6 @@ parameters:
 			count: 1
 			path: ../app/code/core/Mage/Api2/Model/Acl/Global/Rule/ResourcePermission.php
 
-		-
-			message: "#^Method Mage_Api2_Model_Acl_Global_Rule_Tree\\:\\:_getTreeNode\\(\\) should return array but returns null\\.$#"
-			count: 3
-			path: ../app/code/core/Mage/Api2/Model/Acl/Global/Rule/Tree.php
-
 		-
 			message: "#^Variable \\$operationName might not be defined\\.$#"
 			count: 2
@@ -1275,11 +1145,6 @@ parameters:
 			count: 1
 			path: ../app/code/core/Mage/Api2/Model/Route/ApiType.php
 
-		-
-			message: "#^Method Mage_Authorizenet_Block_Directpost_Form\\:\\:_toHtml\\(\\) should return string but returns null\\.$#"
-			count: 1
-			path: ../app/code/core/Mage/Authorizenet/Block/Directpost/Form.php
-
 		-
 			message: "#^Call to an undefined method Varien_Object\\:\\:decrypt\\(\\)\\.$#"
 			count: 1
@@ -1350,11 +1215,6 @@ parameters:
 			count: 1
 			path: ../app/code/core/Mage/Backup/Model/Resource/Db.php
 
-		-
-			message: "#^Method Mage_Backup_Model_Resource_Helper_Mysql4\\:\\:getTableCreateSql\\(\\) should return string but returns false\\.$#"
-			count: 1
-			path: ../app/code/core/Mage/Backup/Model/Resource/Helper/Mysql4.php
-
 		-
 			message: "#^Parameter \\#1 \\$elementId \\(string\\) of method Mage_Bundle_Block_Adminhtml_Catalog_Product_Composite_Fieldset_Options_Type_Checkbox\\:\\:setValidationContainer\\(\\) should be compatible with parameter \\$elementId \\(int\\) of method Mage_Bundle_Block_Catalog_Product_View_Type_Bundle_Option\\:\\:setValidationContainer\\(\\)$#"
 			count: 1
@@ -1460,11 +1320,6 @@ parameters:
 			count: 1
 			path: ../app/code/core/Mage/Bundle/Model/Price/Index.php
 
-		-
-			message: "#^Method Mage_Bundle_Model_Product_Attribute_Source_Price_View\\:\\:getOptionText\\(\\) should return string but returns false\\.$#"
-			count: 1
-			path: ../app/code/core/Mage/Bundle/Model/Product/Attribute/Source/Price/View.php
-
 		-
 			message: "#^Call to an undefined method Mage_Bundle_Model_Product_Price\\:\\:getPricesTierPrice\\(\\)\\.$#"
 			count: 2
@@ -1680,11 +1535,6 @@ parameters:
 			count: 2
 			path: ../app/code/core/Mage/Catalog/Block/Product/New.php
 
-		-
-			message: "#^Method Mage_Catalog_Block_Product_View_Media\\:\\:getGalleryImageUrl\\(\\) should return string but returns null\\.$#"
-			count: 1
-			path: ../app/code/core/Mage/Catalog/Block/Product/View/Media.php
-
 		-
 			message: "#^Method Mage_Catalog_Block_Product_View_Options_Type_Date\\:\\:_getValueWithLeadingZeros\\(\\) should return string but returns int\\.$#"
 			count: 1
@@ -1800,11 +1650,6 @@ parameters:
 			count: 3
 			path: ../app/code/core/Mage/Catalog/Helper/Product.php
 
-		-
-			message: "#^Method Mage_Catalog_Helper_Product\\:\\:getProductUrl\\(\\) should return string but returns false\\.$#"
-			count: 1
-			path: ../app/code/core/Mage/Catalog/Helper/Product.php
-
 		-
 			message: "#^Property Mage_Catalog_Helper_Product_Compare\\:\\:\\$_itemCollection \\(Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item_Collection\\) does not accept Mage_Catalog_Model_Resource_Product_Compare_Item_Collection\\.$#"
 			count: 1
@@ -1955,11 +1800,6 @@ parameters:
 			count: 1
 			path: ../app/code/core/Mage/Catalog/Model/Convert/Parser/Product.php
 
-		-
-			message: "#^Method Mage_Catalog_Model_Convert_Parser_Product\\:\\:getProductTypeId\\(\\) should return string but returns false\\.$#"
-			count: 1
-			path: ../app/code/core/Mage/Catalog/Model/Convert/Parser/Product.php
-
 		-
 			message: "#^Method Mage_Catalog_Model_Category\\:\\:getParentDesignCategory\\(\\) invoked with 1 parameter, 0 required\\.$#"
 			count: 1
@@ -2045,11 +1885,6 @@ parameters:
 			count: 1
 			path: ../app/code/core/Mage/Catalog/Model/Product.php
 
-		-
-			message: "#^Method Mage_Catalog_Model_Product\\:\\:getCategoryId\\(\\) should return int but returns false\\.$#"
-			count: 1
-			path: ../app/code/core/Mage/Catalog/Model/Product.php
-
 		-
 			message: "#^Method Mage_Catalog_Model_Product\\:\\:getDefaultAttributeSetId\\(\\) should return int but returns string\\|null\\.$#"
 			count: 1
@@ -2110,16 +1945,6 @@ parameters:
 			count: 1
 			path: ../app/code/core/Mage/Catalog/Model/Product/Attribute/Media/Api/V2.php
 
-		-
-			message: "#^Method Mage_Catalog_Model_Product_Attribute_Tierprice_Api\\:\\:prepareTierPrices\\(\\) should return array but returns null\\.$#"
-			count: 1
-			path: ../app/code/core/Mage/Catalog/Model/Product/Attribute/Tierprice/Api.php
-
-		-
-			message: "#^Method Mage_Catalog_Model_Product_Attribute_Tierprice_Api_V2\\:\\:prepareTierPrices\\(\\) should return array but returns null\\.$#"
-			count: 1
-			path: ../app/code/core/Mage/Catalog/Model/Product/Attribute/Tierprice/Api/V2.php
-
 		-
 			message: "#^Method Mage_Catalog_Model_Resource_Product_Compare_Item\\:\\:clean\\(\\) invoked with 1 parameter, 0 required\\.$#"
 			count: 1
@@ -2200,11 +2025,6 @@ parameters:
 			count: 1
 			path: ../app/code/core/Mage/Catalog/Model/Product/Type/Configurable/Price.php
 
-		-
-			message: "#^Method Mage_Catalog_Model_Product_Type_Price\\:\\:getFormatedTierPrice\\(\\) should return array\\|float but returns string\\.$#"
-			count: 1
-			path: ../app/code/core/Mage/Catalog/Model/Product/Type/Price.php
-
 		-
 			message: "#^Call to an undefined method Mage_Eav_Model_Entity_Attribute_Abstract\\:\\:isScopeStore\\(\\)\\.$#"
 			count: 2
@@ -2440,11 +2260,6 @@ parameters:
 			count: 1
 			path: ../app/code/core/Mage/Catalog/Model/Resource/Product/Compare/Item.php
 
-		-
-			message: "#^Method Mage_Catalog_Model_Resource_Product_Flat\\:\\:getAttributeSortColumn\\(\\) should return string but returns null\\.$#"
-			count: 1
-			path: ../app/code/core/Mage/Catalog/Model/Resource/Product/Flat.php
-
 		-
 			message: "#^Method Mage_Catalog_Model_Resource_Product_Flat\\:\\:getTypeId\\(\\) should return int but returns string\\|null\\.$#"
 			count: 1
@@ -2655,11 +2470,6 @@ parameters:
 			count: 1
 			path: ../app/code/core/Mage/CatalogRule/Model/Rule.php
 
-		-
-			message: "#^Method Mage_CatalogSearch_Block_Advanced_Form\\:\\:getSearchableAttributes\\(\\) should return Varien_Data_Collection_Db but returns array\\.$#"
-			count: 1
-			path: ../app/code/core/Mage/CatalogSearch/Block/Advanced/Form.php
-
 		-
 			message: "#^Method Mage_Eav_Model_Entity_Attribute_Source_Interface\\:\\:getAllOptions\\(\\) invoked with 1 parameter, 0 required\\.$#"
 			count: 1
@@ -2680,11 +2490,6 @@ parameters:
 			count: 2
 			path: ../app/code/core/Mage/CatalogSearch/Block/Term.php
 
-		-
-			message: "#^Method Mage_CatalogSearch_Model_Advanced\\:\\:getAttributes\\(\\) should return array but returns Mage_Catalog_Model_Resource_Product_Attribute_Collection\\.$#"
-			count: 1
-			path: ../app/code/core/Mage/CatalogSearch/Model/Advanced.php
-
 		-
 			message: "#^Method Mage_CatalogSearch_Model_Advanced\\:\\:getProductCollection\\(\\) should return Mage_CatalogSearch_Model_Resource_Advanced_Collection but returns array\\|float\\|int\\|string\\|false\\|null\\.$#"
 			count: 1
@@ -2710,11 +2515,6 @@ parameters:
 			count: 1
 			path: ../app/code/core/Mage/CatalogSearch/Model/Resource/Fulltext/Collection.php
 
-		-
-			message: "#^Method Mage_CatalogSearch_Model_Resource_Search_Collection\\:\\:_getSearchInOptionSql\\(\\) should return string but returns false\\.$#"
-			count: 2
-			path: ../app/code/core/Mage/CatalogSearch/Model/Resource/Search/Collection.php
-
 		-
 			message: "#^Cannot call method setItem\\(\\) on array\\.$#"
 			count: 1
@@ -2770,21 +2570,11 @@ parameters:
 			count: 1
 			path: ../app/code/core/Mage/Checkout/Model/Cart/Api.php
 
-		-
-			message: "#^Method Mage_Checkout_Model_Cart_Customer_Api\\:\\:_prepareCustomerAddressData\\(\\) should return array but returns null\\.$#"
-			count: 1
-			path: ../app/code/core/Mage/Checkout/Model/Cart/Customer/Api.php
-
 		-
 			message: "#^Variable \\$customer might not be defined\\.$#"
 			count: 4
 			path: ../app/code/core/Mage/Checkout/Model/Cart/Customer/Api.php
 
-		-
-			message: "#^Method Mage_Checkout_Model_Cart_Customer_Api_V2\\:\\:_prepareCustomerAddressData\\(\\) should return array but returns null\\.$#"
-			count: 1
-			path: ../app/code/core/Mage/Checkout/Model/Cart/Customer/Api/V2.php
-
 		-
 			message: "#^Parameter \\#1 \\$data \\(object\\) of method Mage_Checkout_Model_Cart_Customer_Api_V2\\:\\:_prepareCustomerAddressData\\(\\) should be compatible with parameter \\$data \\(array\\) of method Mage_Checkout_Model_Cart_Customer_Api\\:\\:_prepareCustomerAddressData\\(\\)$#"
 			count: 1
@@ -2840,6 +2630,11 @@ parameters:
 			count: 2
 			path: ../app/code/core/Mage/Checkout/Model/Type/Onepage.php
 
+		-
+			message: "#^Comparison operation \"\\=\\=\" between 0\\|0\\.0\\|array\\|string\\|false\\|null and 0 results in an error\\.$#"
+			count: 1
+			path: ../app/code/core/Mage/Checkout/controllers/CartController.php
+
 		-
 			message: "#^Call to an undefined method Mage_Sales_Model_Service_Order\\:\\:register\\(\\)\\.$#"
 			count: 1
@@ -2860,11 +2655,6 @@ parameters:
 			count: 1
 			path: ../app/code/core/Mage/Cms/Model/Wysiwyg/Images/Storage.php
 
-		-
-			message: "#^Method Mage_ConfigurableSwatches_Helper_Productimg\\:\\:_resizeSwatchImage\\(\\) should return string but returns false\\.$#"
-			count: 1
-			path: ../app/code/core/Mage/ConfigurableSwatches/Helper/Productimg.php
-
 		-
 			message: "#^Method Mage_Eav_Model_Entity_Attribute_Source_Interface\\:\\:getAllOptions\\(\\) invoked with 2 parameters, 0 required\\.$#"
 			count: 1
@@ -2905,11 +2695,6 @@ parameters:
 			count: 1
 			path: ../app/code/core/Mage/Core/Block/Abstract.php
 
-		-
-			message: "#^Method Mage_Core_Block_Abstract\\:\\:getCacheLifetime\\(\\) should return int but returns null\\.$#"
-			count: 1
-			path: ../app/code/core/Mage/Core/Block/Abstract.php
-
 		-
 			message: "#^Method Mage_Core_Block_Abstract\\:\\:getHelper\\(\\) should return \\$this\\(Mage_Core_Block_Abstract\\) but returns Mage_Core_Block_Abstract\\.$#"
 			count: 1
@@ -2930,11 +2715,6 @@ parameters:
 			count: 1
 			path: ../app/code/core/Mage/Core/Controller/Front/Router.php
 
-		-
-			message: "#^Method Mage_Core_Controller_Request_Http\\:\\:getHttpHost\\(\\) should return string but returns false\\.$#"
-			count: 1
-			path: ../app/code/core/Mage/Core/Controller/Request/Http.php
-
 		-
 			message: "#^Call to an undefined method Varien_Simplexml_Element\\:\\:is\\(\\)\\.$#"
 			count: 1
@@ -3000,16 +2780,6 @@ parameters:
 			count: 1
 			path: ../app/code/core/Mage/Core/Helper/Abstract.php
 
-		-
-			message: "#^Method Mage_Core_Helper_Http\\:\\:getRemoteAddr\\(\\) should return string but returns false\\.$#"
-			count: 1
-			path: ../app/code/core/Mage/Core/Helper/Http.php
-
-		-
-			message: "#^Method Mage_Core_Helper_Http\\:\\:getServerAddr\\(\\) should return string but returns false\\.$#"
-			count: 1
-			path: ../app/code/core/Mage/Core/Helper/Http.php
-
 		-
 			message: "#^Property Mage_Core_Helper_String\\:\\:\\$_arrayHelper \\(Mage_Core_Helper_Array\\) does not accept Mage_Core_Helper_Abstract\\.$#"
 			count: 1
@@ -3080,11 +2850,6 @@ parameters:
 			count: 1
 			path: ../app/code/core/Mage/Core/Model/Config.php
 
-		-
-			message: "#^Method Mage_Core_Model_Config\\:\\:getVarDir\\(\\) should return string but returns false\\.$#"
-			count: 1
-			path: ../app/code/core/Mage/Core/Model/Config.php
-
 		-
 			message: "#^Property Varien_Simplexml_Config\\:\\:\\$_cacheChecksum \\(unknown_type\\) does not accept null\\.$#"
 			count: 1
@@ -3110,11 +2875,6 @@ parameters:
 			count: 1
 			path: ../app/code/core/Mage/Core/Model/Config.php
 
-		-
-			message: "#^Method Mage_Core_Model_Config_Element\\:\\:getClassName\\(\\) should return string but returns false\\.$#"
-			count: 1
-			path: ../app/code/core/Mage/Core/Model/Config/Element.php
-
 		-
 			message: "#^Method Mage_Core_Model_Cookie\\:\\:getHttponly\\(\\) should return bool but returns null\\.$#"
 			count: 1
@@ -3130,21 +2890,6 @@ parameters:
 			count: 1
 			path: ../app/code/core/Mage/Core/Model/Date.php
 
-		-
-			message: "#^Method Mage_Core_Model_Date\\:\\:gmtDate\\(\\) should return string but returns false\\.$#"
-			count: 1
-			path: ../app/code/core/Mage/Core/Model/Date.php
-
-		-
-			message: "#^Method Mage_Core_Model_Date\\:\\:gmtTimestamp\\(\\) should return int but returns false\\.$#"
-			count: 1
-			path: ../app/code/core/Mage/Core/Model/Date.php
-
-		-
-			message: "#^Method Mage_Core_Model_Date\\:\\:gmtTimestamp\\(\\) should return int but returns string\\.$#"
-			count: 1
-			path: ../app/code/core/Mage/Core/Model/Date.php
-
 		-
 			message: "#^Call to an undefined method Mage_Core_Model_Resource_Design\\:\\:validate\\(\\)\\.$#"
 			count: 1
@@ -3460,16 +3205,6 @@ parameters:
 			count: 1
 			path: ../app/code/core/Mage/Customer/Block/Form/Register.php
 
-		-
-			message: "#^Method Mage_Customer_Block_Form_Register\\:\\:getRegion\\(\\) should return int but returns null\\.$#"
-			count: 1
-			path: ../app/code/core/Mage/Customer/Block/Form/Register.php
-
-		-
-			message: "#^Method Mage_Customer_Block_Form_Register\\:\\:getRegion\\(\\) should return int but returns true\\.$#"
-			count: 2
-			path: ../app/code/core/Mage/Customer/Block/Form/Register.php
-
 		-
 			message: "#^Return type \\(int\\) of method Mage_Customer_Block_Form_Register\\:\\:getCountryId\\(\\) should be compatible with return type \\(string\\) of method Mage_Directory_Block_Data\\:\\:getCountryId\\(\\)$#"
 			count: 1
@@ -3515,11 +3250,6 @@ parameters:
 			count: 1
 			path: ../app/code/core/Mage/Customer/Model/Api2/Customer/Address.php
 
-		-
-			message: "#^Method Mage_Customer_Model_Api2_Customer_Rest_Customer_V1\\:\\:_retrieve\\(\\) should return array but return statement is missing\\.$#"
-			count: 1
-			path: ../app/code/core/Mage/Customer/Model/Api2/Customer/Rest/Customer/V1.php
-
 		-
 			message: "#^Method Mage_Eav_Model_Entity_Attribute_Source_Interface\\:\\:getAllOptions\\(\\) invoked with 1 parameter, 0 required\\.$#"
 			count: 1
@@ -3655,11 +3385,6 @@ parameters:
 			count: 1
 			path: ../app/code/core/Mage/Dataflow/Model/Convert/Action/Abstract.php
 
-		-
-			message: "#^Method Mage_Dataflow_Model_Convert_Adapter_Io\\:\\:getResource\\(\\) should return Varien_Io_Abstract but returns false\\.$#"
-			count: 1
-			path: ../app/code/core/Mage/Dataflow/Model/Convert/Adapter/Io.php
-
 		-
 			message: "#^Call to an undefined method Mage_Dataflow_Model_Convert_Container_Interface\\:\\:getName\\(\\)\\.$#"
 			count: 2
@@ -3715,11 +3440,6 @@ parameters:
 			count: 2
 			path: ../app/code/core/Mage/Dataflow/Model/Profile.php
 
-		-
-			message: "#^Method Mage_Directory_Helper_Data\\:\\:getCountriesWithStatesRequired\\(\\) should return array but returns string\\.$#"
-			count: 1
-			path: ../app/code/core/Mage/Directory/Helper/Data.php
-
 		-
 			message: "#^Property Mage_Directory_Helper_Data\\:\\:\\$_countryCollection \\(Mage_Directory_Model_Resource_Country_Collection\\) does not accept Mage_Core_Model_Resource_Db_Collection_Abstract\\.$#"
 			count: 1
@@ -3755,16 +3475,6 @@ parameters:
 			count: 1
 			path: ../app/code/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php
 
-		-
-			message: "#^Method Mage_Downloadable_Block_Catalog_Product_Samples\\:\\:getSamples\\(\\) should return array but returns Mage_Downloadable_Model_Resource_Sample_Collection\\.$#"
-			count: 1
-			path: ../app/code/core/Mage/Downloadable/Block/Catalog/Product/Samples.php
-
-		-
-			message: "#^Method Mage_Downloadable_Block_Customer_Products_List\\:\\:getRemainingDownloads\\(\\) should return string but returns \\(float\\|int\\)\\.$#"
-			count: 1
-			path: ../app/code/core/Mage/Downloadable/Block/Customer/Products/List.php
-
 		-
 			message: "#^Cannot call method streamRead\\(\\) on resource\\.$#"
 			count: 1
@@ -3835,11 +3545,6 @@ parameters:
 			count: 1
 			path: ../app/code/core/Mage/Eav/Model/Attribute.php
 
-		-
-			message: "#^Method Mage_Eav_Model_Attribute_Data_Abstract\\:\\:_applyInputFilter\\(\\) should return string but returns false\\.$#"
-			count: 1
-			path: ../app/code/core/Mage/Eav/Model/Attribute/Data/Abstract.php
-
 		-
 			message: "#^Method Mage_Eav_Model_Attribute_Data_Abstract\\:\\:setRequestScope\\(\\) should return string but returns \\$this\\(Mage_Eav_Model_Attribute_Data_Abstract\\)\\.$#"
 			count: 1
@@ -3860,11 +3565,6 @@ parameters:
 			count: 1
 			path: ../app/code/core/Mage/Eav/Model/Attribute/Data/File.php
 
-		-
-			message: "#^Method Mage_Eav_Model_Attribute_Data_File\\:\\:extractValue\\(\\) should return array\\|string but returns false\\.$#"
-			count: 1
-			path: ../app/code/core/Mage/Eav/Model/Attribute/Data/File.php
-
 		-
 			message: "#^Call to an undefined method Mage_Core_Model_Resource_Abstract\\:\\:getDefaultAttributes\\(\\)\\.$#"
 			count: 1
@@ -4015,16 +3715,6 @@ parameters:
 			count: 1
 			path: ../app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Abstract.php
 
-		-
-			message: "#^Method Mage_Eav_Model_Entity_Attribute_Backend_Datetime\\:\\:formatDate\\(\\) should return string but returns null\\.$#"
-			count: 1
-			path: ../app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Datetime.php
-
-		-
-			message: "#^Method Mage_Eav_Model_Entity_Attribute_Frontend_Abstract\\:\\:getInputRendererClass\\(\\) should return string but returns null\\.$#"
-			count: 1
-			path: ../app/code/core/Mage/Eav/Model/Entity/Attribute/Frontend/Abstract.php
-
 		-
 			message: "#^Variable \\$out in empty\\(\\) always exists and is not falsy\\.$#"
 			count: 1
@@ -4035,11 +3725,6 @@ parameters:
 			count: 1
 			path: ../app/code/core/Mage/Eav/Model/Entity/Attribute/Group.php
 
-		-
-			message: "#^Method Mage_Eav_Model_Entity_Attribute_Source_Boolean\\:\\:getOptionText\\(\\) should return string but returns false\\.$#"
-			count: 1
-			path: ../app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Boolean.php
-
 		-
 			message: "#^Call to an undefined method Mage_Eav_Model_Entity_Collection_Abstract\\:\\:getStoreId\\(\\)\\.$#"
 			count: 1
@@ -4095,16 +3780,6 @@ parameters:
 			count: 1
 			path: ../app/code/core/Mage/Eav/Model/Entity/Setup.php
 
-		-
-			message: "#^Method Mage_Eav_Model_Entity_Setup\\:\\:getAttributeId\\(\\) should return int but returns false\\.$#"
-			count: 1
-			path: ../app/code/core/Mage/Eav/Model/Entity/Setup.php
-
-		-
-			message: "#^Method Mage_Eav_Model_Entity_Setup\\:\\:getAttributeTable\\(\\) should return string but returns false\\.$#"
-			count: 1
-			path: ../app/code/core/Mage/Eav/Model/Entity/Setup.php
-
 		-
 			message: "#^Method Mage_Eav_Model_Entity_Setup\\:\\:getDefaultAttributeGroupId\\(\\) should return int but returns string\\.$#"
 			count: 1
@@ -4120,16 +3795,6 @@ parameters:
 			count: 2
 			path: ../app/code/core/Mage/Eav/Model/Entity/Setup.php
 
-		-
-			message: "#^Method Mage_Eav_Model_Entity_Type\\:\\:fetchNewIncrementId\\(\\) should return string but returns false\\.$#"
-			count: 1
-			path: ../app/code/core/Mage/Eav/Model/Entity/Type.php
-
-		-
-			message: "#^Method Mage_Eav_Model_Entity_Type\\:\\:getValueTablePrefix\\(\\) should return string but returns null\\.$#"
-			count: 1
-			path: ../app/code/core/Mage/Eav/Model/Entity/Type.php
-
 		-
 			message: "#^Method Mage_Eav_Model_Resource_Entity_Attribute\\:\\:_getMaxSortOrder\\(\\) should return int but returns string\\.$#"
 			count: 1
@@ -4595,26 +4260,11 @@ parameters:
 			count: 1
 			path: ../app/code/core/Mage/Log/Model/Aggregation.php
 
-		-
-			message: "#^Method Mage_Log_Model_Customer\\:\\:getLoginAtTimestamp\\(\\) should return int but returns null\\.$#"
-			count: 1
-			path: ../app/code/core/Mage/Log/Model/Customer.php
-
 		-
 			message: "#^Binary operation \"\\+\" between non\\-falsy\\-string and 1 results in an error\\.$#"
 			count: 2
 			path: ../app/code/core/Mage/Log/Model/Resource/Log.php
 
-		-
-			message: "#^Method Mage_Media_Model_File_Image\\:\\:_getReadAdapter\\(\\) should return Varien_Db_Adapter_Interface but returns false\\.$#"
-			count: 1
-			path: ../app/code/core/Mage/Media/Model/File/Image.php
-
-		-
-			message: "#^Method Mage_Media_Model_File_Image\\:\\:_getWriteAdapter\\(\\) should return Varien_Db_Adapter_Interface but returns false\\.$#"
-			count: 1
-			path: ../app/code/core/Mage/Media/Model/File/Image.php
-
 		-
 			message: "#^Method Mage_Media_Model_File_Image\\:\\:getImage\\(\\) should return bool\\|resource but returns GdImage\\.$#"
 			count: 1
@@ -4690,16 +4340,6 @@ parameters:
 			count: 1
 			path: ../app/code/core/Mage/Oauth/controllers/TokenController.php
 
-		-
-			message: "#^Method Mage_Page_Block_Html_Pager\\:\\:getNextJumpPage\\(\\) should return int but returns null\\.$#"
-			count: 2
-			path: ../app/code/core/Mage/Page/Block/Html/Pager.php
-
-		-
-			message: "#^Method Mage_Page_Block_Html_Pager\\:\\:getPreviousJumpPage\\(\\) should return int but returns null\\.$#"
-			count: 2
-			path: ../app/code/core/Mage/Page/Block/Html/Pager.php
-
 		-
 			message: "#^Variable \\$finish might not be defined\\.$#"
 			count: 1
@@ -4720,11 +4360,6 @@ parameters:
 			count: 1
 			path: ../app/code/core/Mage/Paygate/Block/Authorizenet/Form/Cc.php
 
-		-
-			message: "#^Method Mage_Paygate_Block_Authorizenet_Form_Cc\\:\\:getPartialAuthorizationConfirmationMessage\\(\\) should return string but returns false\\.$#"
-			count: 1
-			path: ../app/code/core/Mage/Paygate/Block/Authorizenet/Form/Cc.php
-
 		-
 			message: "#^Property Mage_Payment_Block_Info\\:\\:\\$_paymentSpecificInformation \\(Varien_Object\\) does not accept null\\.$#"
 			count: 1
@@ -4815,11 +4450,6 @@ parameters:
 			count: 1
 			path: ../app/code/core/Mage/Paypal/Block/Express/Review.php
 
-		-
-			message: "#^Method Mage_Paypal_Block_Express_Review\\:\\:getShippingAddress\\(\\) should return Mage_Sales_Model_Quote_Address but returns false\\.$#"
-			count: 1
-			path: ../app/code/core/Mage/Paypal/Block/Express/Review.php
-
 		-
 			message: "#^Return type \\(false\\) of method Mage_Paypal_Block_Hosted_Pro_Info\\:\\:getCcTypeName\\(\\) should be compatible with return type \\(string\\|null\\) of method Mage_Paypal_Block_Payment_Info\\:\\:getCcTypeName\\(\\)$#"
 			count: 1
@@ -4870,11 +4500,6 @@ parameters:
 			count: 1
 			path: ../app/code/core/Mage/Paypal/Controller/Express/Abstract.php
 
-		-
-			message: "#^Method Mage_Paypal_Helper_Data\\:\\:getElementBackendConfig\\(\\) should return string but returns false\\.$#"
-			count: 1
-			path: ../app/code/core/Mage/Paypal/Helper/Data.php
-
 		-
 			message: "#^Method Mage_Paypal_Model_Api_Abstract\\:\\:_exportLineItems\\(\\) should return bool but empty return statement found\\.$#"
 			count: 2
@@ -4990,11 +4615,6 @@ parameters:
 			count: 1
 			path: ../app/code/core/Mage/Paypal/Model/Ipn.php
 
-		-
-			message: "#^Method Mage_Paypal_Model_Payflowlink\\:\\:_getOrderFromResponse\\(\\) should return Mage_Sales_Model_Order but returns false\\.$#"
-			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
@@ -5005,11 +4625,6 @@ parameters:
 			count: 1
 			path: ../app/code/core/Mage/Paypal/Model/Payflowlink.php
 
-		-
-			message: "#^Method Mage_Paypal_Model_Payflowpro\\:\\:cancel\\(\\) should return \\$this\\(Mage_Paypal_Model_Payflowpro\\) but returns false\\.$#"
-			count: 1
-			path: ../app/code/core/Mage/Paypal/Model/Payflowpro.php
-
 		-
 			message: "#^Property Mage_Paypal_Model_Payflowpro\\:\\:\\$_centinelFieldMap \\(string\\) does not accept default value of type array\\<string, string\\>\\.$#"
 			count: 1
@@ -5785,11 +5400,6 @@ parameters:
 			count: 1
 			path: ../app/code/core/Mage/Sales/Model/Recurring/Profile.php
 
-		-
-			message: "#^Method Mage_Sales_Model_Resource_Order_Abstract\\:\\:getGridTable\\(\\) should return string but returns false\\.$#"
-			count: 1
-			path: ../app/code/core/Mage/Sales/Model/Resource/Order/Abstract.php
-
 		-
 			message: "#^Cannot call method updateOnRelatedRecordChanged\\(\\) on Mage_Core_Model_Resource_Db_Collection_Abstract\\|false\\.$#"
 			count: 1
@@ -5935,16 +5545,6 @@ parameters:
 			count: 1
 			path: ../app/code/core/Mage/Shipping/Model/Carrier/Pickup.php
 
-		-
-			message: "#^Method Mage_Shipping_Model_Carrier_Tablerate\\:\\:collectRates\\(\\) should return bool\\|Mage_Core_Model_Abstract but returns Mage_Shipping_Model_Rate_Result\\.$#"
-			count: 1
-			path: ../app/code/core/Mage/Shipping/Model/Carrier/Tablerate.php
-
-		-
-			message: "#^Method Mage_Shipping_Model_Carrier_Tablerate\\:\\:getCode\\(\\) should return array but returns string\\.$#"
-			count: 1
-			path: ../app/code/core/Mage/Shipping/Model/Carrier/Tablerate.php
-
 		-
 			message: "#^Method Mage_Shipping_Model_Carrier_Tablerate\\:\\:getRate\\(\\) should return Mage_Core_Model_Abstract but returns array\\|bool\\.$#"
 			count: 1
@@ -6035,11 +5635,6 @@ parameters:
 			count: 1
 			path: ../app/code/core/Mage/Tag/Model/Resource/Customer/Collection.php
 
-		-
-			message: "#^Method Mage_Tag_Model_Resource_Tag\\:\\:loadByName\\(\\) should return array\\|false but return statement is missing\\.$#"
-			count: 1
-			path: ../app/code/core/Mage/Tag/Model/Resource/Tag.php
-
 		-
 			message: "#^Variable \\$result might not be defined\\.$#"
 			count: 1
@@ -6085,11 +5680,6 @@ parameters:
 			count: 1
 			path: ../app/code/core/Mage/Tax/Model/Calculation/Rate.php
 
-		-
-			message: "#^Method Mage_Tax_Model_Class_Source_Product\\:\\:getOptionText\\(\\) should return string but returns false\\.$#"
-			count: 1
-			path: ../app/code/core/Mage/Tax/Model/Class/Source/Product.php
-
 		-
 			message: "#^Method Mage_Tax_Model_Config_Notification\\:\\:_getConfig\\(\\) should return Mage_Core_Model_Config_Data but returns bool\\|Mage_Core_Model_Abstract\\.$#"
 			count: 1
diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid/Filter/Inventory.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid/Filter/Inventory.php
index 0817059a142..88ee3b871bc 100644
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid/Filter/Inventory.php
+++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid/Filter/Inventory.php
@@ -28,6 +28,9 @@
  */
 class Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Super_Config_Grid_Filter_Inventory extends Mage_Adminhtml_Block_Widget_Grid_Column_Filter_Select
 {
+    /**
+     * @return array
+     */
     protected function _getOptions()
     {
         return [
diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Price.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Price.php
index da36b3f850a..4e11c9021bc 100644
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Price.php
+++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Price.php
@@ -28,12 +28,19 @@
  */
 class Mage_Adminhtml_Block_Catalog_Product_Helper_Form_Price extends Varien_Data_Form_Element_Text
 {
+    /**
+     * @param array $attributes
+     */
     public function __construct($attributes= [])
     {
         parent::__construct($attributes);
         $this->addClass('validate-zero-or-greater');
     }
 
+    /**
+     * @return string
+     * @throws Mage_Core_Model_Store_Exception
+     */
     public function getAfterElementHtml()
     {
         $html = parent::getAfterElementHtml();
@@ -61,6 +68,10 @@ public function getAfterElementHtml()
         return $html;
     }
 
+    /**
+     * @param $attribute
+     * @return string
+     */
     protected function _getTaxObservingCode($attribute)
     {
         $spanId = "dynamic-tax-{$attribute->getAttributeCode()}";
@@ -68,6 +79,10 @@ protected function _getTaxObservingCode($attribute)
         return "<script type='text/javascript'>if (dynamicTaxes == undefined) var dynamicTaxes = new Array(); dynamicTaxes[dynamicTaxes.length]='{$attribute->getAttributeCode()}'</script>";
     }
 
+    /**
+     * @param null $index
+     * @return string|null
+     */
     public function getEscapedValue($index=null)
     {
         $value = $this->getValue();
diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter/Grid/Filter/Status.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter/Grid/Filter/Status.php
index ac21a18db80..8d0fcd2998e 100644
--- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter/Grid/Filter/Status.php
+++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter/Grid/Filter/Status.php
@@ -43,6 +43,9 @@ public function __construct()
         parent::__construct();
     }
 
+    /**
+     * @return array
+     */
     protected function _getOptions()
     {
         $result = [];
@@ -53,9 +56,12 @@ protected function _getOptions()
         return $result;
     }
 
+    /**
+     * @return array|null
+     */
     public function getCondition()
     {
-        if(is_null($this->getValue())) {
+        if (is_null($this->getValue())) {
             return null;
         }
 
diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View.php
index 9ce5bbff02c..2d122dae673 100644
--- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View.php
+++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View.php
@@ -26,14 +26,18 @@
  * @package    Mage_Adminhtml
  * @author     Magento Core Team <core@magentocommerce.com>
  */
-class Mage_Adminhtml_Block_Customer_Edit_Tab_View
- extends Mage_Adminhtml_Block_Template
- implements Mage_Adminhtml_Block_Widget_Tab_Interface
+class Mage_Adminhtml_Block_Customer_Edit_Tab_View extends Mage_Adminhtml_Block_Template implements Mage_Adminhtml_Block_Widget_Tab_Interface
 {
+    /**
+     * @var Mage_Customer_Model_Customer
+     */
     protected $_customer;
 
     protected $_customerLog;
 
+    /**
+     * @return Mage_Customer_Model_Customer
+     */
     public function getCustomer()
     {
         if (!$this->_customer) {
@@ -42,6 +46,9 @@ public function getCustomer()
         return $this->_customer;
     }
 
+    /**
+     * @return string|void
+     */
     public function getGroupName()
     {
         if ($groupId = $this->getCustomer()->getGroupId()) {
@@ -68,20 +75,26 @@ public function getCustomerLog()
     /**
      * Get customer creation date
      *
-     * @return string
+     * @return string|null
      */
     public function getCreateDate()
     {
-        if ( ! $this->getCustomer()->getCreatedAt()) {
+        if (! $this->getCustomer()->getCreatedAt()) {
             return null;
         }
-        return $this->_getCoreHelper()->formatDate($this->getCustomer()->getCreatedAt(),
-            Mage_Core_Model_Locale::FORMAT_TYPE_MEDIUM, true);
+        return $this->_getCoreHelper()->formatDate(
+            $this->getCustomer()->getCreatedAt(),
+            Mage_Core_Model_Locale::FORMAT_TYPE_MEDIUM,
+            true
+        );
     }
 
+    /**
+     * @return string|null
+     */
     public function getStoreCreateDate()
     {
-        if ( ! $this->getCustomer()->getCreatedAt()) {
+        if (! $this->getCustomer()->getCreatedAt()) {
             return null;
         }
         $date = Mage::app()->getLocale()->storeDate(
@@ -112,6 +125,9 @@ public function getLastLoginDate()
         return Mage::helper('customer')->__('Never');
     }
 
+    /**
+     * @return string
+     */
     public function getStoreLastLoginDate()
     {
         if ($date = $this->getCustomerLog()->getLoginAtTimestamp()) {
@@ -131,6 +147,9 @@ public function getStoreLastLoginDateTimezone()
             ->getConfig(Mage_Core_Model_Locale::XML_PATH_DEFAULT_TIMEZONE);
     }
 
+    /**
+     * @return string
+     */
     public function getCurrentStatus()
     {
         $log = $this->getCustomerLog();
@@ -142,6 +161,9 @@ public function getCurrentStatus()
         return Mage::helper('customer')->__('Online');
     }
 
+    /**
+     * @return string
+     */
     public function getIsConfirmedStatus()
     {
         $this->getCustomer();
@@ -164,38 +186,55 @@ public function getStoreId()
         return $this->getCustomer()->getStoreId();
     }
 
+    /**
+     * @return string
+     */
     public function getBillingAddressHtml()
     {
         $html = '';
         if ($address = $this->getCustomer()->getPrimaryBillingAddress()) {
             $html = $address->format('html');
-        }
-        else {
+        } else {
             $html = Mage::helper('customer')->__('The customer does not have default billing address.');
         }
         return $html;
     }
 
+    /**
+     * @return string
+     */
     public function getAccordionHtml()
     {
         return $this->getChildHtml('accordion');
     }
 
+    /**
+     * @return string
+     */
     public function getSalesHtml()
     {
         return $this->getChildHtml('sales');
     }
 
+    /**
+     * @return string
+     */
     public function getTabLabel()
     {
         return Mage::helper('customer')->__('Customer View');
     }
 
+    /**
+     * @return string
+     */
     public function getTabTitle()
     {
         return Mage::helper('customer')->__('Customer View');
     }
 
+    /**
+     * @return bool
+     */
     public function canShowTab()
     {
         if (Mage::registry('current_customer')->getId()) {
@@ -204,6 +243,9 @@ public function canShowTab()
         return false;
     }
 
+    /**
+     * @return bool
+     */
     public function isHidden()
     {
         if (Mage::registry('current_customer')->getId()) {
diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Form/Element/File.php b/app/code/core/Mage/Adminhtml/Block/Customer/Form/Element/File.php
index cc48a24aea5..1b9f29a2e2a 100644
--- a/app/code/core/Mage/Adminhtml/Block/Customer/Form/Element/File.php
+++ b/app/code/core/Mage/Adminhtml/Block/Customer/Form/Element/File.php
@@ -188,8 +188,8 @@ protected function _drawElementHtml($element, array $attributes, $closed = true)
     /**
      * Return escaped value
      *
-     * @param int $index
-     * @return string
+     * @param string|null $index
+     * @return false|string
      */
     public function getEscapedValue($index = null)
     {
diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Form/Element/Image.php b/app/code/core/Mage/Adminhtml/Block/Customer/Form/Element/Image.php
index e5422721947..3b6de921a8c 100644
--- a/app/code/core/Mage/Adminhtml/Block/Customer/Form/Element/Image.php
+++ b/app/code/core/Mage/Adminhtml/Block/Customer/Form/Element/Image.php
@@ -80,7 +80,7 @@ protected function _getPreviewHtml()
 
     /**
      * Return Image URL
-     * @return string
+     * @return string|false
      */
     protected function _getPreviewUrl()
     {
diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid/Filter/Website.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid/Filter/Website.php
index 66d7eb297bc..f834066da36 100644
--- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid/Filter/Website.php
+++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid/Filter/Website.php
@@ -28,8 +28,14 @@
  */
 class Mage_Adminhtml_Block_Newsletter_Subscriber_Grid_Filter_Website extends Mage_Adminhtml_Block_Widget_Grid_Column_Filter_Select
 {
+    /**
+     * @var Mage_Core_Model_Resource_Website_Collection
+     */
     protected $_websiteCollection = null;
 
+    /**
+     * @return array[]
+     */
     protected function _getOptions()
     {
         $result = $this->getCollection()->toOptionArray();
@@ -37,9 +43,13 @@ protected function _getOptions()
         return $result;
     }
 
+    /**
+     * @return Mage_Core_Model_Resource_Website_Collection
+     * @throws Mage_Core_Exception
+     */
     public function getCollection()
     {
-        if(is_null($this->_websiteCollection)) {
+        if (is_null($this->_websiteCollection)) {
             $this->_websiteCollection = Mage::getResourceModel('core/website_collection')
                 ->load();
         }
@@ -49,11 +59,14 @@ public function getCollection()
         return $this->_websiteCollection;
     }
 
+    /**
+     * @return array|null
+     * @throws Mage_Core_Exception
+     */
     public function getCondition()
     {
-
         $id = $this->getValue();
-        if(!$id) {
+        if (!$id) {
             return null;
         }
 
diff --git a/app/code/core/Mage/Adminhtml/Block/Review/Grid/Filter/Type.php b/app/code/core/Mage/Adminhtml/Block/Review/Grid/Filter/Type.php
index 9ea09091f08..38f150a3cb8 100644
--- a/app/code/core/Mage/Adminhtml/Block/Review/Grid/Filter/Type.php
+++ b/app/code/core/Mage/Adminhtml/Block/Review/Grid/Filter/Type.php
@@ -28,6 +28,9 @@
  */
 class Mage_Adminhtml_Block_Review_Grid_Filter_Type extends Mage_Adminhtml_Block_Widget_Grid_Column_Filter_Select
 {
+    /**
+     * @return array
+     */
     protected function _getOptions()
     {
         return [
@@ -38,6 +41,9 @@ protected function _getOptions()
         ];
     }
 
+    /**
+     * @return int
+     */
     public function getCondition()
     {
         if ($this->getValue() == 1) {
diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Creditmemo/Grid.php b/app/code/core/Mage/Adminhtml/Block/Sales/Creditmemo/Grid.php
index 9528e85133c..f54c9ae1ac9 100644
--- a/app/code/core/Mage/Adminhtml/Block/Sales/Creditmemo/Grid.php
+++ b/app/code/core/Mage/Adminhtml/Block/Sales/Creditmemo/Grid.php
@@ -46,6 +46,10 @@ protected function _getCollectionClass()
         return 'sales/order_creditmemo_grid_collection';
     }
 
+    /**
+     * @inheritDoc
+     * @throws Exception
+     */
     protected function _prepareCollection()
     {
         $collection = Mage::getResourceModel($this->_getCollectionClass());
@@ -53,6 +57,10 @@ protected function _prepareCollection()
         return parent::_prepareCollection();
     }
 
+    /**
+     * @inheritDoc
+     * @throws Exception
+     */
     protected function _prepareColumns()
     {
         $this->addColumn('increment_id', [
@@ -100,7 +108,8 @@ protected function _prepareColumns()
             'currency'  => 'order_currency_code',
         ]);
 
-        $this->addColumn('action',
+        $this->addColumn(
+            'action',
             [
                 'header'    => Mage::helper('sales')->__('Action'),
                 'width'     => '50px',
@@ -116,7 +125,8 @@ protected function _prepareColumns()
                 'filter'    => false,
                 'sortable'  => false,
                 'is_system' => true
-            ]);
+            ]
+        );
 
         $this->addExportType('*/*/exportCsv', Mage::helper('sales')->__('CSV'));
         $this->addExportType('*/*/exportExcel', Mage::helper('sales')->__('Excel XML'));
@@ -124,6 +134,9 @@ protected function _prepareColumns()
         return parent::_prepareColumns();
     }
 
+    /**
+     * @return $this
+     */
     protected function _prepareMassaction()
     {
         $this->setMassactionIdField('entity_id');
@@ -138,19 +151,27 @@ protected function _prepareMassaction()
         return $this;
     }
 
+    /**
+     * @param Mage_Sales_Model_Order_Creditmemo $row
+     * @return false|string
+     */
     public function getRowUrl($row)
     {
         if (!Mage::getSingleton('admin/session')->isAllowed('sales/order/creditmemo')) {
             return false;
         }
 
-        return $this->getUrl('*/sales_creditmemo/view',
+        return $this->getUrl(
+            '*/sales_creditmemo/view',
             [
                 'creditmemo_id'=> $row->getId(),
             ]
         );
     }
 
+    /**
+     * @return string
+     */
     public function getGridUrl()
     {
         return $this->getUrl('*/*/*', ['_current' => true]);
diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Invoice/Grid.php b/app/code/core/Mage/Adminhtml/Block/Sales/Invoice/Grid.php
index 1df292875ac..c68a1f73823 100644
--- a/app/code/core/Mage/Adminhtml/Block/Sales/Invoice/Grid.php
+++ b/app/code/core/Mage/Adminhtml/Block/Sales/Invoice/Grid.php
@@ -48,6 +48,10 @@ protected function _getCollectionClass()
         return 'sales/order_invoice_grid_collection';
     }
 
+    /**
+     * @inheritDoc
+     * @throws Exception
+     */
     protected function _prepareCollection()
     {
         $collection = Mage::getResourceModel($this->_getCollectionClass());
@@ -55,6 +59,10 @@ protected function _prepareCollection()
         return parent::_prepareCollection();
     }
 
+    /**
+     * @inheritDoc
+     * @throws Exception
+     */
     protected function _prepareColumns()
     {
         $this->addColumn('increment_id', [
@@ -102,7 +110,8 @@ protected function _prepareColumns()
             'currency'  => 'order_currency_code',
         ]);
 
-        $this->addColumn('action',
+        $this->addColumn(
+            'action',
             [
                 'header'    => Mage::helper('sales')->__('Action'),
                 'width'     => '50px',
@@ -118,7 +127,8 @@ protected function _prepareColumns()
                 'filter'    => false,
                 'sortable'  => false,
                 'is_system' => true
-            ]);
+            ]
+        );
 
         $this->addExportType('*/*/exportCsv', Mage::helper('sales')->__('CSV'));
         $this->addExportType('*/*/exportExcel', Mage::helper('sales')->__('Excel XML'));
@@ -126,6 +136,9 @@ protected function _prepareColumns()
         return parent::_prepareColumns();
     }
 
+    /**
+     * @return $this
+     */
     protected function _prepareMassaction()
     {
         $this->setMassactionIdField('entity_id');
@@ -140,19 +153,27 @@ protected function _prepareMassaction()
         return $this;
     }
 
+    /**
+     * @param Mage_Sales_Model_Order_Invoice $row
+     * @return false|string
+     */
     public function getRowUrl($row)
     {
         if (!Mage::getSingleton('admin/session')->isAllowed('sales/order/invoice')) {
             return false;
         }
 
-        return $this->getUrl('*/sales_invoice/view',
+        return $this->getUrl(
+            '*/sales_invoice/view',
             [
                 'invoice_id'=> $row->getId(),
             ]
         );
     }
 
+    /**
+     * @return string
+     */
     public function getGridUrl()
     {
         return $this->getUrl('*/*/grid', ['_current' => true]);
diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Items/Abstract.php b/app/code/core/Mage/Adminhtml/Block/Sales/Items/Abstract.php
index 655e8ec44d6..35077383124 100644
--- a/app/code/core/Mage/Adminhtml/Block/Sales/Items/Abstract.php
+++ b/app/code/core/Mage/Adminhtml/Block/Sales/Items/Abstract.php
@@ -132,7 +132,7 @@ public function getItemRenderer($type)
      *
      * @param string $column
      * @param string $compositePart
-     * @return Mage_Core_Block_Abstract
+     * @return false|Mage_Core_Block_Abstract
      */
     public function getColumnRenderer($column, $compositePart='')
     {
diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Abstract.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Abstract.php
index 69e9fef2b5f..d27de1f35b6 100644
--- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Abstract.php
+++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Abstract.php
@@ -48,13 +48,16 @@ public function getSidebarStorageAction()
     /**
      * Retrieve display block availability
      *
-     * @return bool
+     * @return int
      */
     public function canDisplay()
     {
         return $this->getCustomerId();
     }
 
+    /**
+     * @return bool
+     */
     public function canDisplayItemQty()
     {
         return false;
@@ -138,12 +141,12 @@ public function getItems()
             /*
              * Filtering items by allowed product type
              */
-            foreach($items as $key => $item) {
+            foreach ($items as $key => $item) {
                 if ($item instanceof Mage_Catalog_Model_Product) {
                     $type = $item->getTypeId();
-                } else if ($item instanceof Mage_Sales_Model_Order_Item) {
+                } elseif ($item instanceof Mage_Sales_Model_Order_Item) {
                     $type = $item->getProductType();
-                } else if ($item instanceof Mage_Sales_Model_Quote_Item) {
+                } elseif ($item instanceof Mage_Sales_Model_Quote_Item) {
                     $type = $item->getProductType();
                 } else {
                     $type = '';
@@ -174,6 +177,9 @@ public function getItemCollection()
         return false;
     }
 
+    /**
+     * @return bool
+     */
     public function canDisplayPrice()
     {
         return true;
diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Reorder.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Reorder.php
index b102f81b569..7fb3f904c87 100644
--- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Reorder.php
+++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Reorder.php
@@ -42,6 +42,9 @@ protected function _construct()
         $this->setDataId('reorder');
     }
 
+    /**
+     * @return string
+     */
     public function getHeaderText()
     {
         return Mage::helper('sales')->__('Last Ordered Items');
@@ -86,16 +89,25 @@ public function getItemCollection()
         return false;
     }
 
+    /**
+     * @return false
+     */
     public function canDisplayItemQty()
     {
         return false;
     }
 
+    /**
+     * @return false
+     */
     public function canRemoveItems()
     {
         return false;
     }
 
+    /**
+     * @return false
+     */
     public function canDisplayPrice()
     {
         return false;
diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Viewed.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Viewed.php
index 0ef15c872b7..3cbc37629ae 100644
--- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Viewed.php
+++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Viewed.php
@@ -37,7 +37,7 @@ protected function _construct()
     /**
      * Retrieve display block availability
      *
-     * @return bool
+     * @return int|false
      */
     public function canDisplay()
     {
@@ -47,13 +47,16 @@ public function canDisplay()
     /**
      * Retrieve availability removing items in block
      *
-     * @return bool
+     * @return false
      */
     public function canRemoveItems()
     {
         return false;
     }
 
+    /**
+     * @return string
+     */
     public function getHeaderText()
     {
         return Mage::helper('sales')->__('Recently Viewed');
diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Wishlist.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Wishlist.php
index 36ebe8b1a5d..1cab53c5842 100644
--- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Wishlist.php
+++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Wishlist.php
@@ -26,8 +26,7 @@
  * @package    Mage_Adminhtml
  * @author     Magento Core Team <core@magentocommerce.com>
  */
-class Mage_Adminhtml_Block_Sales_Order_Create_Sidebar_Wishlist
-    extends Mage_Adminhtml_Block_Sales_Order_Create_Sidebar_Abstract
+class Mage_Adminhtml_Block_Sales_Order_Create_Sidebar_Wishlist extends Mage_Adminhtml_Block_Sales_Order_Create_Sidebar_Abstract
 {
     /**
      * Storage action on selected item
@@ -43,6 +42,9 @@ protected function _construct()
         $this->setDataId('wishlist');
     }
 
+    /**
+     * @return string
+     */
     public function getHeaderText()
     {
         return Mage::helper('sales')->__('Wishlist');
@@ -106,7 +108,7 @@ public function getIdentifierId($item)
     }
 
     /**
-     * @inheritDoc
+     * @return false|int
      */
     public function canDisplay()
     {
diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Grid.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Grid.php
index 357a32f3d7b..b47e370b0a7 100644
--- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Grid.php
+++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Grid.php
@@ -48,6 +48,10 @@ protected function _getCollectionClass()
         return 'sales/order_grid_collection';
     }
 
+    /**
+     * @inheritDoc
+     * @throws Exception
+     */
     protected function _prepareCollection()
     {
         $collection = Mage::getResourceModel($this->_getCollectionClass());
@@ -55,9 +59,12 @@ protected function _prepareCollection()
         return parent::_prepareCollection();
     }
 
+    /**
+     * @inheritDoc
+     * @throws Mage_Core_Model_Store_Exception
+     */
     protected function _prepareColumns()
     {
-
         $this->addColumn('real_order_id', [
             'header' => Mage::helper('sales')->__('Order #'),
             'width'  => '100px',
@@ -116,7 +123,8 @@ protected function _prepareColumns()
         ]);
 
         if (Mage::getSingleton('admin/session')->isAllowed('sales/order/actions/view')) {
-            $this->addColumn('action',
+            $this->addColumn(
+                'action',
                 [
                     'header'    => Mage::helper('sales')->__('Action'),
                     'width'     => '50px',
@@ -134,7 +142,8 @@ protected function _prepareColumns()
                     'sortable'  => false,
                     'index'     => 'stores',
                     'is_system' => true,
-                ]);
+                ]
+            );
         }
         $this->addRssList('rss/order/new', Mage::helper('sales')->__('New Order RSS'));
 
@@ -144,6 +153,9 @@ protected function _prepareColumns()
         return parent::_prepareColumns();
     }
 
+    /**
+     * @return $this
+     */
     protected function _prepareMassaction()
     {
         $this->setMassactionIdField('entity_id');
@@ -199,6 +211,10 @@ protected function _prepareMassaction()
         return $this;
     }
 
+    /**
+     * @param Mage_Sales_Model_Order $row
+     * @return false|string
+     */
     public function getRowUrl($row)
     {
         if (Mage::getSingleton('admin/session')->isAllowed('sales/order/actions/view')) {
@@ -207,6 +223,9 @@ public function getRowUrl($row)
         return false;
     }
 
+    /**
+     * @return string
+     */
     public function getGridUrl()
     {
         return $this->getUrl('*/*/grid', ['_current'=>true]);
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Fieldset.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Fieldset.php
index c1fc06aeb21..a9fc8e826cf 100644
--- a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Fieldset.php
+++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Fieldset.php
@@ -192,7 +192,7 @@ protected function _getExtraJs($element, $tooltipsExist = false)
      * Collapsed or expanded fieldset when page loaded?
      *
      * @param Varien_Data_Form_Element_Abstract $element
-     * @return bool
+     * @return int|bool
      */
     protected function _getCollapseState($element)
     {
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Edit.php b/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Edit.php
index 258945e5d2a..3f0db3ce422 100644
--- a/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Edit.php
+++ b/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Edit.php
@@ -189,7 +189,7 @@ public function getLoadButtonHtml()
     /**
      * Return edit flag for block
      *
-     * @return bool
+     * @return int|string
      */
     public function getEditMode()
     {
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Grid/Filter/Type.php b/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Grid/Filter/Type.php
index 4e066d10b4f..d6d86895a3a 100644
--- a/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Grid/Filter/Type.php
+++ b/app/code/core/Mage/Adminhtml/Block/System/Email/Template/Grid/Filter/Type.php
@@ -26,8 +26,7 @@
  * @package    Mage_Adminhtml
  * @author     Magento Core Team <core@magentocommerce.com>
  */
-class Mage_Adminhtml_Block_System_Email_Template_Grid_Filter_Type
-    extends Mage_Adminhtml_Block_Widget_Grid_Column_Filter_Select
+class Mage_Adminhtml_Block_System_Email_Template_Grid_Filter_Type extends Mage_Adminhtml_Block_Widget_Grid_Column_Filter_Select
 {
     protected static $_types = [
         null                                        =>  null,
@@ -35,6 +34,9 @@ class Mage_Adminhtml_Block_System_Email_Template_Grid_Filter_Type
         Mage_Newsletter_Model_Template::TYPE_TEXT   => 'Text',
     ];
 
+    /**
+     * @return array
+     */
     protected function _getOptions()
     {
         $result = [];
@@ -45,9 +47,12 @@ protected function _getOptions()
         return $result;
     }
 
+    /**
+     * @return array|null
+     */
     public function getCondition()
     {
-        if(is_null($this->getValue())) {
+        if (is_null($this->getValue())) {
             return null;
         }
 
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Store/Grid/Render/Group.php b/app/code/core/Mage/Adminhtml/Block/System/Store/Grid/Render/Group.php
index 59a0d1d5c14..00e9bc4b8a1 100644
--- a/app/code/core/Mage/Adminhtml/Block/System/Store/Grid/Render/Group.php
+++ b/app/code/core/Mage/Adminhtml/Block/System/Store/Grid/Render/Group.php
@@ -27,9 +27,12 @@
  * @author     Magento Core Team <core@magentocommerce.com>
  * @deprecated after 1.13.1.0 use Mage_Adminhtml_Block_System_Store_Tree
  */
-class Mage_Adminhtml_Block_System_Store_Grid_Render_Group
-    extends Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Abstract
+class Mage_Adminhtml_Block_System_Store_Grid_Render_Group extends Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Abstract
 {
+    /**
+     * @param Varien_Object $row
+     * @return string|null
+     */
     public function render(Varien_Object $row)
     {
         if (!$row->getData($this->getColumn()->getIndex())) {
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Store/Grid/Render/Store.php b/app/code/core/Mage/Adminhtml/Block/System/Store/Grid/Render/Store.php
index b9468334cd0..c06cf41e23c 100644
--- a/app/code/core/Mage/Adminhtml/Block/System/Store/Grid/Render/Store.php
+++ b/app/code/core/Mage/Adminhtml/Block/System/Store/Grid/Render/Store.php
@@ -27,9 +27,12 @@
  * @author     Magento Core Team <core@magentocommerce.com>
  * @deprecated after 1.13.1.0 use Mage_Adminhtml_Block_System_Store_Tree
  */
-class Mage_Adminhtml_Block_System_Store_Grid_Render_Store
-    extends Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Abstract
+class Mage_Adminhtml_Block_System_Store_Grid_Render_Store extends Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Abstract
 {
+    /**
+     * @param Varien_Object $row
+     * @return string|null
+     */
     public function render(Varien_Object $row)
     {
         if (!$row->getData($this->getColumn()->getIndex())) {
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Store/Grid/Render/Website.php b/app/code/core/Mage/Adminhtml/Block/System/Store/Grid/Render/Website.php
index aacf766b1e2..605aa3f83ca 100644
--- a/app/code/core/Mage/Adminhtml/Block/System/Store/Grid/Render/Website.php
+++ b/app/code/core/Mage/Adminhtml/Block/System/Store/Grid/Render/Website.php
@@ -27,9 +27,12 @@
  * @author     Magento Core Team <core@magentocommerce.com>
  * @deprecated after 1.13.1.0 use Mage_Adminhtml_Block_System_Store_Tree
  */
-class Mage_Adminhtml_Block_System_Store_Grid_Render_Website
-    extends Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Abstract
+class Mage_Adminhtml_Block_System_Store_Grid_Render_Website extends Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Abstract
 {
+    /**
+     * @param Varien_Object $row
+     * @return string
+     */
     public function render(Varien_Object $row)
     {
         return '<a title="' . Mage::helper('core')->__('Edit Website') . '"
diff --git a/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Category/Tree.php b/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Category/Tree.php
index 00a67242ce4..1674a73fe24 100644
--- a/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Category/Tree.php
+++ b/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Category/Tree.php
@@ -50,7 +50,7 @@ public function __construct()
      * @param int $parentId
      * @param bool $asJson
      * @param int $recursionLevel
-     * @return array
+     * @return array|string
      */
     public function getTreeArray($parentId = null, $asJson = false, $recursionLevel = 3)
     {
diff --git a/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Selector.php b/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Selector.php
index b0b08fcd630..ee8df80a45f 100644
--- a/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Selector.php
+++ b/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Selector.php
@@ -63,7 +63,7 @@ public function getModes()
     /**
      * Label getter
      *
-     * @return array
+     * @return string
      */
     public function getSelectorLabel()
     {
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Checkbox.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Checkbox.php
index c11307456d4..2353305a81e 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Checkbox.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Checkbox.php
@@ -28,11 +28,17 @@
  */
 class Mage_Adminhtml_Block_Widget_Grid_Column_Filter_Checkbox extends Mage_Adminhtml_Block_Widget_Grid_Column_Filter_Select
 {
+    /**
+     * @return string
+     */
     public function getHtml()
     {
         return '<span class="head-massaction">' . parent::getHtml() . '</span>';
     }
 
+    /**
+     * @return array[]
+     */
     protected function _getOptions()
     {
         return [
@@ -51,17 +57,18 @@ protected function _getOptions()
         ];
     }
 
+    /**
+     * @return array|null
+     */
     public function getCondition()
     {
         if ($this->getValue()) {
             return $this->getColumn()->getValue();
-        }
-        else {
+        } else {
             return [
                 ['neq'=>$this->getColumn()->getValue()],
                 ['is'=>new Zend_Db_Expr('NULL')]
             ];
         }
-        //return array('like'=>'%'.$this->getValue().'%');
     }
 }
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Select.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Select.php
index f1977e1bf40..bcf3767ba61 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Select.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Select.php
@@ -28,6 +28,9 @@
  */
 class Mage_Adminhtml_Block_Widget_Grid_Column_Filter_Select extends Mage_Adminhtml_Block_Widget_Grid_Column_Filter_Abstract
 {
+    /**
+     * @return array[]
+     */
     protected function _getOptions()
     {
         $emptyOption = ['value' => null, 'label' => ''];
@@ -39,7 +42,7 @@ protected function _getOptions()
         }
 
         $colOptions = $this->getColumn()->getOptions();
-        if (!empty($colOptions) && is_array($colOptions) ) {
+        if (!empty($colOptions) && is_array($colOptions)) {
             $options = [$emptyOption];
             foreach ($colOptions as $value => $label) {
                 $options[] = ['value' => $value, 'label' => $label];
@@ -58,15 +61,18 @@ protected function _getOptions()
      */
     protected function _renderOption($option, $value)
     {
-        $selected = (($option['value'] == $value && (!is_null($value))) ? ' selected="selected"' : '' );
+        $selected = (($option['value'] == $value && (!is_null($value))) ? ' selected="selected"' : '');
         return '<option value="'. $this->escapeHtml($option['value']).'"'.$selected.'>'.$this->escapeHtml($option['label']).'</option>';
     }
 
+    /**
+     * @return string
+     */
     public function getHtml()
     {
         $html = '<select name="'.$this->_getHtmlName().'" id="'.$this->_getHtmlId().'" class="no-changes">';
         $value = $this->getValue();
-        foreach ($this->_getOptions() as $option){
+        foreach ($this->_getOptions() as $option) {
             if (is_array($option['value'])) {
                 $html .= '<optgroup label="' . $this->escapeHtml($option['label']) . '">';
                 foreach ($option['value'] as $subOption) {
@@ -81,6 +87,9 @@ public function getHtml()
         return $html;
     }
 
+    /**
+     * @return array|null
+     */
     public function getCondition()
     {
         if (is_null($this->getValue())) {
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Country.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Country.php
index d662f4be12a..1dc5b898f44 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Country.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Country.php
@@ -25,14 +25,13 @@
  * @package    Mage_Adminhtml
  * @author     Magento Core Team <core@magentocommerce.com>
  */
-class Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Country
-    extends Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Abstract
+class Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Country extends Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Abstract
 {
     /**
      * Render country grid column
      *
      * @param   Varien_Object $row
-     * @return  string
+     * @return  string|null
      */
     public function render(Varien_Object $row)
     {
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction/Abstract.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction/Abstract.php
index 1038d1bc0e7..8e5698569bb 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction/Abstract.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction/Abstract.php
@@ -22,11 +22,13 @@
 /**
  * Grid widget massaction block
  *
- * @method Mage_Sales_Model_Quote setHideFormElement(bool $value) Hide Form element to prevent IE errors
- * @method bool getHideFormElement()
  * @category   Mage
  * @package    Mage_Adminhtml
  * @author     Magento Core Team <core@magentocommerce.com>
+ *
+ * @method $this setFormFieldName(string $value)
+ * @method $this setHideFormElement(bool $value) Hide Form element to prevent IE errors
+ * @method bool getHideFormElement()
  */
 abstract class Mage_Adminhtml_Block_Widget_Grid_Massaction_Abstract extends Mage_Adminhtml_Block_Widget
 {
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Serializer.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Serializer.php
index b74529af150..36c400c0502 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Serializer.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Serializer.php
@@ -56,8 +56,7 @@ public function addColumnInputName($names)
             foreach ($names as $name) {
                 $this->addColumnInputName($name);
             }
-        }
-        else {
+        } else {
             if (!in_array($names, $this->_inputsToSerialize)) {
                 $this->_inputsToSerialize[] = $names;
             }
@@ -68,7 +67,7 @@ public function addColumnInputName($names)
      * Get grid column input names to serialize
      *
      * @param bool $asJSON
-     * @return array
+     * @return array|string
      */
     public function getColumnInputNames($asJSON = false)
     {
@@ -88,8 +87,7 @@ public function getDataAsJSON()
         $result = [];
         if ($serializeData = $this->getSerializeData()) {
             $result = $serializeData;
-        }
-        elseif (!empty($this->_inputsToSerialize)) {
+        } elseif (!empty($this->_inputsToSerialize)) {
             return '{}';
         }
         return Mage::helper('core')->jsonEncode($result);
diff --git a/app/code/core/Mage/Adminhtml/Model/Sales/Order/Create.php b/app/code/core/Mage/Adminhtml/Model/Sales/Order/Create.php
index dcc019bcad2..8818f4f68aa 100644
--- a/app/code/core/Mage/Adminhtml/Model/Sales/Order/Create.php
+++ b/app/code/core/Mage/Adminhtml/Model/Sales/Order/Create.php
@@ -145,7 +145,7 @@ public function getIsValidate()
      * Retrieve quote item
      *
      * @param   int|Mage_Sales_Model_Quote_Item $item
-     * @return  Mage_Sales_Model_Quote_Item
+     * @return  Mage_Sales_Model_Quote_Item|false
      */
     protected function _getQuoteItem($item)
     {
diff --git a/app/code/core/Mage/Adminhtml/controllers/Catalog/CategoryController.php b/app/code/core/Mage/Adminhtml/controllers/Catalog/CategoryController.php
index f0b27e46e6d..1c2f820e66e 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Catalog/CategoryController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Catalog/CategoryController.php
@@ -39,7 +39,7 @@ class Mage_Adminhtml_Catalog_CategoryController extends Mage_Adminhtml_Controlle
      * Root category can be returned, if inappropriate store/category is specified
      *
      * @param bool $getRootInstead
-     * @return Mage_Catalog_Model_Category
+     * @return Mage_Catalog_Model_Category|false
      */
     protected function _initCategory($getRootInstead = false)
     {
@@ -47,7 +47,7 @@ protected function _initCategory($getRootInstead = false)
              ->_title($this->__('Categories'))
              ->_title($this->__('Manage Categories'));
 
-        $categoryId = (int) $this->getRequest()->getParam('id',false);
+        $categoryId = (int) $this->getRequest()->getParam('id', false);
         $storeId    = (int) $this->getRequest()->getParam('store');
         $category = Mage::getModel('catalog/category');
         $category->setStoreId($storeId);
@@ -60,8 +60,7 @@ protected function _initCategory($getRootInstead = false)
                     // load root category instead wrong one
                     if ($getRootInstead) {
                         $category->load($rootId);
-                    }
-                    else {
+                    } else {
                         $this->_redirect('*/*/', ['_current'=>true, 'id'=>null]);
                         return false;
                     }
@@ -120,12 +119,10 @@ public function editAction()
         if ($_prevCategoryId
             && !$this->getRequest()->getQuery('isAjax')
             && !$this->getRequest()->getParam('clear')) {
-           // $params['id'] = $_prevCategoryId;
-             $this->getRequest()->setParam('id',$_prevCategoryId);
-            //$redirect = true;
+            $this->getRequest()->setParam('id', $_prevCategoryId);
         }
 
-         if ($redirect) {
+        if ($redirect) {
             $this->_redirect('*/*/edit', $params);
             return;
         }
@@ -164,8 +161,7 @@ public function editAction()
                     // no need to get parent breadcrumbs if deleting category level 1
                     if (count($breadcrumbsPath) <= 1) {
                         $breadcrumbsPath = '';
-                    }
-                    else {
+                    } else {
                         array_pop($breadcrumbsPath);
                         $breadcrumbsPath = implode('/', $breadcrumbsPath);
                     }
@@ -202,8 +198,9 @@ public function editAction()
         $this->getLayout()->getBlock('head')->setCanLoadExtJs(true)
             ->setContainerCssClass('catalog-categories');
 
-        $this->_addBreadcrumb(Mage::helper('catalog')->__('Manage Catalog Categories'),
-             Mage::helper('catalog')->__('Manage Categories')
+        $this->_addBreadcrumb(
+            Mage::helper('catalog')->__('Manage Catalog Categories'),
+            Mage::helper('catalog')->__('Manage Categories')
         );
 
         $block = $this->getLayout()->getBlock('catalog.wysiwyg.js');
@@ -277,8 +274,7 @@ public function saveAction()
                 if (!$parentId) {
                     if ($storeId) {
                         $parentId = Mage::app()->getStore($storeId)->getRootCategoryId();
-                    }
-                    else {
+                    } else {
                         $parentId = Mage_Catalog_Model_Category::TREE_ROOT_ID;
                     }
                 }
@@ -307,9 +303,8 @@ public function saveAction()
             /**
              * Create Permanent Redirect for old URL key
              */
-            if ($category->getId() && isset($data['general']['url_key_create_redirect']))
-            // && $category->getOrigData('url_key') != $category->getData('url_key')
-            {
+            if ($category->getId() && isset($data['general']['url_key_create_redirect'])) {
+                // && $category->getOrigData('url_key') != $category->getData('url_key')
                 $category->setData('save_rewrites_history', (bool)$data['general']['url_key_create_redirect']);
             }
 
@@ -339,8 +334,7 @@ public function saveAction()
                     foreach ($validate as $code => $error) {
                         if ($error === true) {
                             Mage::throwException(Mage::helper('catalog')->__('Attribute "%s" is required.', $category->getResource()->getAttribute($code)->getFrontend()->getLabel()));
-                        }
-                        else {
+                        } else {
                             Mage::throwException($error);
                         }
                     }
@@ -354,8 +348,7 @@ public function saveAction()
                 $category->save();
                 Mage::getSingleton('adminhtml/session')->addSuccess(Mage::helper('catalog')->__('The category has been saved.'));
                 $refreshTree = 'true';
-            }
-            catch (Exception $e){
+            } catch (Exception $e) {
                 $this->_getSession()->addError($e->getMessage())
                     ->setCategoryData($data);
                 $refreshTree = 'false';
@@ -389,15 +382,12 @@ public function moveAction()
         try {
             $category->move($parentNodeId, $prevNodeId);
             $this->getResponse()->setBody("SUCCESS");
-        }
-        catch (Mage_Core_Exception $e) {
+        } catch (Mage_Core_Exception $e) {
             $this->getResponse()->setBody($e->getMessage());
-        }
-        catch (Exception $e){
+        } catch (Exception $e) {
             $this->getResponse()->setBody(Mage::helper('catalog')->__('Category move error %s', $e));
             Mage::logException($e);
         }
-
     }
 
     /**
@@ -414,13 +404,11 @@ public function deleteAction()
 
                 $category->delete();
                 Mage::getSingleton('adminhtml/session')->addSuccess(Mage::helper('catalog')->__('The category has been deleted.'));
-            }
-            catch (Mage_Core_Exception $e){
+            } catch (Mage_Core_Exception $e) {
                 Mage::getSingleton('adminhtml/session')->addError($e->getMessage());
                 $this->getResponse()->setRedirect($this->getUrl('*/*/edit', ['_current'=>true]));
                 return;
-            }
-            catch (Exception $e){
+            } catch (Exception $e) {
                 Mage::getSingleton('adminhtml/session')->addError(Mage::helper('catalog')->__('An error occurred while trying to delete the category.'));
                 $this->getResponse()->setRedirect($this->getUrl('*/*/edit', ['_current'=>true]));
                 return;
diff --git a/app/code/core/Mage/Adminhtml/controllers/Promo/WidgetController.php b/app/code/core/Mage/Adminhtml/controllers/Promo/WidgetController.php
index 191e68a02d9..a9d28b468a7 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Promo/WidgetController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Promo/WidgetController.php
@@ -44,9 +44,11 @@ public function chooserAction()
         switch ($request->getParam('attribute')) {
             case 'sku':
                 $block = $this->getLayout()->createBlock(
-                    'adminhtml/promo_widget_chooser_sku', 'promo_widget_chooser_sku',
+                    'adminhtml/promo_widget_chooser_sku',
+                    'promo_widget_chooser_sku',
                     ['js_form_object' => $request->getParam('form'),
-                    ]);
+                    ]
+                );
                 break;
 
             case 'category_ids':
@@ -65,9 +67,10 @@ public function chooserAction()
                 }
 
                 $block = $this->getLayout()->createBlock(
-                        'adminhtml/catalog_category_checkboxes_tree', 'promo_widget_chooser_category_ids',
-                        ['js_form_object' => $request->getParam('form')]
-                    )
+                    'adminhtml/catalog_category_checkboxes_tree',
+                    'promo_widget_chooser_category_ids',
+                    ['js_form_object' => $request->getParam('form')]
+                )
                     ->setCategoryIds($ids)
                 ;
                 break;
@@ -103,11 +106,11 @@ public function categoriesJsonAction()
     /**
      * Initialize category object in registry
      *
-     * @return Mage_Catalog_Model_Category
+     * @return Mage_Catalog_Model_Category|false
      */
     protected function _initCategory()
     {
-        $categoryId = (int) $this->getRequest()->getParam('id',false);
+        $categoryId = (int) $this->getRequest()->getParam('id', false);
         $storeId    = (int) $this->getRequest()->getParam('store');
 
         $category   = Mage::getModel('catalog/category');
diff --git a/app/code/core/Mage/Api2/Model/Acl/Global/Rule/Tree.php b/app/code/core/Mage/Api2/Model/Acl/Global/Rule/Tree.php
index fa4860e39fc..b6053e791ce 100644
--- a/app/code/core/Mage/Api2/Model/Acl/Global/Rule/Tree.php
+++ b/app/code/core/Mage/Api2/Model/Acl/Global/Rule/Tree.php
@@ -266,7 +266,7 @@ public function getTreeResources()
      *
      * @param Varien_Simplexml_Element|array $node
      * @param int $level
-     * @return array
+     * @return array|null
      */
     protected function _getTreeNode($node, $level = 0)
     {
diff --git a/app/code/core/Mage/Authorizenet/Block/Directpost/Form.php b/app/code/core/Mage/Authorizenet/Block/Directpost/Form.php
index 31d09041c74..47d00c04b50 100644
--- a/app/code/core/Mage/Authorizenet/Block/Directpost/Form.php
+++ b/app/code/core/Mage/Authorizenet/Block/Directpost/Form.php
@@ -43,7 +43,7 @@ protected function _construct()
      * Render block HTML
      * If method is not directpost - nothing to return
      *
-     * @return string
+     * @return string|null
      */
     protected function _toHtml()
     {
diff --git a/app/code/core/Mage/Backup/Model/Resource/Helper/Mysql4.php b/app/code/core/Mage/Backup/Model/Resource/Helper/Mysql4.php
index d44257f1621..f14ae57bac0 100644
--- a/app/code/core/Mage/Backup/Model/Resource/Helper/Mysql4.php
+++ b/app/code/core/Mage/Backup/Model/Resource/Helper/Mysql4.php
@@ -61,7 +61,7 @@ public function getTableForeignKeysSql($tableName = null)
             foreach ($this->_foreignKeys as $table => $foreignKeys) {
                 $sql .= $this->_buildForeignKeysAlterTableSql($table, $foreignKeys);
             }
-        } else if (isset($this->_foreignKeys[$tableName])) {
+        } elseif (isset($this->_foreignKeys[$tableName])) {
             $foreignKeys = $this->_foreignKeys[$tableName];
             $sql = $this->_buildForeignKeysAlterTableSql($tableName, $foreignKeys);
         }
@@ -82,7 +82,8 @@ protected function _buildForeignKeysAlterTableSql($tableName, $foreignKeys)
             return '';
         }
 
-        return sprintf("ALTER TABLE %s\n  %s;\n",
+        return sprintf(
+            "ALTER TABLE %s\n  %s;\n",
             $this->_getReadAdapter()->quoteIdentifier($tableName),
             implode(",\n  ", $foreignKeys)
         );
@@ -115,7 +116,7 @@ public function getTableCreateScript($tableName, $addDropIfExists = false)
      *
      * @param string $tableName
      * @param bool $withForeignKeys
-     * @return string
+     * @return false|string
      */
     public function getTableCreateSql($tableName, $withForeignKeys = false)
     {
@@ -137,7 +138,8 @@ public function getTableCreateSql($tableName, $withForeignKeys = false)
 
         if (is_array($matches)) {
             foreach ($matches as $match) {
-                $this->_foreignKeys[$tableName][] = sprintf('ADD CONSTRAINT %s FOREIGN KEY (%s) REFERENCES %s (%s)%s%s',
+                $this->_foreignKeys[$tableName][] = sprintf(
+                    'ADD CONSTRAINT %s FOREIGN KEY (%s) REFERENCES %s (%s)%s%s',
                     $adapter->quoteIdentifier($match[1]),
                     $adapter->quoteIdentifier($match[2]),
                     $adapter->quoteIdentifier($match[3]),
diff --git a/app/code/core/Mage/Bundle/Model/Product/Attribute/Source/Price/View.php b/app/code/core/Mage/Bundle/Model/Product/Attribute/Source/Price/View.php
index 30761ec6420..e6bce7cc72c 100644
--- a/app/code/core/Mage/Bundle/Model/Product/Attribute/Source/Price/View.php
+++ b/app/code/core/Mage/Bundle/Model/Product/Attribute/Source/Price/View.php
@@ -54,7 +54,7 @@ public function getAllOptions()
      * Get a text for option value
      *
      * @param string|int $value
-     * @return string
+     * @return string|false
      */
     public function getOptionText($value)
     {
diff --git a/app/code/core/Mage/Catalog/Block/Product/View/Media.php b/app/code/core/Mage/Catalog/Block/Product/View/Media.php
index e5a14ee8d00..55c8f4d2221 100644
--- a/app/code/core/Mage/Catalog/Block/Product/View/Media.php
+++ b/app/code/core/Mage/Catalog/Block/Product/View/Media.php
@@ -70,7 +70,7 @@ public function getGalleryUrl($image = null)
      * Retrieve gallery image url
      *
      * @param null|Varien_Object $image
-     * @return string
+     * @return string|null
      */
     public function getGalleryImageUrl($image)
     {
diff --git a/app/code/core/Mage/Catalog/Helper/Product.php b/app/code/core/Mage/Catalog/Helper/Product.php
index aa70d4fc11e..ff4b822cc41 100644
--- a/app/code/core/Mage/Catalog/Helper/Product.php
+++ b/app/code/core/Mage/Catalog/Helper/Product.php
@@ -58,7 +58,7 @@ class Mage_Catalog_Helper_Product extends Mage_Core_Helper_Url
      * Retrieve product view page url
      *
      * @param   Mage_Catalog_Model_Product|string|int $product
-     * @return  string
+     * @return  string|false
      */
     public function getProductUrl($product)
     {
diff --git a/app/code/core/Mage/Catalog/Model/Convert/Parser/Product.php b/app/code/core/Mage/Catalog/Model/Convert/Parser/Product.php
index 0da6c37ebe3..9bc565fbfec 100644
--- a/app/code/core/Mage/Catalog/Model/Convert/Parser/Product.php
+++ b/app/code/core/Mage/Catalog/Model/Convert/Parser/Product.php
@@ -153,7 +153,7 @@ public function getProductTypeName($code)
      * Retrieve product type code by name
      *
      * @param string $name
-     * @return string
+     * @return string|false
      */
     public function getProductTypeId($name)
     {
diff --git a/app/code/core/Mage/Catalog/Model/Product.php b/app/code/core/Mage/Catalog/Model/Product.php
index b9ef94afa39..ea8c42a45fe 100644
--- a/app/code/core/Mage/Catalog/Model/Product.php
+++ b/app/code/core/Mage/Catalog/Model/Product.php
@@ -543,7 +543,7 @@ public function getIdBySku($sku)
     /**
      * Retrieve product category id
      *
-     * @return int
+     * @return int|false
      */
     public function getCategoryId()
     {
diff --git a/app/code/core/Mage/Catalog/Model/Product/Attribute/Tierprice/Api.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Tierprice/Api.php
index 2dbc0e33361..b0fb164ea37 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Tierprice/Api.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Tierprice/Api.php
@@ -54,11 +54,12 @@ public function info($productId, $identifierType = null)
 
         foreach ($tierPrices as $tierPrice) {
             $row = [];
-            $row['customer_group_id'] = (empty($tierPrice['all_groups']) ? $tierPrice['cust_group'] : 'all' );
-            $row['website']           = ($tierPrice['website_id'] ?
-                            Mage::app()->getWebsite($tierPrice['website_id'])->getCode() :
-                            'all'
-                    );
+            $row['customer_group_id'] = (empty($tierPrice['all_groups']) ? $tierPrice['cust_group'] : 'all');
+            $row['website']           = (
+                $tierPrice['website_id']
+                    ? Mage::app()->getWebsite($tierPrice['website_id'])->getCode()
+                    : 'all'
+            );
             $row['qty']               = $tierPrice['price_qty'];
             $row['price']             = $tierPrice['price'];
 
@@ -113,7 +114,7 @@ public function update($productId, $tierPrices, $identifierType = null)
      *
      *  @param      Mage_Catalog_Model_Product $product
      *  @param      array $tierPrices
-     *  @return     array
+     *  @return     array|null
      */
     public function prepareTierPrices($product, $tierPrices = null)
     {
diff --git a/app/code/core/Mage/Catalog/Model/Product/Attribute/Tierprice/Api/V2.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Tierprice/Api/V2.php
index cebb04e5137..8ec1fda6db0 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Tierprice/Api/V2.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Tierprice/Api/V2.php
@@ -33,7 +33,7 @@ class Mage_Catalog_Model_Product_Attribute_Tierprice_Api_V2 extends Mage_Catalog
      *
      *  @param      Mage_Catalog_Model_Product $product
      *  @param      array $tierPrices
-     *  @return     array
+     *  @return     array|null
      */
     public function prepareTierPrices($product, $tierPrices = null)
     {
diff --git a/app/code/core/Mage/Catalog/Model/Product/Type/Price.php b/app/code/core/Mage/Catalog/Model/Product/Type/Price.php
index a4258ae3b40..13623c1375e 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Type/Price.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Type/Price.php
@@ -303,7 +303,7 @@ public function getTierPriceCount($product)
      *
      * @param float|null $qty
      * @param Mage_Catalog_Model_Product $product
-     * @return  array|float
+     * @return  array|float|string
      */
     public function getFormatedTierPrice($qty, $product)
     {
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Flat.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Flat.php
index 21260b10d12..444e20b4531 100644
--- a/app/code/core/Mage/Catalog/Model/Resource/Product/Flat.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Flat.php
@@ -130,7 +130,7 @@ public function getAttributeForSelect($attributeCode)
      * Retrieve Attribute Sort column name
      *
      * @param string $attributeCode
-     * @return string
+     * @return string|null
      */
     public function getAttributeSortColumn($attributeCode)
     {
diff --git a/app/code/core/Mage/CatalogSearch/Model/Advanced.php b/app/code/core/Mage/CatalogSearch/Model/Advanced.php
index cf2a24b9cdc..1969757f417 100644
--- a/app/code/core/Mage/CatalogSearch/Model/Advanced.php
+++ b/app/code/core/Mage/CatalogSearch/Model/Advanced.php
@@ -104,7 +104,7 @@ protected function _getResource()
     /**
      * Retrieve array of attributes used in advanced search
      *
-     * @return array
+     * @return Mage_Catalog_Model_Resource_Product_Attribute_Collection
      */
     public function getAttributes()
     {
diff --git a/app/code/core/Mage/CatalogSearch/Model/Resource/Search/Collection.php b/app/code/core/Mage/CatalogSearch/Model/Resource/Search/Collection.php
index 3924c8b3041..8896b16d069 100644
--- a/app/code/core/Mage/CatalogSearch/Model/Resource/Search/Collection.php
+++ b/app/code/core/Mage/CatalogSearch/Model/Resource/Search/Collection.php
@@ -151,7 +151,8 @@ protected function _getSearchEntityIdsSql($query)
                     ['t2' => $table],
                     $this->getConnection()->quoteInto(
                         't1.entity_id = t2.entity_id AND t1.attribute_id = t2.attribute_id AND t2.store_id = ?',
-                        $this->getStoreId()),
+                        $this->getStoreId()
+                    ),
                     []
                 )
                 ->where('t1.attribute_id IN (?)', $attributeIds)
@@ -172,7 +173,7 @@ protected function _getSearchEntityIdsSql($query)
      * Retrieve SQL for search entities by option
      *
      * @param string $query
-     * @return string
+     * @return false|string
      */
     protected function _getSearchInOptionSql($query)
     {
@@ -205,17 +206,23 @@ protected function _getSearchInOptionSql($query)
         $ifStoreId = $this->getConnection()->getIfNullSql('s.store_id', 'd.store_id');
         $ifValue   = $this->getConnection()->getCheckSql('s.value_id > 0', 's.value', 'd.value');
         $select = $this->getConnection()->select()
-            ->from(['d'=>$optionValueTable],
-                   ['option_id',
-                         'o.attribute_id',
-                         'store_id' => $ifStoreId,
-                         'a.frontend_input'])
-            ->joinLeft(['s'=>$optionValueTable],
+            ->from(
+                ['d'=>$optionValueTable],
+                ['option_id',
+                      'o.attribute_id',
+                      'store_id' => $ifStoreId,
+                      'a.frontend_input']
+            )
+            ->joinLeft(
+                ['s'=>$optionValueTable],
                 $this->getConnection()->quoteInto('s.option_id = d.option_id AND s.store_id=?', $storeId),
-                [])
-            ->join(['o'=>$optionTable],
+                []
+            )
+            ->join(
+                ['o'=>$optionTable],
                 'o.option_id=d.option_id',
-                [])
+                []
+            )
             ->join(['a' => $attributesTable], 'o.attribute_id=a.attribute_id', [])
             ->where('d.store_id=0')
             ->where('o.attribute_id IN (?)', $attributeIds)
diff --git a/app/code/core/Mage/Checkout/Model/Cart/Customer/Api.php b/app/code/core/Mage/Checkout/Model/Cart/Customer/Api.php
index dc7f105b493..080813ae4e3 100644
--- a/app/code/core/Mage/Checkout/Model/Cart/Customer/Api.php
+++ b/app/code/core/Mage/Checkout/Model/Cart/Customer/Api.php
@@ -199,7 +199,7 @@ protected function _prepareCustomerData($data)
      * Prepare customer entered data for implementing
      *
      * @param  array $data
-     * @return array
+     * @return array|null
      */
     protected function _prepareCustomerAddressData($data)
     {
diff --git a/app/code/core/Mage/Checkout/Model/Cart/Customer/Api/V2.php b/app/code/core/Mage/Checkout/Model/Cart/Customer/Api/V2.php
index ba4c8d0a090..95746d8ccf0 100644
--- a/app/code/core/Mage/Checkout/Model/Cart/Customer/Api/V2.php
+++ b/app/code/core/Mage/Checkout/Model/Cart/Customer/Api/V2.php
@@ -46,7 +46,7 @@ protected function _prepareCustomerData($data)
      * Prepare customer entered data for implementing
      *
      * @param  object $data
-     * @return array
+     * @return array|null
      */
     protected function _prepareCustomerAddressData($data)
     {
diff --git a/app/code/core/Mage/Checkout/Model/Cart/Product/Api/V2.php b/app/code/core/Mage/Checkout/Model/Cart/Product/Api/V2.php
index c57f68a5533..e03ce542b97 100644
--- a/app/code/core/Mage/Checkout/Model/Cart/Product/Api/V2.php
+++ b/app/code/core/Mage/Checkout/Model/Cart/Product/Api/V2.php
@@ -32,7 +32,7 @@ class Mage_Checkout_Model_Cart_Product_Api_V2 extends Mage_Checkout_Model_Cart_P
     /**
      * Return an Array of Object attributes.
      *
-     * @param Mixed $data
+     * @param mixed $data
      * @return array
      */
     protected function _prepareProductsData($data)
diff --git a/app/code/core/Mage/ConfigurableSwatches/Helper/Productimg.php b/app/code/core/Mage/ConfigurableSwatches/Helper/Productimg.php
index 8febf98cb4b..ee2b23205c2 100644
--- a/app/code/core/Mage/ConfigurableSwatches/Helper/Productimg.php
+++ b/app/code/core/Mage/ConfigurableSwatches/Helper/Productimg.php
@@ -278,7 +278,7 @@ public function getGlobalSwatchUrl(
      * @param string $tag
      * @param int $width
      * @param int $height
-     * @return string
+     * @return false|string
      */
     protected function _resizeSwatchImage($filename, $tag, $width, $height)
     {
diff --git a/app/code/core/Mage/Core/Block/Abstract.php b/app/code/core/Mage/Core/Block/Abstract.php
index 8b123432b1e..293b7ec9364 100644
--- a/app/code/core/Mage/Core/Block/Abstract.php
+++ b/app/code/core/Mage/Core/Block/Abstract.php
@@ -1404,7 +1404,7 @@ public function addModelTags(Mage_Core_Model_Abstract $model)
     /**
      * Get block cache life time
      *
-     * @return int
+     * @return int|null
      */
     public function getCacheLifetime()
     {
diff --git a/app/code/core/Mage/Core/Controller/Request/Http.php b/app/code/core/Mage/Core/Controller/Request/Http.php
index 386728d9798..af233b0d6ff 100644
--- a/app/code/core/Mage/Core/Controller/Request/Http.php
+++ b/app/code/core/Mage/Core/Controller/Request/Http.php
@@ -323,7 +323,7 @@ public function getScheme()
      * Retrieve HTTP HOST
      *
      * @param bool $trimPort
-     * @return string
+     * @return false|string
      */
     public function getHttpHost($trimPort = true)
     {
diff --git a/app/code/core/Mage/Core/Helper/Http.php b/app/code/core/Mage/Core/Helper/Http.php
index 78e63ace29c..d01983277ec 100644
--- a/app/code/core/Mage/Core/Helper/Http.php
+++ b/app/code/core/Mage/Core/Helper/Http.php
@@ -118,7 +118,7 @@ public function getRemoteAddrHeaders()
      * Retrieve Client Remote Address
      *
      * @param bool $ipToLong converting IP to long format
-     * @return string IPv4|long
+     * @return false|string IPv4|long
      */
     public function getRemoteAddr($ipToLong = false)
     {
@@ -152,7 +152,7 @@ public function getRemoteAddr($ipToLong = false)
      * Retrieve Server IP address
      *
      * @param bool $ipToLong converting IP to long format
-     * @return string IPv4|long
+     * @return false|string IPv4|long
      */
     public function getServerAddr($ipToLong = false)
     {
diff --git a/app/code/core/Mage/Core/Model/Config.php b/app/code/core/Mage/Core/Model/Config.php
index e38e7408b67..e56929156ce 100644
--- a/app/code/core/Mage/Core/Model/Config.php
+++ b/app/code/core/Mage/Core/Model/Config.php
@@ -1180,7 +1180,7 @@ public function getBaseDir($type = 'base')
      *
      * @param   string $path
      * @param   string $type
-     * @return  string
+     * @return  false|string
      */
     public function getVarDir($path = null, $type = 'var')
     {
diff --git a/app/code/core/Mage/Core/Model/Config/Element.php b/app/code/core/Mage/Core/Model/Config/Element.php
index a0010bfb082..f199ca122e2 100644
--- a/app/code/core/Mage/Core/Model/Config/Element.php
+++ b/app/code/core/Mage/Core/Model/Config/Element.php
@@ -50,7 +50,7 @@ public function is($var, $value = true)
     }
 
     /**
-     * @return string
+     * @return false|string
      */
     public function getClassName()
     {
diff --git a/app/code/core/Mage/Core/Model/Date.php b/app/code/core/Mage/Core/Model/Date.php
index 4df032722ca..f204e1659e1 100644
--- a/app/code/core/Mage/Core/Model/Date.php
+++ b/app/code/core/Mage/Core/Model/Date.php
@@ -94,7 +94,7 @@ public function calculateOffset($timezone = null)
      *
      * @param  string $format
      * @param  int|string $input date in current timezone
-     * @return string
+     * @return false|string
      */
     public function gmtDate($format = null, $input = null)
     {
@@ -132,7 +132,7 @@ public function date($format = null, $input = null)
      * Forms GMT timestamp
      *
      * @param  int|string $input date in current timezone
-     * @return int
+     * @return string|false|int
      */
     public function gmtTimestamp($input = null)
     {
diff --git a/app/code/core/Mage/Customer/Block/Form/Register.php b/app/code/core/Mage/Customer/Block/Form/Register.php
index a2ae6f98c6d..c8e248b7ee4 100644
--- a/app/code/core/Mage/Customer/Block/Form/Register.php
+++ b/app/code/core/Mage/Customer/Block/Form/Register.php
@@ -117,15 +117,15 @@ public function getCountryId()
     /**
      * Retrieve customer region identifier
      *
-     * @return int
+     * @return string|int|null
      */
     public function getRegion()
     {
-        if ($region = $this->getFormData()->getRegion() !== false) {
+        if (($region = $this->getFormData()->getRegion()) !== false) {
             return $region;
         }
 
-        if ($region = $this->getFormData()->getRegionId() !== false) {
+        if (($region = $this->getFormData()->getRegionId()) !== false) {
             return $region;
         }
         return null;
diff --git a/app/code/core/Mage/Customer/Model/Api2/Customer/Rest/Customer/V1.php b/app/code/core/Mage/Customer/Model/Api2/Customer/Rest/Customer/V1.php
index d3e89442b7b..c201328a5fd 100644
--- a/app/code/core/Mage/Customer/Model/Api2/Customer/Rest/Customer/V1.php
+++ b/app/code/core/Mage/Customer/Model/Api2/Customer/Rest/Customer/V1.php
@@ -47,7 +47,7 @@ protected function _isOwner($customerId)
      * Retrieve information about customer
      *
      * @throws Mage_Api2_Exception
-     * @return array
+     * @return array|void
      */
     protected function _retrieve()
     {
diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Io.php b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Io.php
index 28a519939ee..4029d00e776 100644
--- a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Io.php
+++ b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Io.php
@@ -31,7 +31,7 @@ class Mage_Dataflow_Model_Convert_Adapter_Io extends Mage_Dataflow_Model_Convert
     const XML_PATH_EXPORT_LOCAL_VALID_PATH = 'general/file/importexport_local_valid_paths';
 
     /**
-     * @return Varien_Io_Abstract
+     * @return Varien_Io_Abstract|false
      */
     public function getResource($forWrite = false)
     {
@@ -50,7 +50,7 @@ public function getResource($forWrite = false)
                           . DS . $ioConfig['filename'];
                     /** @var Mage_Core_Model_File_Validator_AvailablePath $validator */
                     $validator = Mage::getModel('core/file_validator_availablePath');
-                    $validator->setPaths( Mage::getStoreConfig(self::XML_PATH_EXPORT_LOCAL_VALID_PATH) );
+                    $validator->setPaths(Mage::getStoreConfig(self::XML_PATH_EXPORT_LOCAL_VALID_PATH));
                     if (!$validator->isValid($path)) {
                         foreach ($validator->getMessages() as $message) {
                             Mage::throwException($message);
@@ -60,7 +60,6 @@ public function getResource($forWrite = false)
 
                     if (preg_match('#^' . preg_quote(DS, '#').'#', $this->getVar('path')) ||
                         preg_match('#^[a-z]:' . preg_quote(DS, '#') . '#i', $this->getVar('path'))) {
-
                         $path = $this->_resource->getCleanPath($this->getVar('path'));
                     } else {
                         $baseDir = Mage::getBaseDir();
diff --git a/app/code/core/Mage/Directory/Helper/Data.php b/app/code/core/Mage/Directory/Helper/Data.php
index b63210ca73b..3c9facc3606 100644
--- a/app/code/core/Mage/Directory/Helper/Data.php
+++ b/app/code/core/Mage/Directory/Helper/Data.php
@@ -279,7 +279,7 @@ public function isZipCodeOptional($countryCode)
      * Returns the list of countries, for which region is required
      *
      * @param bool $asJson
-     * @return array
+     * @return array|string
      */
     public function getCountriesWithStatesRequired($asJson = false)
     {
diff --git a/app/code/core/Mage/Downloadable/Block/Catalog/Product/Samples.php b/app/code/core/Mage/Downloadable/Block/Catalog/Product/Samples.php
index 479e1cb797a..a897ab0d6ae 100644
--- a/app/code/core/Mage/Downloadable/Block/Catalog/Product/Samples.php
+++ b/app/code/core/Mage/Downloadable/Block/Catalog/Product/Samples.php
@@ -41,7 +41,7 @@ public function hasSamples()
     /**
      * Get downloadable product samples
      *
-     * @return array
+     * @return Mage_Downloadable_Model_Resource_Sample_Collection
      */
     public function getSamples()
     {
diff --git a/app/code/core/Mage/Downloadable/Block/Customer/Products/List.php b/app/code/core/Mage/Downloadable/Block/Customer/Products/List.php
index 0486453c4ff..ef7356d8e61 100644
--- a/app/code/core/Mage/Downloadable/Block/Customer/Products/List.php
+++ b/app/code/core/Mage/Downloadable/Block/Customer/Products/List.php
@@ -113,7 +113,7 @@ public function getBackUrl()
      * Return number of left downloads or unlimited
      *
      * @param Mage_Downloadable_Model_Link_Purchased_Item $item
-     * @return string
+     * @return int|string
      */
     public function getRemainingDownloads($item)
     {
diff --git a/app/code/core/Mage/Eav/Model/Attribute/Data/Abstract.php b/app/code/core/Mage/Eav/Model/Attribute/Data/Abstract.php
index 37699e60a47..adea91e8261 100644
--- a/app/code/core/Mage/Eav/Model/Attribute/Data/Abstract.php
+++ b/app/code/core/Mage/Eav/Model/Attribute/Data/Abstract.php
@@ -184,7 +184,7 @@ public function getExtractedData($index = null)
      * Apply attribute input filter to value
      *
      * @param string $value
-     * @return string
+     * @return false|string
      */
     protected function _applyInputFilter($value)
     {
diff --git a/app/code/core/Mage/Eav/Model/Attribute/Data/File.php b/app/code/core/Mage/Eav/Model/Attribute/Data/File.php
index cb90feeb0d9..6ea9f069ffe 100644
--- a/app/code/core/Mage/Eav/Model/Attribute/Data/File.php
+++ b/app/code/core/Mage/Eav/Model/Attribute/Data/File.php
@@ -39,7 +39,7 @@ class Mage_Eav_Model_Attribute_Data_File extends Mage_Eav_Model_Attribute_Data_A
      * Extract data from request and return value
      *
      * @param Zend_Controller_Request_Http $request
-     * @return array|string
+     * @return false|array|string
      */
     public function extractValue(Zend_Controller_Request_Http $request)
     {
diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Datetime.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Datetime.php
index 9194bb8205b..03f7259c4f4 100644
--- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Datetime.php
+++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Datetime.php
@@ -64,8 +64,8 @@ public function beforeSave($object)
      * string format used from input fields (all date input fields need apply locale settings)
      * int value can be declared in code (this meen whot we use valid date)
      *
-     * @param   string | int $date
-     * @return  string
+     * @param   string|int $date
+     * @return  string|null
      */
     public function formatDate($date)
     {
diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Frontend/Abstract.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Frontend/Abstract.php
index 822e9228a57..bd6c04c12f5 100644
--- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Frontend/Abstract.php
+++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Frontend/Abstract.php
@@ -223,7 +223,7 @@ public function getOption($optionId)
     /**
      * Retrieve Input Renderer Class
      *
-     * @return string
+     * @return string|null
      */
     public function getInputRendererClass()
     {
diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Boolean.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Boolean.php
index ddfab0d2970..73c5b0eb9c4 100644
--- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Boolean.php
+++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Source/Boolean.php
@@ -82,7 +82,7 @@ public function toOptionArray()
      * Get a text for option value
      *
      * @param string|int $value
-     * @return string
+     * @return string|false
      */
     public function getOptionText($value)
     {
diff --git a/app/code/core/Mage/Eav/Model/Entity/Setup.php b/app/code/core/Mage/Eav/Model/Entity/Setup.php
index 554616d145e..2575d7c09db 100644
--- a/app/code/core/Mage/Eav/Model/Entity/Setup.php
+++ b/app/code/core/Mage/Eav/Model/Entity/Setup.php
@@ -977,7 +977,7 @@ public function getAttribute($entityTypeId, $id, $field = null)
      *
      * @param mixed $entityTypeId
      * @param mixed $id
-     * @return int
+     * @return false|int
      */
     public function getAttributeId($entityTypeId, $id)
     {
@@ -995,7 +995,7 @@ public function getAttributeId($entityTypeId, $id)
      *
      * @param int|string $entityTypeId Entity Type id or Entity Type code
      * @param int|string $id Attribute id or Attribute code
-     * @return string
+     * @return string|false
      */
     public function getAttributeTable($entityTypeId, $id)
     {
diff --git a/app/code/core/Mage/Eav/Model/Entity/Type.php b/app/code/core/Mage/Eav/Model/Entity/Type.php
index 3986588642c..256406e0896 100644
--- a/app/code/core/Mage/Eav/Model/Entity/Type.php
+++ b/app/code/core/Mage/Eav/Model/Entity/Type.php
@@ -156,7 +156,7 @@ public function getAttributeSetCollection()
      * Retrieve new incrementId
      *
      * @param int $storeId
-     * @return string
+     * @return false|string
      * @throws Exception
      */
     public function fetchNewIncrementId($storeId = null)
@@ -237,7 +237,7 @@ public function getEntityTable()
     /**
      * Retrieve entity table prefix name
      *
-     * @return string
+     * @return string|null
      */
     public function getValueTablePrefix()
     {
diff --git a/app/code/core/Mage/Log/Model/Customer.php b/app/code/core/Mage/Log/Model/Customer.php
index d9b8772a03f..70fbe419cc7 100644
--- a/app/code/core/Mage/Log/Model/Customer.php
+++ b/app/code/core/Mage/Log/Model/Customer.php
@@ -69,7 +69,7 @@ public function loadByCustomer($customer)
     /**
      * Return last login at in Unix time format
      *
-     * @return int
+     * @return int|null
      */
     public function getLoginAtTimestamp()
     {
diff --git a/app/code/core/Mage/Media/Model/File/Image.php b/app/code/core/Mage/Media/Model/File/Image.php
index d44e4647d01..99978d54f43 100644
--- a/app/code/core/Mage/Media/Model/File/Image.php
+++ b/app/code/core/Mage/Media/Model/File/Image.php
@@ -28,16 +28,25 @@
  */
 class Mage_Media_Model_File_Image extends Mage_Core_Model_Resource_Abstract
 {
+    /**
+     * @return $this
+     */
     protected function _construct()
     {
         return $this;
     }
 
+    /**
+     * @return Varien_Db_Adapter_Interface|false
+     */
     protected function _getReadAdapter()
     {
         return false;
     }
 
+    /**
+     * @return Varien_Db_Adapter_Interface|false
+     */
     protected function _getWriteAdapter()
     {
         return false;
diff --git a/app/code/core/Mage/Page/Block/Html/Pager.php b/app/code/core/Mage/Page/Block/Html/Pager.php
index 9edf3e86114..595e7ca81cf 100644
--- a/app/code/core/Mage/Page/Block/Html/Pager.php
+++ b/app/code/core/Mage/Page/Block/Html/Pager.php
@@ -422,7 +422,7 @@ public function getFramePages()
     /**
      * Return page number of Previous jump
      *
-     * @return int
+     * @return int|null
      */
     public function getPreviousJumpPage()
     {
@@ -450,7 +450,7 @@ public function getPreviousJumpUrl()
     /**
      * Return page number of Next jump
      *
-     * @return int
+     * @return int|null
      */
     public function getNextJumpPage()
     {
diff --git a/app/code/core/Mage/Paygate/Block/Authorizenet/Form/Cc.php b/app/code/core/Mage/Paygate/Block/Authorizenet/Form/Cc.php
index 9b6fc4e3c2b..b66072a0a0c 100644
--- a/app/code/core/Mage/Paygate/Block/Authorizenet/Form/Cc.php
+++ b/app/code/core/Mage/Paygate/Block/Authorizenet/Form/Cc.php
@@ -107,7 +107,7 @@ public function showNoticeMessage($message)
     /**
      * Return partial authorization confirmation message and unset it in payment model
      *
-     * @return string
+     * @return string|false
      */
     public function getPartialAuthorizationConfirmationMessage()
     {
diff --git a/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Expanded.php b/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Expanded.php
index ee671791832..2b23b2b4fbd 100644
--- a/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Expanded.php
+++ b/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Expanded.php
@@ -26,8 +26,7 @@
  * @package    Mage_Paypal
  * @author     Magento Core Team <core@magentocommerce.com>
  */
-class Mage_Paypal_Block_Adminhtml_System_Config_Fieldset_Expanded
-    extends Mage_Adminhtml_Block_System_Config_Form_Fieldset
+class Mage_Paypal_Block_Adminhtml_System_Config_Fieldset_Expanded extends Mage_Adminhtml_Block_System_Config_Form_Fieldset
 {
     /**
      * Return collapse state
diff --git a/app/code/core/Mage/Paypal/Block/Express/Review.php b/app/code/core/Mage/Paypal/Block/Express/Review.php
index 0f8c49ebc0f..64bd2130c81 100644
--- a/app/code/core/Mage/Paypal/Block/Express/Review.php
+++ b/app/code/core/Mage/Paypal/Block/Express/Review.php
@@ -77,7 +77,7 @@ public function getBillingAddress()
     /**
      * Return quote shipping address
      *
-     * @return Mage_Sales_Model_Quote_Address
+     * @return Mage_Sales_Model_Quote_Address|false
      */
     public function getShippingAddress()
     {
diff --git a/app/code/core/Mage/Paypal/Helper/Data.php b/app/code/core/Mage/Paypal/Helper/Data.php
index d481aa2a959..ee6d2babc99 100644
--- a/app/code/core/Mage/Paypal/Helper/Data.php
+++ b/app/code/core/Mage/Paypal/Helper/Data.php
@@ -71,9 +71,10 @@ public function shouldAskToCreateBillingAgreement(Mage_Paypal_Model_Config $conf
      * Return backend config for element like JSON
      *
      * @param Varien_Data_Form_Element_Abstract $element
-     * @return string
+     * @return false|string
      */
-    public function getElementBackendConfig(Varien_Data_Form_Element_Abstract $element) {
+    public function getElementBackendConfig(Varien_Data_Form_Element_Abstract $element)
+    {
         $config = $element->getFieldConfig()->backend_congif;
         if (!$config) {
             return false;
diff --git a/app/code/core/Mage/Paypal/Model/Payflowlink.php b/app/code/core/Mage/Paypal/Model/Payflowlink.php
index c0622ff2254..189f19f580f 100644
--- a/app/code/core/Mage/Paypal/Model/Payflowlink.php
+++ b/app/code/core/Mage/Paypal/Model/Payflowlink.php
@@ -330,7 +330,7 @@ protected function _getFraudMessage()
     /**
      * Check response from Payflow gateway.
      *
-     * @return Mage_Sales_Model_Order in case of validation passed
+     * @return false|Mage_Sales_Model_Order in case of validation passed
      * @throws Mage_Core_Exception in other cases
      */
     protected function _getOrderFromResponse()
diff --git a/app/code/core/Mage/Paypal/Model/Payflowpro.php b/app/code/core/Mage/Paypal/Model/Payflowpro.php
index 5fd600316d5..86425ae3b31 100644
--- a/app/code/core/Mage/Paypal/Model/Payflowpro.php
+++ b/app/code/core/Mage/Paypal/Model/Payflowpro.php
@@ -26,7 +26,7 @@
  * @package    Mage_Paypal
  * @author     Magento Core Team <core@magentocommerce.com>
  */
-class Mage_Paypal_Model_Payflowpro extends  Mage_Payment_Model_Method_Cc
+class Mage_Paypal_Model_Payflowpro extends Mage_Payment_Model_Method_Cc
 {
     /**
      * Transaction action codes
@@ -156,7 +156,7 @@ public function authorize(Varien_Object $payment, $amount)
         $response = $this->_postRequest($request);
         $this->_processErrors($response);
 
-        switch ($response->getResultCode()){
+        switch ($response->getResultCode()) {
             case self::RESPONSE_CODE_APPROVED:
                 $payment->setTransactionId($response->getPnref())->setIsTransactionClosed(0);
                 break;
@@ -212,7 +212,7 @@ public function capture(Varien_Object $payment, $amount)
         $response = $this->_postRequest($request);
         $this->_processErrors($response);
 
-        switch ($response->getResultCode()){
+        switch ($response->getResultCode()) {
             case self::RESPONSE_CODE_APPROVED:
                 $payment->setTransactionId($response->getPnref())->setIsTransactionClosed(0);
                 break;
@@ -239,7 +239,7 @@ public function void(Varien_Object $payment)
         $response = $this->_postRequest($request);
         $this->_processErrors($response);
 
-        if ($response->getResultCode() == self::RESPONSE_CODE_APPROVED){
+        if ($response->getResultCode() == self::RESPONSE_CODE_APPROVED) {
             $payment->setTransactionId($response->getPnref())
                 ->setIsTransactionClosed(1)
                 ->setShouldCloseParentTransaction(1);
@@ -272,7 +272,7 @@ public function canVoid(Varien_Object $payment)
      * Attempt to void the authorization on cancelling
      *
      * @param Varien_Object $payment
-     * @return $this
+     * @return $this|false
      */
     public function cancel(Varien_Object $payment)
     {
@@ -294,11 +294,11 @@ public function refund(Varien_Object $payment, $amount)
         $request = $this->_buildBasicRequest($payment);
         $request->setTrxtype(self::TRXTYPE_CREDIT);
         $request->setOrigid($payment->getParentTransactionId());
-        $request->setAmt(round((float)$amount,2));
+        $request->setAmt(round((float)$amount, 2));
         $response = $this->_postRequest($request);
         $this->_processErrors($response);
 
-        if ($response->getResultCode() == self::RESPONSE_CODE_APPROVED){
+        if ($response->getResultCode() == self::RESPONSE_CODE_APPROVED) {
             $payment->setTransactionId($response->getPnref())
                 ->setIsTransactionClosed(1);
             $payment->setShouldCloseParentTransaction(!$payment->getCreditmemo()->getInvoice()->canRefund());
@@ -327,7 +327,7 @@ public function fetchTransactionInfo(Mage_Payment_Model_Info $payment, $transact
                 ->setIsTransactionClosed(0);
             if ($response->getOrigresult() == self::RESPONSE_CODE_APPROVED) {
                 $payment->setIsTransactionApproved(true);
-            } else if ($response->getOrigresult() == self::RESPONSE_CODE_DECLINED_BY_MERCHANT) {
+            } elseif ($response->getOrigresult() == self::RESPONSE_CODE_DECLINED_BY_MERCHANT) {
                 $payment->setIsTransactionDenied(true);
             }
         }
@@ -403,13 +403,12 @@ protected function _postRequest(Varien_Object $request)
             ->setHeaders('X-VPS-CLIENT-TIMEOUT: ' . $this->_clientTimeout);
 
         try {
-           /**
-            * we are sending request to payflow pro without url encoding
-            * so we set up _urlEncodeBody flag to false
-            */
+            /**
+             * we are sending request to payflow pro without url encoding
+             * so we set up _urlEncodeBody flag to false
+             */
             $response = $client->setUrlEncodeBody(false)->request();
-        }
-        catch (Exception $e) {
+        } catch (Exception $e) {
             $result->setResponseCode(-1)
                 ->setResponseReasonCode($e->getCode())
                 ->setResponseReasonText($e->getMessage());
@@ -422,9 +421,9 @@ protected function _postRequest(Varien_Object $request)
         $response = strstr($response->getBody(), 'RESULT');
         $valArray = explode('&', $response);
 
-        foreach($valArray as $val) {
-                $valArray2 = explode('=', $val);
-                $result->setData(strtolower($valArray2[0]), $valArray2[1]);
+        foreach ($valArray as $val) {
+            $valArray2 = explode('=', $val);
+            $result->setData(strtolower($valArray2[0]), $valArray2[1]);
         }
 
         $result->setResultCode($result->getResult())
@@ -446,12 +445,12 @@ protected function _postRequest(Varien_Object $request)
     protected function _buildPlaceRequest(Varien_Object $payment, $amount)
     {
         $request = $this->_buildBasicRequest($payment);
-        $request->setAmt(round($amount,2));
+        $request->setAmt(round($amount, 2));
         $request->setAcct($payment->getCcNumber());
-        $request->setExpdate(sprintf('%02d',$payment->getCcExpMonth()) . substr($payment->getCcExpYear(),-2,2));
+        $request->setExpdate(sprintf('%02d', $payment->getCcExpMonth()) . substr($payment->getCcExpYear(), -2, 2));
         $request->setCvv2($payment->getCcCid());
 
-        if ($this->getIsCentinelValidationEnabled()){
+        if ($this->getIsCentinelValidationEnabled()) {
             $params = [];
             $params = $this->getCentinelValidator()->exportCmpiData($params);
             /** @var Varien_Object $request */
diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Abstract.php b/app/code/core/Mage/Sales/Model/Resource/Order/Abstract.php
index b709456d096..c7093d67bfa 100644
--- a/app/code/core/Mage/Sales/Model/Resource/Order/Abstract.php
+++ b/app/code/core/Mage/Sales/Model/Resource/Order/Abstract.php
@@ -261,7 +261,7 @@ public function getGridColumns()
     /**
      * Retrieve grid table
      *
-     * @return string
+     * @return string|false
      */
     public function getGridTable()
     {
diff --git a/app/code/core/Mage/Shipping/Model/Carrier/Tablerate.php b/app/code/core/Mage/Shipping/Model/Carrier/Tablerate.php
index a618a73f23b..8ce84a34250 100644
--- a/app/code/core/Mage/Shipping/Model/Carrier/Tablerate.php
+++ b/app/code/core/Mage/Shipping/Model/Carrier/Tablerate.php
@@ -66,7 +66,7 @@ public function __construct()
      * Collect and get rates
      *
      * @param Mage_Shipping_Model_Rate_Request $request
-     * @return bool|Mage_Core_Model_Abstract
+     * @return false|Mage_Shipping_Model_Rate_Result
      */
     public function collectRates(Mage_Shipping_Model_Rate_Request $request)
     {
@@ -198,7 +198,6 @@ public function collectRates(Mage_Shipping_Model_Rate_Request $request)
      * Get Model
      *
      * @param string $modelName
-     *
      * @return Mage_Core_Model_Abstract
      */
     protected function _getModel($modelName)
@@ -210,7 +209,6 @@ protected function _getModel($modelName)
      * Get Rate
      *
      * @param Mage_Shipping_Model_Rate_Request $request
-     *
      * @return Mage_Core_Model_Abstract
      */
     public function getRate(Mage_Shipping_Model_Rate_Request $request)
@@ -223,8 +221,7 @@ public function getRate(Mage_Shipping_Model_Rate_Request $request)
      *
      * @param string $type
      * @param string $code
-     *
-     * @return array
+     * @return array|string
      */
     public function getCode($type, $code = '')
     {
diff --git a/app/code/core/Mage/Tag/Model/Resource/Tag.php b/app/code/core/Mage/Tag/Model/Resource/Tag.php
index 69520d8242f..4d802c4ca9b 100644
--- a/app/code/core/Mage/Tag/Model/Resource/Tag.php
+++ b/app/code/core/Mage/Tag/Model/Resource/Tag.php
@@ -52,7 +52,7 @@ protected function _initUniqueFields()
      *
      * @param Mage_Tag_Model_Tag $model
      * @param string $name
-     * @return array|false
+     * @return false|void
      */
     public function loadByName($model, $name)
     {
@@ -67,7 +67,7 @@ public function loadByName($model, $name)
                 ->where('name = :name');
             $data = $read->fetchRow($select, ['name' => $name]);
 
-            $model->setData(( is_array($data) ) ? $data : []);
+           $model->setData(is_array($data) ? $data : []);
         } else {
             return false;
         }
diff --git a/app/code/core/Mage/Tax/Model/Class/Source/Product.php b/app/code/core/Mage/Tax/Model/Class/Source/Product.php
index c8cb33aff3c..017c7d51672 100644
--- a/app/code/core/Mage/Tax/Model/Class/Source/Product.php
+++ b/app/code/core/Mage/Tax/Model/Class/Source/Product.php
@@ -53,7 +53,7 @@ public function getAllOptions($withEmpty = false)
      * Get a text for option value
      *
      * @param string|int $value
-     * @return string
+     * @return string|false
      */
     public function getOptionText($value)
     {
diff --git a/composer.json b/composer.json
index 2876e29c508..2d166ccc0ae 100644
--- a/composer.json
+++ b/composer.json
@@ -26,12 +26,12 @@
   },
   "require-dev": {
     "dealerdirect/phpcodesniffer-composer-installer": "^0.7.2",
-    "friendsofphp/php-cs-fixer": ">=3.4",
+    "friendsofphp/php-cs-fixer": "^3.11",
     "macopedia/phpstan-magento1": "^1.0.4",
     "magento-ecg/coding-standard": "^4.5",
     "phpcompatibility/php-compatibility": "^9.3",
-    "phpmd/phpmd": "^2.12",
-    "phpstan/phpstan": "^1.8.5",
+    "phpmd/phpmd": "^2.13",
+    "phpstan/phpstan": "^1.8.8",
     "phpunit/phpunit": "^9.5",
     "squizlabs/php_codesniffer": "^3.7"
   },
diff --git a/composer.lock b/composer.lock
index 1fbfe659f6c..ebc1f408ce2 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "21414003e7edcfac498b5b4430d8602d",
+    "content-hash": "5bc2418e64e5433eb9c21711edfebccb",
     "packages": [
         {
             "name": "eloquent/enumeration",
@@ -334,16 +334,16 @@
         },
         {
             "name": "symfony/console",
-            "version": "v5.4.12",
+            "version": "v5.4.13",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "c072aa8f724c3af64e2c7a96b796a4863d24dba1"
+                "reference": "3f97f6c7b7e26848a90c0c0cfb91eeb2bb8618be"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/c072aa8f724c3af64e2c7a96b796a4863d24dba1",
-                "reference": "c072aa8f724c3af64e2c7a96b796a4863d24dba1",
+                "url": "https://api.github.com/repos/symfony/console/zipball/3f97f6c7b7e26848a90c0c0cfb91eeb2bb8618be",
+                "reference": "3f97f6c7b7e26848a90c0c0cfb91eeb2bb8618be",
                 "shasum": ""
             },
             "require": {
@@ -413,7 +413,7 @@
                 "terminal"
             ],
             "support": {
-                "source": "https://github.com/symfony/console/tree/v5.4.12"
+                "source": "https://github.com/symfony/console/tree/v5.4.13"
             },
             "funding": [
                 {
@@ -429,7 +429,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-08-17T13:18:05+00:00"
+            "time": "2022-08-26T13:50:20+00:00"
         },
         {
             "name": "symfony/deprecation-contracts",
@@ -1075,16 +1075,16 @@
         },
         {
             "name": "symfony/string",
-            "version": "v5.4.12",
+            "version": "v5.4.13",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/string.git",
-                "reference": "2fc515e512d721bf31ea76bd02fe23ada4640058"
+                "reference": "2900c668a32138a34118740de3e4d5a701801f53"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/2fc515e512d721bf31ea76bd02fe23ada4640058",
-                "reference": "2fc515e512d721bf31ea76bd02fe23ada4640058",
+                "url": "https://api.github.com/repos/symfony/string/zipball/2900c668a32138a34118740de3e4d5a701801f53",
+                "reference": "2900c668a32138a34118740de3e4d5a701801f53",
                 "shasum": ""
             },
             "require": {
@@ -1141,7 +1141,7 @@
                 "utf8"
             ],
             "support": {
-                "source": "https://github.com/symfony/string/tree/v5.4.12"
+                "source": "https://github.com/symfony/string/tree/v5.4.13"
             },
             "funding": [
                 {
@@ -1157,7 +1157,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-08-12T17:03:11+00:00"
+            "time": "2022-09-01T01:52:16+00:00"
         }
     ],
     "packages-dev": [
@@ -2320,16 +2320,16 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "1.8.5",
+            "version": "1.8.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "f6598a5ff12ca4499a836815e08b4d77a2ddeb20"
+                "reference": "08310ce271984587e2a4cda94e1ac66510a6ea07"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/f6598a5ff12ca4499a836815e08b4d77a2ddeb20",
-                "reference": "f6598a5ff12ca4499a836815e08b4d77a2ddeb20",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/08310ce271984587e2a4cda94e1ac66510a6ea07",
+                "reference": "08310ce271984587e2a4cda94e1ac66510a6ea07",
                 "shasum": ""
             },
             "require": {
@@ -2359,7 +2359,7 @@
             ],
             "support": {
                 "issues": "https://github.com/phpstan/phpstan/issues",
-                "source": "https://github.com/phpstan/phpstan/tree/1.8.5"
+                "source": "https://github.com/phpstan/phpstan/tree/1.8.8"
             },
             "funding": [
                 {
@@ -2375,7 +2375,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-09-07T16:05:32+00:00"
+            "time": "2022-10-06T12:51:57+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
@@ -2697,16 +2697,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "9.5.24",
+            "version": "9.5.25",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "d0aa6097bef9fd42458a9b3c49da32c6ce6129c5"
+                "reference": "3e6f90ca7e3d02025b1d147bd8d4a89fd4ca8a1d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/d0aa6097bef9fd42458a9b3c49da32c6ce6129c5",
-                "reference": "d0aa6097bef9fd42458a9b3c49da32c6ce6129c5",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/3e6f90ca7e3d02025b1d147bd8d4a89fd4ca8a1d",
+                "reference": "3e6f90ca7e3d02025b1d147bd8d4a89fd4ca8a1d",
                 "shasum": ""
             },
             "require": {
@@ -2728,14 +2728,14 @@
                 "phpunit/php-timer": "^5.0.2",
                 "sebastian/cli-parser": "^1.0.1",
                 "sebastian/code-unit": "^1.0.6",
-                "sebastian/comparator": "^4.0.5",
+                "sebastian/comparator": "^4.0.8",
                 "sebastian/diff": "^4.0.3",
                 "sebastian/environment": "^5.1.3",
-                "sebastian/exporter": "^4.0.3",
+                "sebastian/exporter": "^4.0.5",
                 "sebastian/global-state": "^5.0.1",
                 "sebastian/object-enumerator": "^4.0.3",
                 "sebastian/resource-operations": "^3.0.3",
-                "sebastian/type": "^3.1",
+                "sebastian/type": "^3.2",
                 "sebastian/version": "^3.0.2"
             },
             "suggest": {
@@ -2779,7 +2779,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.24"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.25"
             },
             "funding": [
                 {
@@ -2789,9 +2789,13 @@
                 {
                     "url": "https://github.com/sebastianbergmann",
                     "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/phpunit/phpunit",
+                    "type": "tidelift"
                 }
             ],
-            "time": "2022-08-30T07:42:16+00:00"
+            "time": "2022-09-25T03:44:45+00:00"
         },
         {
             "name": "psr/cache",
@@ -4043,16 +4047,16 @@
         },
         {
             "name": "symfony/dependency-injection",
-            "version": "v5.4.11",
+            "version": "v5.4.13",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/dependency-injection.git",
-                "reference": "a8b9251016e9476db73e25fa836904bc0bf74c62"
+                "reference": "24cf522668845391c0542bc1de496366072a6d0e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/a8b9251016e9476db73e25fa836904bc0bf74c62",
-                "reference": "a8b9251016e9476db73e25fa836904bc0bf74c62",
+                "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/24cf522668845391c0542bc1de496366072a6d0e",
+                "reference": "24cf522668845391c0542bc1de496366072a6d0e",
                 "shasum": ""
             },
             "require": {
@@ -4112,7 +4116,7 @@
             "description": "Allows you to standardize and centralize the way objects are constructed in your application",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/dependency-injection/tree/v5.4.11"
+                "source": "https://github.com/symfony/dependency-injection/tree/v5.4.13"
             },
             "funding": [
                 {
@@ -4128,7 +4132,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-07-20T13:00:38+00:00"
+            "time": "2022-08-30T19:10:13+00:00"
         },
         {
             "name": "symfony/event-dispatcher",
@@ -4296,16 +4300,16 @@
         },
         {
             "name": "symfony/filesystem",
-            "version": "v5.4.12",
+            "version": "v5.4.13",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/filesystem.git",
-                "reference": "2d67c1f9a1937406a9be3171b4b22250c0a11447"
+                "reference": "ac09569844a9109a5966b9438fc29113ce77cf51"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/filesystem/zipball/2d67c1f9a1937406a9be3171b4b22250c0a11447",
-                "reference": "2d67c1f9a1937406a9be3171b4b22250c0a11447",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/ac09569844a9109a5966b9438fc29113ce77cf51",
+                "reference": "ac09569844a9109a5966b9438fc29113ce77cf51",
                 "shasum": ""
             },
             "require": {
@@ -4340,7 +4344,7 @@
             "description": "Provides basic utilities for the filesystem",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/filesystem/tree/v5.4.12"
+                "source": "https://github.com/symfony/filesystem/tree/v5.4.13"
             },
             "funding": [
                 {
@@ -4356,7 +4360,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-08-02T13:48:16+00:00"
+            "time": "2022-09-21T19:53:16+00:00"
         },
         {
             "name": "symfony/finder",
@@ -4633,16 +4637,16 @@
         },
         {
             "name": "symfony/stopwatch",
-            "version": "v5.4.5",
+            "version": "v5.4.13",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/stopwatch.git",
-                "reference": "4d04b5c24f3c9a1a168a131f6cbe297155bc0d30"
+                "reference": "6df7a3effde34d81717bbef4591e5ffe32226d69"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/4d04b5c24f3c9a1a168a131f6cbe297155bc0d30",
-                "reference": "4d04b5c24f3c9a1a168a131f6cbe297155bc0d30",
+                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/6df7a3effde34d81717bbef4591e5ffe32226d69",
+                "reference": "6df7a3effde34d81717bbef4591e5ffe32226d69",
                 "shasum": ""
             },
             "require": {
@@ -4675,7 +4679,7 @@
             "description": "Provides a way to profile code",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/stopwatch/tree/v5.4.5"
+                "source": "https://github.com/symfony/stopwatch/tree/v5.4.13"
             },
             "funding": [
                 {
@@ -4691,7 +4695,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-02-18T16:06:09+00:00"
+            "time": "2022-09-28T13:19:49+00:00"
         },
         {
             "name": "theseer/tokenizer",
@@ -4767,8 +4771,5 @@
         "ext-zlib": "*"
     },
     "platform-dev": [],
-    "platform-overrides": {
-        "php": "7.3"
-    },
     "plugin-api-version": "2.3.0"
 }