Merge branch 'main' into phpunit

# Conflicts: # .phpstan.dist.baseline.neon # app/code/core/Mage/Catalog/Model/Url.php
OpenMage · Oct 16, 2024 · 4371d80 · 4371d80
2 parents 4809a08 + 6d3ff44
commit 4371d80
Show file tree

Hide file tree

Showing 32 changed files with 146 additions and 286 deletions.
diff --git a/.phpstan.dist.baseline.neon b/.phpstan.dist.baseline.neon
@@ -60,11 +60,6 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Adminhtml/Block/Cache/Grid.php
 
-		-
-			message: "#^Return type \\(false\\) of method Mage_Adminhtml_Block_Cache_Grid\\:\\:getRowUrl\\(\\) should be compatible with return type \\(string\\) of method Mage_Adminhtml_Block_Widget_Grid\\:\\:getRowUrl\\(\\)$#"
-			count: 1
-			path: app/code/core/Mage/Adminhtml/Block/Cache/Grid.php
-
 		-
 			message: "#^Parameter \\#1 \\$renderer of method Varien_Data_Form_Element_Abstract\\:\\:setRenderer\\(\\) expects Varien_Data_Form_Element_Renderer_Interface, Mage_Core_Block_Abstract\\|false given\\.$#"
 			count: 1
@@ -305,16 +300,6 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Adminhtml/Block/Rating/Edit/Tab/Form.php
 
-		-
-			message: "#^Parameter \\#2 \\$min of function mktime expects int, null given\\.$#"
-			count: 1
-			path: app/code/core/Mage/Adminhtml/Block/Report/Config/Form/Field/YtdStart.php
-
-		-
-			message: "#^Parameter \\#3 \\$sec of function mktime expects int, null given\\.$#"
-			count: 1
-			path: app/code/core/Mage/Adminhtml/Block/Report/Config/Form/Field/YtdStart.php
-
 		-
 			message: "#^Parameter \\#1 \\$collection of method Mage_Adminhtml_Block_Widget_Grid\\:\\:setCollection\\(\\) expects Mage_Core_Model_Resource_Db_Collection_Abstract, Mage_Reports_Model_Resource_Report_Collection given\\.$#"
 			count: 1
@@ -495,11 +480,6 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Form/Abstract.php
 
-		-
-			message: "#^Parameter \\#1 \\$addressId of method Mage_Customer_Model_Customer\\:\\:getAddressById\\(\\) expects int, null given\\.$#"
-			count: 1
-			path: app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Form/Address.php
-
 		-
 			message: "#^Method Mage_Adminhtml_Block_Sales_Order_Create_Giftmessage_Form\\:\\:getEntity\\(\\) should return Varien_Object but returns Mage_Eav_Model_Entity_Abstract\\.$#"
 			count: 1
@@ -775,11 +755,6 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Adminhtml/Block/Tax/Rate/Grid/Renderer/Data.php
 
-		-
-			message: "#^Parameter \\#1 \\$number of function number_format expects float, string\\|null given\\.$#"
-			count: 1
-			path: app/code/core/Mage/Adminhtml/Block/Tax/Rate/Grid/Renderer/Data.php
-
 		-
 			message: "#^Parameter \\#1 \\$classTypeId of method Mage_Tax_Model_Resource_Class_Collection\\:\\:setClassTypeFilter\\(\\) expects int, string given\\.$#"
 			count: 2
@@ -905,21 +880,6 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Adminhtml/Model/Config.php
 
-		-
-			message: "#^Parameter \\#1 \\$sectionNode of method Mage_Adminhtml_Model_Config\\:\\:getAttributeModule\\(\\) expects Varien_Simplexml_Element\\|null, array\\<Varien_Simplexml_Element\\>\\|false\\|null given\\.$#"
-			count: 1
-			path: app/code/core/Mage/Adminhtml/Model/Config.php
-
-		-
-			message: "#^Parameter \\#2 \\$groupNode of method Mage_Adminhtml_Model_Config\\:\\:getAttributeModule\\(\\) expects Varien_Simplexml_Element\\|null, array\\<Varien_Simplexml_Element\\>\\|false\\|null given\\.$#"
-			count: 1
-			path: app/code/core/Mage/Adminhtml/Model/Config.php
-
-		-
-			message: "#^Parameter \\#3 \\$fieldNode of method Mage_Adminhtml_Model_Config\\:\\:getAttributeModule\\(\\) expects Varien_Simplexml_Element\\|null, array\\<Varien_Simplexml_Element\\>\\|false\\|null given\\.$#"
-			count: 1
-			path: app/code/core/Mage/Adminhtml/Model/Config.php
-
 		-
 			message: "#^Property Mage_Adminhtml_Model_Config\\:\\:\\$_config \\(Mage_Core_Model_Config_Base\\) does not accept Varien_Simplexml_Config\\.$#"
 			count: 1
@@ -1005,11 +965,6 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Adminhtml/Model/System/Config/Source/Country.php
 
-		-
-			message: "#^Method Mage_Adminhtml_Model_System_Store\\:\\:__construct\\(\\) with return type void returns \\$this\\(Mage_Adminhtml_Model_System_Store\\) but should not return anything\\.$#"
-			count: 1
-			path: app/code/core/Mage/Adminhtml/Model/System/Store.php
-
 		-
 			message: "#^Variable \\$values might not be defined\\.$#"
 			count: 1
@@ -1210,11 +1165,6 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Adminhtml/controllers/Tax/RateController.php
 
-		-
-			message: "#^Parameter \\#1 \\$id of method Mage_Core_Model_Abstract\\:\\:load\\(\\) expects int\\|string, null given\\.$#"
-			count: 2
-			path: app/code/core/Mage/Adminhtml/controllers/Tax/RateController.php
-
 		-
 			message: "#^Parameter \\#1 \\$ruleModel of method Mage_Adminhtml_Tax_RuleController\\:\\:_isValidRuleRequest\\(\\) expects Mage_Tax_Model_Calculation_Rule, Mage_Core_Model_Abstract given\\.$#"
 			count: 1
@@ -1265,11 +1215,6 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Api/Model/Roles.php
 
-		-
-			message: "#^Parameter \\#3 \\$level of method Mage_Api_Model_Roles\\:\\:_buildResourcesArray\\(\\) expects int, null given\\.$#"
-			count: 2
-			path: app/code/core/Mage/Api/Model/Roles.php
-
 		-
 			message: "#^Call to an undefined method Mage_Api_Model_Resource_Rules\\:\\:update\\(\\)\\.$#"
 			count: 1
@@ -2210,11 +2155,6 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Catalog/Model/Category/Api.php
 
-		-
-			message: "#^Parameter \\#2 \\$store of method Mage_Catalog_Helper_Product\\:\\:getProduct\\(\\) expects int, null given\\.$#"
-			count: 1
-			path: app/code/core/Mage/Catalog/Model/Category/Api.php
-
 		-
 			message: "#^Method Mage_Eav_Model_Entity_Attribute_Source_Interface\\:\\:getAllOptions\\(\\) invoked with 1 parameter, 0 required\\.$#"
 			count: 1
@@ -2470,11 +2410,6 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Catalog/Model/Product/Indexer/Eav.php
 
-		-
-			message: "#^Parameter \\#2 \\$store of method Mage_Catalog_Helper_Product\\:\\:getProduct\\(\\) expects int, null given\\.$#"
-			count: 1
-			path: app/code/core/Mage/Catalog/Model/Product/Link/Api.php
-
 		-
 			message: "#^Method Mage_Catalog_Model_Product_Option\\:\\:getValuesCollection\\(\\) should return Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Option_Value_Collection but returns Mage_Catalog_Model_Resource_Product_Option_Value_Collection\\.$#"
 			count: 1
@@ -2800,11 +2735,6 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Catalog/Model/Resource/Category/Tree.php
 
-		-
-			message: "#^Parameter \\#1 \\$children of method Varien_Data_Tree_Dbp\\:\\:addChildNodes\\(\\) expects Varien_Data_Tree_Node, array\\<string, array\\<int, mixed\\>\\> given\\.$#"
-			count: 1
-			path: app/code/core/Mage/Catalog/Model/Resource/Category/Tree.php
-
 		-
 			message: "#^Parameter \\#1 \\$connection of method Varien_Data_Tree_Dbp\\:\\:__construct\\(\\) expects Zend_Db_Adapter_Abstract, Varien_Db_Adapter_Interface\\|false given\\.$#"
 			count: 1
@@ -2895,11 +2825,6 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Backend/Urlkey.php
 
-		-
-			message: "#^Parameter \\#1 \\$storeId of method Mage_Catalog_Model_Url\\:\\:refreshProductRewrites\\(\\) expects int, null given\\.$#"
-			count: 1
-			path: app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Backend/Urlkey.php
-
 		-
 			message: "#^Parameter \\#2 \\$resourceModel of method Mage_Core_Model_Resource_Db_Collection_Abstract\\:\\:_init\\(\\) expects Mage_Core_Model_Resource_Db_Abstract\\|null, string given\\.$#"
 			count: 1
@@ -3165,11 +3090,6 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/CatalogIndex/Model/Resource/Data/Grouped.php
 
-		-
-			message: "#^Method Mage_CatalogIndex_Model_Resource_Indexer_Abstract\\:\\:saveIndex\\(\\) with return type void returns mixed but should not return anything\\.$#"
-			count: 1
-			path: app/code/core/Mage/CatalogIndex/Model/Resource/Indexer/Abstract.php
-
 		-
 			message: "#^Parameter \\#3 \\$storeIds of method Mage_CatalogIndex_Model_Resource_Setup\\:\\:_setWebsiteInfo\\(\\) expects array, Mage_Core_Model_Website given\\.$#"
 			count: 1
@@ -3195,11 +3115,6 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/CatalogInventory/Model/Observer.php
 
-		-
-			message: "#^Parameter \\#1 \\$type of method Mage_Sales_Model_Quote\\:\\:removeErrorInfosByParams\\(\\) expects string, null given\\.$#"
-			count: 1
-			path: app/code/core/Mage/CatalogInventory/Model/Observer.php
-
 		-
 			message: "#^Cannot call method setTypeId\\(\\) on Mage_Core_Model_Resource_Db_Collection_Abstract\\|false\\.$#"
 			count: 1
@@ -3535,11 +3450,6 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Checkout/Model/Observer.php
 
-		-
-			message: "#^Parameter \\#1 \\$quoteId of method Mage_Checkout_Model_Session\\:\\:setQuoteId\\(\\) expects int, null given\\.$#"
-			count: 2
-			path: app/code/core/Mage/Checkout/Model/Session.php
-
 		-
 			message: "#^Call to an undefined method Mage_Sales_Model_Order\\:\\:createFromQuoteAddress\\(\\)\\.$#"
 			count: 1
@@ -3750,11 +3660,6 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Core/Model/Abstract.php
 
-		-
-			message: "#^Method Mage_Core_Model_App\\:\\:getAnyStoreView\\(\\) should return Mage_Core_Model_Store but return statement is missing\\.$#"
-			count: 1
-			path: app/code/core/Mage/Core/Model/App.php
-
 		-
 			message: "#^Method Mage_Core_Model_App\\:\\:getResponse\\(\\) should return Mage_Core_Controller_Response_Http but returns Zend_Controller_Response_Http\\.$#"
 			count: 1
@@ -3910,11 +3815,6 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Core/Model/Email/Template/Filter.php
 
-		-
-			message: "#^Parameter \\#2 \\$name of method Mage_Core_Model_Layout\\:\\:createBlock\\(\\) expects string, null given\\.$#"
-			count: 1
-			path: app/code/core/Mage/Core/Model/Email/Template/Filter.php
-
 		-
 			message: "#^Call to an undefined method Varien_Crypt_Abstract\\:\\:init\\(\\)\\.$#"
 			count: 1
@@ -4025,11 +3925,6 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Core/Model/Locale.php
 
-		-
-			message: "#^Method Mage_Core_Model_Message_Collection\\:\\:getMessageByIdentifier\\(\\) should return Mage_Core_Model_Message_Abstract\\|null but return statement is missing\\.$#"
-			count: 1
-			path: app/code/core/Mage/Core/Model/Message/Collection.php
-
 		-
 			message: "#^Call to an undefined method Mage_Core_Model_Resource_Type_Abstract\\:\\:getConnection\\(\\)\\.$#"
 			count: 1
@@ -4565,11 +4460,6 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Directory/Helper/Data.php
 
-		-
-			message: "#^Parameter \\#1 \\$storeId of method Mage_Directory_Helper_Data\\:\\:_getRegions\\(\\) expects string, int\\|null given\\.$#"
-			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
@@ -5280,16 +5170,6 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Index/Model/Lock/Storage/Db.php
 
-		-
-			message: "#^Parameter \\#1 \\$namespace of method Mage_Index_Model_Event\\:\\:setDataNamespace\\(\\) expects string, null given\\.$#"
-			count: 1
-			path: app/code/core/Mage/Index/Model/Process.php
-
-		-
-			message: "#^Parameter \\#1 \\$process of method Mage_Index_Model_Event\\:\\:setProcess\\(\\) expects Mage_Index_Model_Process, null given\\.$#"
-			count: 1
-			path: app/code/core/Mage/Index/Model/Process.php
-
 		-
 			message: "#^Parameter \\#2 \\$status of method Mage_Index_Model_Event\\:\\:addProcessId\\(\\) expects string, null given\\.$#"
 			count: 1
@@ -5475,11 +5355,6 @@ parameters:
 			count: 2
 			path: app/code/core/Mage/Paygate/Model/Authorizenet.php
 
-		-
-			message: "#^Parameter \\#3 \\$lastTransactionId of method Mage_Paygate_Helper_Data\\:\\:getExtendedTransactionMessage\\(\\) expects string, null given\\.$#"
-			count: 1
-			path: app/code/core/Mage/Paygate/Model/Authorizenet.php
-
 		-
 			message: "#^Variable \\$defaultExceptionMessage might not be defined\\.$#"
 			count: 2
@@ -6815,31 +6690,6 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Sales/Model/Quote/Item.php
 
-		-
-			message: "#^Method Mage_Sales_Model_Quote_Item\\:\\:__clone\\(\\) with return type void returns \\$this\\(Mage_Sales_Model_Quote_Item\\) but should not return anything\\.$#"
-			count: 1
-			path: app/code/core/Mage/Sales/Model/Quote/Item.php
-
-		-
-			message: "#^Return type \\(void\\) of method Mage_Sales_Model_Quote_Item\\:\\:__clone\\(\\) should be compatible with return type \\(\\$this\\(Mage_Sales_Model_Quote_Item_Abstract\\)\\) of method Mage_Sales_Model_Quote_Item_Abstract\\:\\:__clone\\(\\)$#"
-			count: 1
-			path: app/code/core/Mage/Sales/Model/Quote/Item.php
-
-		-
-			message: "#^Method Mage_Sales_Model_Quote_Item_Abstract\\:\\:__clone\\(\\) with return type void returns \\$this\\(Mage_Sales_Model_Quote_Item_Abstract\\) but should not return anything\\.$#"
-			count: 1
-			path: app/code/core/Mage/Sales/Model/Quote/Item/Abstract.php
-
-		-
-			message: "#^Parameter \\#1 \\$value of method Mage_Sales_Model_Quote_Item_Abstract\\:\\:setConvertedPrice\\(\\) expects float, null given\\.$#"
-			count: 1
-			path: app/code/core/Mage/Sales/Model/Quote/Item/Abstract.php
-
-		-
-			message: "#^Method Mage_Sales_Model_Quote_Item_Option\\:\\:__clone\\(\\) with return type void returns \\$this\\(Mage_Sales_Model_Quote_Item_Option\\) but should not return anything\\.$#"
-			count: 1
-			path: app/code/core/Mage/Sales/Model/Quote/Item/Option.php
-
 		-
 			message: "#^Call to Exception\\:\\:__construct\\(\\) on a separate line has no effect\\.$#"
 			count: 1
@@ -7950,11 +7800,6 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Wishlist/Model/Item.php
 
-		-
-			message: "#^Method Mage_Wishlist_Model_Item_Option\\:\\:__clone\\(\\) with return type void returns \\$this\\(Mage_Wishlist_Model_Item_Option\\) but should not return anything\\.$#"
-			count: 1
-			path: app/code/core/Mage/Wishlist/Model/Item/Option.php
-
 		-
 			message: "#^Parameter \\#1 \\$collection of method Mage_Adminhtml_Helper_Sales\\:\\:applySalableProductTypesFilter\\(\\) expects Mage_Core_Model_Resource_Db_Collection_Abstract, Mage_Catalog_Model_Resource_Product_Collection given\\.$#"
 			count: 1
@@ -7965,16 +7810,6 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Wishlist/Model/Wishlist.php
 
-		-
-			message: "#^Method Mage_Wishlist_IndexController\\:\\:_addItemToWishList\\(\\) with return type void returns mixed but should not return anything\\.$#"
-			count: 1
-			path: app/code/core/Mage/Wishlist/controllers/IndexController.php
-
-		-
-			message: "#^Method Mage_Wishlist_IndexController\\:\\:downloadCustomOptionAction\\(\\) with return type void returns mixed but should not return anything\\.$#"
-			count: 3
-			path: app/code/core/Mage/Wishlist/controllers/IndexController.php
-
 		-
 			message: "#^Parameter \\#1 \\$qty of method Mage_Wishlist_Model_Item\\:\\:setQty\\(\\) expects int, float given\\.$#"
 			count: 1
@@ -8175,16 +8010,6 @@ parameters:
 			count: 1
 			path: lib/Varien/Data/Tree.php
 
-		-
-			message: "#^Parameter \\#1 \\$children of method Varien_Data_Tree_Dbp\\:\\:_addChildNodes\\(\\) expects Varien_Data_Tree_Node, array\\<string, array\\<int, mixed\\>\\> given\\.$#"
-			count: 1
-			path: lib/Varien/Data/Tree/Dbp.php
-
-		-
-			message: "#^Parameter \\#1 \\$children of method Varien_Data_Tree_Dbp\\:\\:addChildNodes\\(\\) expects Varien_Data_Tree_Node, array\\<string, array\\<int, mixed\\>\\> given\\.$#"
-			count: 1
-			path: lib/Varien/Data/Tree/Dbp.php
-
 		-
 			message: "#^Method Varien_Data_Tree\\:\\:load\\(\\) invoked with 2 parameters, 0\\-1 required\\.$#"
 			count: 1
@@ -8359,8 +8184,3 @@ parameters:
 			message: "#^Parameter \\#2 \\$timestamp of function gmdate expects int, float given\\.$#"
 			count: 1
 			path: shell/indexer.php
-
-		-
-			message: "#^Parameter \\#1 \\$id of method Mage_Cms_Model_Page\\:\\:load\\(\\) expects int\\|string, null given\\.$#"
-			count: 1
-			path: tests/unit/Mage/Cms/Model/PageTest.php