diff --git a/.phpstan.dist.baseline.neon b/.phpstan.dist.baseline.neon index 8ebee81ab76..a4c1b8adbc0 100644 --- a/.phpstan.dist.baseline.neon +++ b/.phpstan.dist.baseline.neon @@ -56,7 +56,7 @@ parameters: path: app/code/core/Mage/Adminhtml/Block/Api/Tab/Userroles.php - - message: "#^Parameter \\#1 \\$collection of method Mage_Adminhtml_Block_Widget_Grid\\:\\:setCollection\\(\\) expects Mage_Core_Model_Resource_Db_Collection_Abstract, Varien_Data_Collection given\\.$#" + message: "#^Parameter \\#1 \\$collection of method Mage_Adminhtml_Block_Widget_Grid\\:\\:setCollection\\(\\) expects Varien_Data_Collection_Db, Varien_Data_Collection given\\.$#" count: 1 path: app/code/core/Mage/Adminhtml/Block/Cache/Grid.php @@ -65,11 +65,6 @@ parameters: count: 1 path: app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/Attributes.php - - - message: "#^Parameter \\#1 \\$collection of method Mage_Adminhtml_Block_Widget_Grid\\:\\:setCollection\\(\\) expects Mage_Core_Model_Resource_Db_Collection_Abstract, Mage_Catalog_Model_Resource_Product_Collection given\\.$#" - count: 1 - path: app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/Product.php - - message: "#^Cannot call method addAttributeToSelect\\(\\) on Mage_Core_Model_Resource_Db_Collection_Abstract\\|false\\.$#" count: 1 @@ -95,76 +90,26 @@ parameters: count: 1 path: app/code/core/Mage/Adminhtml/Block/Catalog/Product/Created.php - - - message: "#^Parameter \\#1 \\$collection of method Mage_Adminhtml_Block_Widget_Grid\\:\\:setCollection\\(\\) expects Mage_Core_Model_Resource_Db_Collection_Abstract, Mage_ProductAlert_Model_Resource_Price_Customer_Collection given\\.$#" - count: 1 - path: app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Alerts/Price.php - - - - message: "#^Parameter \\#1 \\$collection of method Mage_Adminhtml_Block_Widget_Grid\\:\\:setCollection\\(\\) expects Mage_Core_Model_Resource_Db_Collection_Abstract, Mage_ProductAlert_Model_Resource_Stock_Customer_Collection given\\.$#" - count: 1 - path: app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Alerts/Stock.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: 4 path: app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Attributes.php - - - message: "#^Parameter \\#1 \\$collection of method Mage_Adminhtml_Block_Widget_Grid\\:\\:setCollection\\(\\) expects Mage_Core_Model_Resource_Db_Collection_Abstract, Mage_Catalog_Model_Resource_Product_Link_Product_Collection given\\.$#" - count: 1 - path: app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Crosssell.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 path: app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price.php - - - message: "#^Parameter \\#1 \\$collection of method Mage_Adminhtml_Block_Widget_Grid\\:\\:setCollection\\(\\) expects Mage_Core_Model_Resource_Db_Collection_Abstract, Mage_Catalog_Model_Resource_Product_Link_Product_Collection given\\.$#" - count: 1 - path: app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Related.php - - - - message: "#^Parameter \\#1 \\$collection of method Mage_Adminhtml_Block_Widget_Grid\\:\\:setCollection\\(\\) expects Mage_Core_Model_Resource_Db_Collection_Abstract, Mage_Catalog_Model_Resource_Product_Collection given\\.$#" - count: 1 - path: app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid.php - - message: "#^Method Mage_Eav_Model_Entity_Attribute_Source_Interface\\:\\:getAllOptions\\(\\) invoked with 2 parameters, 0 required\\.$#" count: 1 path: app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Simple.php - - - message: "#^Parameter \\#1 \\$collection of method Mage_Adminhtml_Block_Widget_Grid\\:\\:setCollection\\(\\) expects Mage_Core_Model_Resource_Db_Collection_Abstract, Mage_Catalog_Model_Resource_Product_Link_Product_Collection given\\.$#" - count: 1 - path: app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Group.php - - message: "#^Method Mage_Catalog_Model_Product_Type_Configurable\\:\\:canUseAttribute\\(\\) invoked with 2 parameters, 1 required\\.$#" count: 1 path: app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Settings.php - - - message: "#^Parameter \\#1 \\$collection of method Mage_Adminhtml_Block_Widget_Grid\\:\\:setCollection\\(\\) expects Mage_Core_Model_Resource_Db_Collection_Abstract, Mage_Tag_Model_Resource_Customer_Collection given\\.$#" - count: 1 - path: app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Tag/Customer.php - - - - message: "#^Parameter \\#1 \\$collection of method Mage_Adminhtml_Block_Widget_Grid\\:\\:setCollection\\(\\) expects Mage_Core_Model_Resource_Db_Collection_Abstract, Mage_Catalog_Model_Resource_Product_Link_Product_Collection given\\.$#" - count: 1 - path: app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Upsell.php - - - - message: "#^Parameter \\#1 \\$collection of method Mage_Adminhtml_Block_Widget_Grid\\:\\:setCollection\\(\\) expects Mage_Core_Model_Resource_Db_Collection_Abstract, Mage_Catalog_Model_Resource_Product_Collection given\\.$#" - count: 1 - path: app/code/core/Mage/Adminhtml/Block/Catalog/Product/Grid.php - - - - message: "#^Parameter \\#1 \\$collection of method Mage_Adminhtml_Block_Widget_Grid\\:\\:setCollection\\(\\) expects Mage_Core_Model_Resource_Db_Collection_Abstract, Mage_Catalog_Model_Resource_Product_Collection given\\.$#" - count: 1 - path: app/code/core/Mage/Adminhtml/Block/Catalog/Product/Widget/Chooser.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 @@ -172,34 +117,9 @@ parameters: - 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 - path: app/code/core/Mage/Adminhtml/Block/Checkout/Agreement/Edit/Form.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 - path: app/code/core/Mage/Adminhtml/Block/Cms/Block/Edit/Form.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 - path: app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tab/Main.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: 4 + count: 3 path: app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Account.php - - - message: "#^Parameter \\#1 \\$collection of method Mage_Adminhtml_Block_Widget_Grid\\:\\:setCollection\\(\\) expects Mage_Core_Model_Resource_Db_Collection_Abstract, Mage_Tag_Model_Resource_Customer_Collection given\\.$#" - count: 1 - path: app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Tag.php - - - - message: "#^Parameter \\#1 \\$collection of method Mage_Adminhtml_Block_Widget_Grid\\:\\:setCollection\\(\\) expects Mage_Core_Model_Resource_Db_Collection_Abstract, Mage_Customer_Model_Resource_Customer_Collection given\\.$#" - count: 1 - path: app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Tags.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 @@ -210,11 +130,6 @@ parameters: count: 1 path: app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Wishlist.php - - - message: "#^Parameter \\#1 \\$collection of method Mage_Adminhtml_Block_Widget_Grid\\:\\:setCollection\\(\\) expects Mage_Core_Model_Resource_Db_Collection_Abstract, Mage_Customer_Model_Resource_Customer_Collection given\\.$#" - count: 1 - path: app/code/core/Mage/Adminhtml/Block/Customer/Grid.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 @@ -225,16 +140,6 @@ parameters: count: 1 path: app/code/core/Mage/Adminhtml/Block/Customer/Sales/Order/Address/Form/Renderer/Vat.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_Customer_Collection given\\.$#" - count: 1 - path: app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Customers/Newest.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_Product_Collection given\\.$#" - count: 1 - path: app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Products/Viewed.php - - message: "#^Access to an undefined property Mage_Adminhtml_Block_Notification_Window\\:\\:\\$_aclResourcePath\\.$#" count: 1 @@ -270,11 +175,6 @@ parameters: count: 1 path: app/code/core/Mage/Adminhtml/Block/Permissions/Usernroles.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 - path: app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Tab/Main.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 @@ -282,7 +182,7 @@ parameters: - 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: 2 + count: 1 path: app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Main.php - @@ -291,17 +191,7 @@ parameters: path: app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Main.php - - message: "#^Parameter \\#1 \\$collection of method Mage_Adminhtml_Block_Widget_Grid\\:\\:setCollection\\(\\) expects Mage_Core_Model_Resource_Db_Collection_Abstract, Mage_Catalog_Model_Resource_Product_Collection given\\.$#" - count: 1 - path: app/code/core/Mage/Adminhtml/Block/Promo/Widget/Chooser/Sku.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 - path: app/code/core/Mage/Adminhtml/Block/Rating/Edit/Tab/Form.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\\.$#" + message: "#^Parameter \\#1 \\$collection of method Mage_Adminhtml_Block_Widget_Grid\\:\\:setCollection\\(\\) expects Varien_Data_Collection_Db, Mage_Reports_Model_Resource_Report_Collection given\\.$#" count: 1 path: app/code/core/Mage/Adminhtml/Block/Report/Grid.php @@ -316,7 +206,12 @@ parameters: path: app/code/core/Mage/Adminhtml/Block/Report/Grid.php - - message: "#^Parameter \\#1 \\$collection of method Mage_Adminhtml_Block_Widget_Grid\\:\\:setCollection\\(\\) expects Mage_Core_Model_Resource_Db_Collection_Abstract, Mage_Reports_Model_Grouped_Collection given\\.$#" + message: "#^Method Mage_Adminhtml_Block_Report_Grid_Abstract\\:\\:getCollection\\(\\) should return Mage_Core_Model_Resource_Db_Collection_Abstract\\|Mage_Reports_Model_Grouped_Collection but returns Varien_Data_Collection_Db\\|null\\.$#" + count: 1 + path: app/code/core/Mage/Adminhtml/Block/Report/Grid/Abstract.php + + - + message: "#^Parameter \\#1 \\$collection of method Mage_Adminhtml_Block_Widget_Grid\\:\\:setCollection\\(\\) expects Varien_Data_Collection_Db, Mage_Reports_Model_Grouped_Collection given\\.$#" count: 1 path: app/code/core/Mage/Adminhtml/Block/Report/Grid/Abstract.php @@ -335,11 +230,6 @@ parameters: count: 1 path: app/code/core/Mage/Adminhtml/Block/Report/Grid/Column/Renderer/Currency.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_Product_Downloads_Collection given\\.$#" - count: 1 - path: app/code/core/Mage/Adminhtml/Block/Report/Product/Downloads/Grid.php - - message: "#^Call to an undefined method Mage_Eav_Model_Entity_Abstract\\:\\:setStore\\(\\)\\.$#" count: 1 @@ -350,96 +240,31 @@ parameters: count: 1 path: app/code/core/Mage/Adminhtml/Block/Report/Product/Grid.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_Product_Collection given\\.$#" - count: 1 - path: app/code/core/Mage/Adminhtml/Block/Report/Product/Grid.php - - message: "#^Parameter \\#1 \\$grid of method Mage_Reports_Model_Totals\\:\\:countTotals\\(\\) expects Mage_Adminhtml_Block_Report_Grid, \\$this\\(Mage_Adminhtml_Block_Report_Product_Grid\\) given\\.$#" count: 1 path: app/code/core/Mage/Adminhtml/Block/Report/Product/Grid.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_Product_Lowstock_Collection given\\.$#" - count: 1 - path: app/code/core/Mage/Adminhtml/Block/Report/Product/Lowstock/Grid.php - - message: "#^Parameter \\#1 \\$fields of method Mage_Reports_Model_Resource_Product_Lowstock_Collection\\:\\:joinInventoryItem\\(\\) expects array, string given\\.$#" count: 1 path: app/code/core/Mage/Adminhtml/Block/Report/Product/Lowstock/Grid.php - - message: "#^Parameter \\#1 \\$collection of method Mage_Adminhtml_Block_Widget_Grid\\:\\:setCollection\\(\\) expects Mage_Core_Model_Resource_Db_Collection_Abstract, Varien_Data_Collection given\\.$#" + message: "#^Parameter \\#1 \\$collection of method Mage_Adminhtml_Block_Widget_Grid\\:\\:setCollection\\(\\) expects Varien_Data_Collection_Db, Varien_Data_Collection given\\.$#" count: 1 path: app/code/core/Mage/Adminhtml/Block/Report/Refresh/Statistics/Grid.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_Review_Product_Collection given\\.$#" - count: 1 - path: app/code/core/Mage/Adminhtml/Block/Report/Review/Product/Grid.php - - message: "#^Parameter \\#2 \\$filter of method Mage_Reports_Model_Resource_Quote_Collection\\:\\:prepareForAbandonedReport\\(\\) expects string\\|null, array\\ given\\.$#" count: 1 path: app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Abandoned/Grid.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_Customer_Collection given\\.$#" - count: 1 - path: app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Customer/Grid.php - - - - message: "#^Parameter \\#1 \\$collection of method Mage_Adminhtml_Block_Widget_Grid\\:\\:setCollection\\(\\) expects Mage_Core_Model_Resource_Db_Collection_Abstract, Mage_Tag_Model_Resource_Product_Collection given\\.$#" - count: 1 - path: app/code/core/Mage/Adminhtml/Block/Report/Tag/Customer/Detail/Grid.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_Tag_Customer_Collection given\\.$#" - count: 1 - path: app/code/core/Mage/Adminhtml/Block/Report/Tag/Customer/Grid.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_Tag_Customer_Collection given\\.$#" - count: 1 - path: app/code/core/Mage/Adminhtml/Block/Report/Tag/Popular/Detail/Grid.php - - message: "#^Parameter \\#1 \\$statusCode of method Mage_Tag_Model_Resource_Popular_Collection\\:\\:addStatusFilter\\(\\) expects string, int given\\.$#" count: 1 path: app/code/core/Mage/Adminhtml/Block/Report/Tag/Popular/Grid.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_Tag_Product_Collection given\\.$#" - count: 1 - path: app/code/core/Mage/Adminhtml/Block/Report/Tag/Product/Detail/Grid.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_Tag_Product_Collection given\\.$#" - count: 1 - path: app/code/core/Mage/Adminhtml/Block/Report/Tag/Product/Grid.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_Wishlist_Product_Collection given\\.$#" - count: 1 - path: app/code/core/Mage/Adminhtml/Block/Report/Wishlist/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 - path: app/code/core/Mage/Adminhtml/Block/Review/Add/Form.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 - path: app/code/core/Mage/Adminhtml/Block/Review/Edit/Form.php - - - - message: "#^Parameter \\#1 \\$collection of method Mage_Adminhtml_Block_Widget_Grid\\:\\:setCollection\\(\\) expects Mage_Core_Model_Resource_Db_Collection_Abstract, Mage_Review_Model_Resource_Review_Product_Collection given\\.$#" - count: 1 - path: app/code/core/Mage/Adminhtml/Block/Review/Grid.php - - 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 @@ -455,11 +280,6 @@ parameters: count: 1 path: app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Billing/Address.php - - - message: "#^Parameter \\#1 \\$collection of method Mage_Adminhtml_Block_Widget_Grid\\:\\:setCollection\\(\\) expects Mage_Core_Model_Resource_Db_Collection_Abstract, Mage_Customer_Model_Resource_Customer_Collection given\\.$#" - count: 1 - path: app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Customer/Grid.php - - message: "#^Parameter \\#1 \\$currency of method Mage_Directory_Model_Currency\\:\\:getCurrencyRates\\(\\) expects string, Mage_Directory_Model_Currency given\\.$#" count: 1 @@ -500,11 +320,6 @@ parameters: count: 1 path: app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Newsletter.php - - - message: "#^Parameter \\#1 \\$collection of method Mage_Adminhtml_Block_Widget_Grid\\:\\:setCollection\\(\\) expects Mage_Core_Model_Resource_Db_Collection_Abstract, Mage_Catalog_Model_Resource_Product_Collection given\\.$#" - count: 1 - path: app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search/Grid.php - - message: "#^Method Mage_Adminhtml_Block_Sales_Order_Create_Shipping_Address\\:\\:getAddress\\(\\) should return Mage_Customer_Model_Address but returns Mage_Sales_Model_Quote_Address\\.$#" count: 1 @@ -616,7 +431,7 @@ parameters: path: app/code/core/Mage/Adminhtml/Block/Sales/Reorder/Renderer/Action.php - - message: "#^Parameter \\#1 \\$collection of method Mage_Adminhtml_Block_Widget_Grid\\:\\:setCollection\\(\\) expects Mage_Core_Model_Resource_Db_Collection_Abstract, Varien_Data_Collection given\\.$#" + message: "#^Parameter \\#1 \\$collection of method Mage_Adminhtml_Block_Widget_Grid\\:\\:setCollection\\(\\) expects Varien_Data_Collection_Db, Varien_Data_Collection given\\.$#" count: 1 path: app/code/core/Mage/Adminhtml/Block/Sales/Transactions/Detail/Grid.php @@ -625,11 +440,6 @@ parameters: count: 1 path: app/code/core/Mage/Adminhtml/Block/Shipping/Carrier/Tablerate/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 - path: app/code/core/Mage/Adminhtml/Block/Sitemap/Edit/Form.php - - message: "#^Property Mage_Adminhtml_Block_Store_Switcher_Form_Renderer_Fieldset\\:\\:\\$_element \\(Varien_Data_Form_Element_Fieldset\\) does not accept Varien_Data_Form_Element_Abstract\\.$#" count: 1 @@ -710,46 +520,16 @@ parameters: count: 1 path: app/code/core/Mage/Adminhtml/Block/System/Currency/Rate/Matrix.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 - path: app/code/core/Mage/Adminhtml/Block/System/Design/Edit/Tab/General.php - - message: "#^Method Mage_Core_Model_Email_Template\\:\\:getProcessedTemplate\\(\\) invoked with 2 parameters, 0\\-1 required\\.$#" count: 1 path: app/code/core/Mage/Adminhtml/Block/System/Email/Template/Preview.php - - - message: "#^Parameter \\#1 \\$collection of method Mage_Adminhtml_Block_Widget_Grid\\:\\:setCollection\\(\\) expects Mage_Core_Model_Resource_Db_Collection_Abstract, Mage_Catalog_Model_Resource_Product_Collection given\\.$#" - count: 1 - path: app/code/core/Mage/Adminhtml/Block/Tag/Assigned/Grid.php - - - - message: "#^Parameter \\#1 \\$collection of method Mage_Adminhtml_Block_Widget_Grid\\:\\:setCollection\\(\\) expects Mage_Core_Model_Resource_Db_Collection_Abstract, Mage_Tag_Model_Resource_Customer_Collection given\\.$#" - count: 1 - path: app/code/core/Mage/Adminhtml/Block/Tag/Customer/Grid.php - - message: "#^Call to an undefined method Mage_Tag_Model_Resource_Tag_Collection\\:\\:addAttributeToFilter\\(\\)\\.$#" count: 1 path: app/code/core/Mage/Adminhtml/Block/Tag/Grid/All.php - - - message: "#^Parameter \\#1 \\$collection of method Mage_Adminhtml_Block_Widget_Grid\\:\\:setCollection\\(\\) expects Mage_Core_Model_Resource_Db_Collection_Abstract, Mage_Tag_Model_Resource_Customer_Collection given\\.$#" - count: 1 - path: app/code/core/Mage/Adminhtml/Block/Tag/Grid/Customers.php - - - - message: "#^Parameter \\#1 \\$collection of method Mage_Adminhtml_Block_Widget_Grid\\:\\:setCollection\\(\\) expects Mage_Core_Model_Resource_Db_Collection_Abstract, Mage_Tag_Model_Resource_Product_Collection given\\.$#" - count: 1 - path: app/code/core/Mage/Adminhtml/Block/Tag/Grid/Products.php - - - - message: "#^Parameter \\#1 \\$collection of method Mage_Adminhtml_Block_Widget_Grid\\:\\:setCollection\\(\\) expects Mage_Core_Model_Resource_Db_Collection_Abstract, Mage_Tag_Model_Resource_Product_Collection given\\.$#" - count: 1 - path: app/code/core/Mage/Adminhtml/Block/Tag/Product/Grid.php - - message: "#^Binary operation \"\\*\" between string and 1 results in an error\\.$#" count: 1 @@ -765,11 +545,6 @@ parameters: count: 2 path: app/code/core/Mage/Adminhtml/Block/Tax/Rule/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 - path: app/code/core/Mage/Adminhtml/Block/Urlrewrite/Edit/Form.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 @@ -1341,7 +1116,7 @@ parameters: path: app/code/core/Mage/Api/Model/Wsdl/Config/Element.php - - message: "#^Parameter \\#1 \\$collection of method Mage_Adminhtml_Block_Widget_Grid\\:\\:setCollection\\(\\) expects Mage_Core_Model_Resource_Db_Collection_Abstract, Varien_Data_Collection given\\.$#" + message: "#^Parameter \\#1 \\$collection of method Mage_Adminhtml_Block_Widget_Grid\\:\\:setCollection\\(\\) expects Varien_Data_Collection_Db, Varien_Data_Collection given\\.$#" count: 1 path: app/code/core/Mage/Api2/Block/Adminhtml/Attribute/Grid.php @@ -1595,51 +1370,6 @@ parameters: count: 1 path: app/code/core/Mage/Authorizenet/controllers/Directpost/PaymentController.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 - path: app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Checkbox.php - - - - message: "#^Parameter \\#2 \\$containerId \\(string\\) of method Mage_Bundle_Block_Adminhtml_Catalog_Product_Composite_Fieldset_Options_Type_Checkbox\\:\\:setValidationContainer\\(\\) should be compatible with parameter \\$containerId \\(int\\) of method Mage_Bundle_Block_Catalog_Product_View_Type_Bundle_Option\\:\\:setValidationContainer\\(\\)$#" - count: 1 - path: app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Checkbox.php - - - - message: "#^Parameter \\#1 \\$elementId \\(string\\) of method Mage_Bundle_Block_Adminhtml_Catalog_Product_Composite_Fieldset_Options_Type_Multi\\:\\:setValidationContainer\\(\\) should be compatible with parameter \\$elementId \\(int\\) of method Mage_Bundle_Block_Catalog_Product_View_Type_Bundle_Option\\:\\:setValidationContainer\\(\\)$#" - count: 1 - path: app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Multi.php - - - - message: "#^Parameter \\#2 \\$containerId \\(string\\) of method Mage_Bundle_Block_Adminhtml_Catalog_Product_Composite_Fieldset_Options_Type_Multi\\:\\:setValidationContainer\\(\\) should be compatible with parameter \\$containerId \\(int\\) of method Mage_Bundle_Block_Catalog_Product_View_Type_Bundle_Option\\:\\:setValidationContainer\\(\\)$#" - count: 1 - path: app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Multi.php - - - - message: "#^Parameter \\#1 \\$elementId \\(string\\) of method Mage_Bundle_Block_Adminhtml_Catalog_Product_Composite_Fieldset_Options_Type_Radio\\:\\:setValidationContainer\\(\\) should be compatible with parameter \\$elementId \\(int\\) of method Mage_Bundle_Block_Catalog_Product_View_Type_Bundle_Option\\:\\:setValidationContainer\\(\\)$#" - count: 1 - path: app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Radio.php - - - - message: "#^Parameter \\#2 \\$containerId \\(string\\) of method Mage_Bundle_Block_Adminhtml_Catalog_Product_Composite_Fieldset_Options_Type_Radio\\:\\:setValidationContainer\\(\\) should be compatible with parameter \\$containerId \\(int\\) of method Mage_Bundle_Block_Catalog_Product_View_Type_Bundle_Option\\:\\:setValidationContainer\\(\\)$#" - count: 1 - path: app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Radio.php - - - - message: "#^Parameter \\#1 \\$elementId \\(string\\) of method Mage_Bundle_Block_Adminhtml_Catalog_Product_Composite_Fieldset_Options_Type_Select\\:\\:setValidationContainer\\(\\) should be compatible with parameter \\$elementId \\(int\\) of method Mage_Bundle_Block_Catalog_Product_View_Type_Bundle_Option\\:\\:setValidationContainer\\(\\)$#" - count: 1 - path: app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Select.php - - - - message: "#^Parameter \\#2 \\$containerId \\(string\\) of method Mage_Bundle_Block_Adminhtml_Catalog_Product_Composite_Fieldset_Options_Type_Select\\:\\:setValidationContainer\\(\\) should be compatible with parameter \\$containerId \\(int\\) of method Mage_Bundle_Block_Catalog_Product_View_Type_Bundle_Option\\:\\:setValidationContainer\\(\\)$#" - count: 1 - path: app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Select.php - - - - message: "#^Parameter \\#1 \\$collection of method Mage_Adminhtml_Block_Widget_Grid\\:\\:setCollection\\(\\) expects Mage_Core_Model_Resource_Db_Collection_Abstract, Mage_Catalog_Model_Resource_Product_Collection given\\.$#" - count: 1 - path: app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Search/Grid.php - - message: "#^Method Mage_Bundle_Block_Adminhtml_Catalog_Product_Edit_Tab_Bundle_Option_Selection\\:\\:isUsedWebsitePrice\\(\\) should return string but returns bool\\.$#" count: 1 @@ -2520,16 +2250,6 @@ parameters: count: 2 path: app/code/core/Mage/Catalog/Model/Product/Option/Type/Select.php - - - message: "#^Parameter \\#1 \\$valueId of method Mage_Catalog_Model_Product_Option\\:\\:getValueById\\(\\) expects int, string given\\.$#" - count: 6 - path: app/code/core/Mage/Catalog/Model/Product/Option/Type/Select.php - - - - message: "#^Parameter \\#1 \\$value of method Mage_Catalog_Model_Product_Option_Value\\:\\:addValue\\(\\) expects string, array given\\.$#" - count: 1 - path: app/code/core/Mage/Catalog/Model/Product/Option/Value/Api.php - - message: "#^Call to an undefined method Mage_Eav_Model_Entity_Collection_Abstract\\:\\:getStoreId\\(\\)\\.$#" count: 1 @@ -2635,11 +2355,6 @@ parameters: count: 1 path: app/code/core/Mage/Catalog/Model/Resource/Abstract.php - - - message: "#^Parameter \\#1 \\$object of method Mage_Catalog_Model_Resource_Abstract\\:\\:_saveAttributeValue\\(\\) expects Mage_Catalog_Model_Abstract, Varien_Object given\\.$#" - count: 2 - path: app/code/core/Mage/Catalog/Model/Resource/Abstract.php - - message: "#^Parameter \\#1 \\$object of method Mage_Catalog_Model_Resource_Abstract\\:\\:load\\(\\) expects Mage_Core_Model_Abstract, Varien_Object given\\.$#" count: 1 @@ -2660,31 +2375,6 @@ parameters: count: 1 path: app/code/core/Mage/Catalog/Model/Resource/Attribute.php - - - message: "#^Method Mage_Catalog_Model_Resource_Category\\:\\:getChildrenAmount\\(\\) should return int but returns string\\|false\\|null\\.$#" - count: 1 - path: app/code/core/Mage/Catalog/Model/Resource/Category.php - - - - message: "#^Method Mage_Catalog_Model_Resource_Category\\:\\:getChildrenCount\\(\\) should return int but returns string\\|false\\|null\\.$#" - count: 1 - path: app/code/core/Mage/Catalog/Model/Resource/Category.php - - - - message: "#^Parameter \\#1 \\$alias of method Mage_Eav_Model_Entity_Abstract\\:\\:getTable\\(\\) expects string, array\\ given\\.$#" - count: 2 - path: app/code/core/Mage/Catalog/Model/Resource/Category.php - - - - message: "#^Parameter \\#1 \\$read of method Mage_Eav_Model_Entity_Abstract\\:\\:setConnection\\(\\) expects string\\|Zend_Db_Adapter_Abstract, Varien_Db_Adapter_Interface\\|false given\\.$#" - count: 1 - path: app/code/core/Mage/Catalog/Model/Resource/Category.php - - - - message: "#^Parameter \\#2 \\$write of method Mage_Eav_Model_Entity_Abstract\\:\\:setConnection\\(\\) expects string\\|Zend_Db_Adapter_Abstract\\|null, Varien_Db_Adapter_Interface\\|false given\\.$#" - count: 1 - path: app/code/core/Mage/Catalog/Model/Resource/Category.php - - message: "#^Parameter \\#3 \\$exclude of method Mage_Catalog_Model_Resource_Category_Tree\\:\\:addCollectionData\\(\\) expects array, int given\\.$#" count: 1 @@ -2845,36 +2535,11 @@ parameters: count: 1 path: app/code/core/Mage/Catalog/Model/Resource/Product.php - - - message: "#^Parameter \\#1 \\$alias of method Mage_Eav_Model_Entity_Abstract\\:\\:getTable\\(\\) expects string, array\\ given\\.$#" - count: 1 - path: app/code/core/Mage/Catalog/Model/Resource/Product.php - - message: "#^Parameter \\#1 \\$expression of class Zend_Db_Expr constructor expects string, int given\\.$#" count: 2 path: app/code/core/Mage/Catalog/Model/Resource/Product.php - - - message: "#^Parameter \\#1 \\$product of method Mage_Catalog_Model_Resource_Product\\:\\:getCategoryIds\\(\\) expects Mage_Catalog_Model_Product, Varien_Object given\\.$#" - count: 1 - path: app/code/core/Mage/Catalog/Model/Resource/Product.php - - - - message: "#^Parameter \\#1 \\$object of method Mage_Catalog_Model_Resource_Abstract\\:\\:_saveAttributeValue\\(\\) expects Mage_Catalog_Model_Abstract, Varien_Object given\\.$#" - count: 1 - path: app/code/core/Mage/Catalog/Model/Resource/Product/Action.php - - - - message: "#^Parameter \\#1 \\$read of method Mage_Eav_Model_Entity_Abstract\\:\\:setConnection\\(\\) expects string\\|Zend_Db_Adapter_Abstract, Varien_Db_Adapter_Interface\\|false given\\.$#" - count: 1 - path: app/code/core/Mage/Catalog/Model/Resource/Product/Action.php - - - - message: "#^Parameter \\#2 \\$write of method Mage_Eav_Model_Entity_Abstract\\:\\:setConnection\\(\\) expects string\\|Zend_Db_Adapter_Abstract\\|null, Varien_Db_Adapter_Interface\\|false given\\.$#" - count: 1 - path: app/code/core/Mage/Catalog/Model/Resource/Product/Action.php - - message: "#^Method Mage_Catalog_Model_Resource_Product_Attribute_Backend_Media\\:\\:insertGallery\\(\\) should return int but returns string\\.$#" count: 1 @@ -4035,11 +3700,6 @@ parameters: count: 1 path: app/code/core/Mage/Core/Model/Resource/Db/Abstract.php - - - message: "#^Parameter \\#1 \\$conn of method Varien_Data_Collection_Db\\:\\:setConnection\\(\\) expects Zend_Db_Adapter_Abstract, Varien_Db_Adapter_Interface given\\.$#" - count: 1 - path: app/code/core/Mage/Core/Model/Resource/Db/Collection/Abstract.php - - message: "#^Property Mage_Core_Model_Resource_Db_Collection_Abstract\\:\\:\\$_resource \\(Mage_Core_Model_Resource_Db_Abstract\\) does not accept Mage_Core_Model_Resource_Db_Collection_Abstract\\|false\\.$#" count: 1 @@ -4365,26 +4025,6 @@ parameters: count: 1 path: app/code/core/Mage/Customer/Model/Customer/Api/V2.php - - - message: "#^Parameter \\#1 \\$read of method Mage_Eav_Model_Entity_Abstract\\:\\:setConnection\\(\\) expects string\\|Zend_Db_Adapter_Abstract, Varien_Db_Adapter_Interface\\|false given\\.$#" - count: 1 - path: app/code/core/Mage/Customer/Model/Resource/Address.php - - - - message: "#^Parameter \\#2 \\$write of method Mage_Eav_Model_Entity_Abstract\\:\\:setConnection\\(\\) expects string\\|Zend_Db_Adapter_Abstract\\|null, Varien_Db_Adapter_Interface\\|false given\\.$#" - count: 1 - path: app/code/core/Mage/Customer/Model/Resource/Address.php - - - - message: "#^Method Mage_Customer_Model_Resource_Customer\\:\\:getWebsiteId\\(\\) should return int but returns string\\|false\\|null\\.$#" - count: 1 - path: app/code/core/Mage/Customer/Model/Resource/Customer.php - - - - message: "#^Parameter \\#1 \\$alias of method Mage_Eav_Model_Entity_Abstract\\:\\:getTable\\(\\) expects string, array\\ given\\.$#" - count: 1 - path: app/code/core/Mage/Customer/Model/Resource/Customer.php - - message: "#^Parameter \\#1 \\$customer of method Mage_Customer_Model_Resource_Customer\\:\\:_saveAddresses\\(\\) expects Mage_Customer_Model_Customer, Varien_Object given\\.$#" count: 1 @@ -4751,60 +4391,20 @@ parameters: path: app/code/core/Mage/Eav/Model/Convert/Parser/Abstract.php - - message: "#^Parameter \\#1 \\$read of method Mage_Eav_Model_Entity_Abstract\\:\\:setConnection\\(\\) expects string\\|Zend_Db_Adapter_Abstract, Varien_Db_Adapter_Interface\\|false given\\.$#" - count: 1 - path: app/code/core/Mage/Eav/Model/Entity.php - - - - message: "#^Method Mage_Eav_Model_Entity_Abstract\\:\\:_getReadAdapter\\(\\) should return Magento_Db_Adapter_Pdo_Mysql but returns Varien_Db_Adapter_Interface\\|false\\.$#" + message: "#^Cannot call method lastInsertId\\(\\) on Varien_Db_Adapter_Interface\\|false\\.$#" count: 1 path: app/code/core/Mage/Eav/Model/Entity/Abstract.php - - - message: "#^Method Mage_Eav_Model_Entity_Abstract\\:\\:_getWriteAdapter\\(\\) should return Magento_Db_Adapter_Pdo_Mysql but returns Varien_Db_Adapter_Interface\\|false\\.$#" - count: 1 - path: app/code/core/Mage/Eav/Model/Entity/Abstract.php - - - - message: "#^Parameter \\#1 \\$object of method Mage_Eav_Model_Entity_Abstract\\:\\:_saveAttribute\\(\\) expects Mage_Core_Model_Abstract, Varien_Object given\\.$#" - count: 2 - path: app/code/core/Mage/Eav/Model/Entity/Abstract.php - - message: "#^Parameter \\#1 \\$object of method Mage_Eav_Model_Entity_Abstract\\:\\:load\\(\\) expects Mage_Core_Model_Abstract, Varien_Object given\\.$#" count: 1 path: app/code/core/Mage/Eav/Model/Entity/Abstract.php - - - message: "#^Parameter \\#1 \\$select of method Mage_Eav_Model_Entity_Abstract\\:\\:_addLoadAttributesSelectFields\\(\\) expects Varien_Db_Select, Zend_Db_Select given\\.$#" - count: 1 - path: app/code/core/Mage/Eav/Model/Entity/Abstract.php - - - - message: "#^Property Mage_Eav_Model_Entity_Abstract\\:\\:\\$_read \\(Varien_Db_Adapter_Pdo_Mysql\\) does not accept Varien_Db_Adapter_Interface\\|false\\.$#" - count: 1 - path: app/code/core/Mage/Eav/Model/Entity/Abstract.php - - - - message: "#^Property Mage_Eav_Model_Entity_Abstract\\:\\:\\$_read \\(Varien_Db_Adapter_Pdo_Mysql\\) does not accept string\\|Zend_Db_Adapter_Abstract\\.$#" - count: 1 - path: app/code/core/Mage/Eav/Model/Entity/Abstract.php - - message: "#^Property Mage_Eav_Model_Entity_Abstract\\:\\:\\$_type \\(Mage_Eav_Model_Entity_Type\\) in empty\\(\\) is not falsy\\.$#" count: 1 path: app/code/core/Mage/Eav/Model/Entity/Abstract.php - - - message: "#^Property Mage_Eav_Model_Entity_Abstract\\:\\:\\$_write \\(Varien_Db_Adapter_Pdo_Mysql\\) does not accept Varien_Db_Adapter_Interface\\|false\\.$#" - count: 1 - path: app/code/core/Mage/Eav/Model/Entity/Abstract.php - - - - message: "#^Property Mage_Eav_Model_Entity_Abstract\\:\\:\\$_write \\(Varien_Db_Adapter_Pdo_Mysql\\) does not accept string\\|Zend_Db_Adapter_Abstract\\.$#" - count: 1 - path: app/code/core/Mage/Eav/Model/Entity/Abstract.php - - message: "#^Variable \\$attributeCode might not be defined\\.$#" count: 1 @@ -5135,6 +4735,11 @@ parameters: count: 4 path: app/code/core/Mage/ImportExport/Block/Adminhtml/Export/Filter.php + - + message: "#^Method Mage_ImportExport_Block_Adminhtml_Export_Filter\\:\\:prepareCollection\\(\\) should return Mage_Core_Model_Resource_Db_Collection_Abstract\\|null but returns Varien_Data_Collection_Db\\|null\\.$#" + count: 1 + path: app/code/core/Mage/ImportExport/Block/Adminhtml/Export/Filter.php + - message: "#^Parameter \\#1 \\$limit of method Mage_Adminhtml_Block_Widget_Grid\\:\\:setDefaultLimit\\(\\) expects int, null given\\.$#" count: 1 @@ -6050,11 +5655,6 @@ parameters: count: 1 path: app/code/core/Mage/Reports/Model/Resource/Report/Product/Viewed/Collection.php - - - message: "#^Parameter \\#1 \\$conn of method Varien_Data_Collection_Db\\:\\:setConnection\\(\\) expects Zend_Db_Adapter_Abstract, Varien_Db_Adapter_Interface given\\.$#" - count: 1 - path: app/code/core/Mage/Reports/Model/Resource/Report/Product/Viewed/Collection.php - - message: "#^Parameter \\#1 \\$select of method Mage_Core_Model_Resource_Helper_Mysql4\\:\\:getQueryUsingAnalyticFunction\\(\\) expects Varien_Db_Select, Zend_Db_Select given\\.$#" count: 1 @@ -6275,181 +5875,11 @@ parameters: count: 1 path: app/code/core/Mage/Sales/Model/Config/Ordered.php - - - message: "#^Parameter \\#1 \\$read of method Mage_Eav_Model_Entity_Abstract\\:\\:setConnection\\(\\) expects string\\|Zend_Db_Adapter_Abstract, Varien_Db_Adapter_Interface\\|false given\\.$#" - count: 1 - path: app/code/core/Mage/Sales/Model/Entity/Order.php - - - - message: "#^Parameter \\#2 \\$write of method Mage_Eav_Model_Entity_Abstract\\:\\:setConnection\\(\\) expects string\\|Zend_Db_Adapter_Abstract\\|null, Varien_Db_Adapter_Interface\\|false given\\.$#" - count: 1 - path: app/code/core/Mage/Sales/Model/Entity/Order.php - - - - message: "#^Parameter \\#1 \\$read of method Mage_Eav_Model_Entity_Abstract\\:\\:setConnection\\(\\) expects string\\|Zend_Db_Adapter_Abstract, Varien_Db_Adapter_Interface\\|false given\\.$#" - count: 1 - path: app/code/core/Mage/Sales/Model/Entity/Order/Address.php - - - - message: "#^Parameter \\#2 \\$write of method Mage_Eav_Model_Entity_Abstract\\:\\:setConnection\\(\\) expects string\\|Zend_Db_Adapter_Abstract\\|null, Varien_Db_Adapter_Interface\\|false given\\.$#" - count: 1 - path: app/code/core/Mage/Sales/Model/Entity/Order/Address.php - - - - message: "#^Parameter \\#1 \\$read of method Mage_Eav_Model_Entity_Abstract\\:\\:setConnection\\(\\) expects string\\|Zend_Db_Adapter_Abstract, Varien_Db_Adapter_Interface\\|false given\\.$#" - count: 1 - path: app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo.php - - - - message: "#^Parameter \\#2 \\$write of method Mage_Eav_Model_Entity_Abstract\\:\\:setConnection\\(\\) expects string\\|Zend_Db_Adapter_Abstract\\|null, Varien_Db_Adapter_Interface\\|false given\\.$#" - count: 1 - path: app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo.php - - - - message: "#^Parameter \\#1 \\$read of method Mage_Eav_Model_Entity_Abstract\\:\\:setConnection\\(\\) expects string\\|Zend_Db_Adapter_Abstract, Varien_Db_Adapter_Interface\\|false given\\.$#" - count: 1 - path: app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo/Comment.php - - - - message: "#^Parameter \\#2 \\$write of method Mage_Eav_Model_Entity_Abstract\\:\\:setConnection\\(\\) expects string\\|Zend_Db_Adapter_Abstract\\|null, Varien_Db_Adapter_Interface\\|false given\\.$#" - count: 1 - path: app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo/Comment.php - - - - message: "#^Parameter \\#1 \\$read of method Mage_Eav_Model_Entity_Abstract\\:\\:setConnection\\(\\) expects string\\|Zend_Db_Adapter_Abstract, Varien_Db_Adapter_Interface\\|false given\\.$#" - count: 1 - path: app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo/Item.php - - - - message: "#^Parameter \\#2 \\$write of method Mage_Eav_Model_Entity_Abstract\\:\\:setConnection\\(\\) expects string\\|Zend_Db_Adapter_Abstract\\|null, Varien_Db_Adapter_Interface\\|false given\\.$#" - count: 1 - path: app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo/Item.php - - - - message: "#^Parameter \\#1 \\$read of method Mage_Eav_Model_Entity_Abstract\\:\\:setConnection\\(\\) expects string\\|Zend_Db_Adapter_Abstract, Varien_Db_Adapter_Interface\\|false given\\.$#" - count: 1 - path: app/code/core/Mage/Sales/Model/Entity/Order/Invoice.php - - - - message: "#^Parameter \\#2 \\$write of method Mage_Eav_Model_Entity_Abstract\\:\\:setConnection\\(\\) expects string\\|Zend_Db_Adapter_Abstract\\|null, Varien_Db_Adapter_Interface\\|false given\\.$#" - count: 1 - path: app/code/core/Mage/Sales/Model/Entity/Order/Invoice.php - - - - message: "#^Parameter \\#1 \\$read of method Mage_Eav_Model_Entity_Abstract\\:\\:setConnection\\(\\) expects string\\|Zend_Db_Adapter_Abstract, Varien_Db_Adapter_Interface\\|false given\\.$#" - count: 1 - path: app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Comment.php - - - - message: "#^Parameter \\#2 \\$write of method Mage_Eav_Model_Entity_Abstract\\:\\:setConnection\\(\\) expects string\\|Zend_Db_Adapter_Abstract\\|null, Varien_Db_Adapter_Interface\\|false given\\.$#" - count: 1 - path: app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Comment.php - - - - message: "#^Parameter \\#1 \\$read of method Mage_Eav_Model_Entity_Abstract\\:\\:setConnection\\(\\) expects string\\|Zend_Db_Adapter_Abstract, Varien_Db_Adapter_Interface\\|false given\\.$#" - count: 1 - path: app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Item.php - - - - message: "#^Parameter \\#2 \\$write of method Mage_Eav_Model_Entity_Abstract\\:\\:setConnection\\(\\) expects string\\|Zend_Db_Adapter_Abstract\\|null, Varien_Db_Adapter_Interface\\|false given\\.$#" - count: 1 - path: app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Item.php - - - - message: "#^Parameter \\#1 \\$read of method Mage_Eav_Model_Entity_Abstract\\:\\:setConnection\\(\\) expects string\\|Zend_Db_Adapter_Abstract, Varien_Db_Adapter_Interface\\|false given\\.$#" - count: 1 - path: app/code/core/Mage/Sales/Model/Entity/Order/Item.php - - - - message: "#^Parameter \\#2 \\$write of method Mage_Eav_Model_Entity_Abstract\\:\\:setConnection\\(\\) expects string\\|Zend_Db_Adapter_Abstract\\|null, Varien_Db_Adapter_Interface\\|false given\\.$#" - count: 1 - path: app/code/core/Mage/Sales/Model/Entity/Order/Item.php - - - - message: "#^Parameter \\#1 \\$read of method Mage_Eav_Model_Entity_Abstract\\:\\:setConnection\\(\\) expects string\\|Zend_Db_Adapter_Abstract, Varien_Db_Adapter_Interface\\|false given\\.$#" - count: 1 - path: app/code/core/Mage/Sales/Model/Entity/Order/Payment.php - - - - message: "#^Parameter \\#2 \\$write of method Mage_Eav_Model_Entity_Abstract\\:\\:setConnection\\(\\) expects string\\|Zend_Db_Adapter_Abstract\\|null, Varien_Db_Adapter_Interface\\|false given\\.$#" - count: 1 - path: app/code/core/Mage/Sales/Model/Entity/Order/Payment.php - - - - message: "#^Parameter \\#1 \\$read of method Mage_Eav_Model_Entity_Abstract\\:\\:setConnection\\(\\) expects string\\|Zend_Db_Adapter_Abstract, Varien_Db_Adapter_Interface\\|false given\\.$#" - count: 1 - path: app/code/core/Mage/Sales/Model/Entity/Order/Shipment.php - - - - message: "#^Parameter \\#2 \\$write of method Mage_Eav_Model_Entity_Abstract\\:\\:setConnection\\(\\) expects string\\|Zend_Db_Adapter_Abstract\\|null, Varien_Db_Adapter_Interface\\|false given\\.$#" - count: 1 - path: app/code/core/Mage/Sales/Model/Entity/Order/Shipment.php - - - - message: "#^Parameter \\#1 \\$read of method Mage_Eav_Model_Entity_Abstract\\:\\:setConnection\\(\\) expects string\\|Zend_Db_Adapter_Abstract, Varien_Db_Adapter_Interface\\|false given\\.$#" - count: 1 - path: app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Comment.php - - - - message: "#^Parameter \\#2 \\$write of method Mage_Eav_Model_Entity_Abstract\\:\\:setConnection\\(\\) expects string\\|Zend_Db_Adapter_Abstract\\|null, Varien_Db_Adapter_Interface\\|false given\\.$#" - count: 1 - path: app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Comment.php - - - - message: "#^Parameter \\#1 \\$read of method Mage_Eav_Model_Entity_Abstract\\:\\:setConnection\\(\\) expects string\\|Zend_Db_Adapter_Abstract, Varien_Db_Adapter_Interface\\|false given\\.$#" - count: 1 - path: app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Item.php - - - - message: "#^Parameter \\#2 \\$write of method Mage_Eav_Model_Entity_Abstract\\:\\:setConnection\\(\\) expects string\\|Zend_Db_Adapter_Abstract\\|null, Varien_Db_Adapter_Interface\\|false given\\.$#" - count: 1 - path: app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Item.php - - - - message: "#^Parameter \\#1 \\$read of method Mage_Eav_Model_Entity_Abstract\\:\\:setConnection\\(\\) expects string\\|Zend_Db_Adapter_Abstract, Varien_Db_Adapter_Interface\\|false given\\.$#" - count: 1 - path: app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Track.php - - - - message: "#^Parameter \\#2 \\$write of method Mage_Eav_Model_Entity_Abstract\\:\\:setConnection\\(\\) expects string\\|Zend_Db_Adapter_Abstract\\|null, Varien_Db_Adapter_Interface\\|false given\\.$#" - count: 1 - path: app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Track.php - - - - message: "#^Parameter \\#1 \\$read of method Mage_Eav_Model_Entity_Abstract\\:\\:setConnection\\(\\) expects string\\|Zend_Db_Adapter_Abstract, Varien_Db_Adapter_Interface\\|false given\\.$#" - count: 1 - path: app/code/core/Mage/Sales/Model/Entity/Order/Status/History.php - - - - message: "#^Parameter \\#2 \\$write of method Mage_Eav_Model_Entity_Abstract\\:\\:setConnection\\(\\) expects string\\|Zend_Db_Adapter_Abstract\\|null, Varien_Db_Adapter_Interface\\|false given\\.$#" - count: 1 - path: app/code/core/Mage/Sales/Model/Entity/Order/Status/History.php - - message: "#^Call to an undefined method Mage_Sales_Model_Resource_Quote_Collection\\:\\:addAttributeToSelect\\(\\)\\.$#" count: 2 path: app/code/core/Mage/Sales/Model/Entity/Quote.php - - - message: "#^Parameter \\#1 \\$read of method Mage_Eav_Model_Entity_Abstract\\:\\:setConnection\\(\\) expects string\\|Zend_Db_Adapter_Abstract, Varien_Db_Adapter_Interface\\|false given\\.$#" - count: 1 - path: app/code/core/Mage/Sales/Model/Entity/Quote.php - - - - message: "#^Parameter \\#2 \\$write of method Mage_Eav_Model_Entity_Abstract\\:\\:setConnection\\(\\) expects string\\|Zend_Db_Adapter_Abstract\\|null, Varien_Db_Adapter_Interface\\|false given\\.$#" - count: 1 - path: app/code/core/Mage/Sales/Model/Entity/Quote.php - - - - message: "#^Parameter \\#1 \\$read of method Mage_Eav_Model_Entity_Abstract\\:\\:setConnection\\(\\) expects string\\|Zend_Db_Adapter_Abstract, Varien_Db_Adapter_Interface\\|false given\\.$#" - count: 1 - path: app/code/core/Mage/Sales/Model/Entity/Quote/Address.php - - - - message: "#^Parameter \\#2 \\$write of method Mage_Eav_Model_Entity_Abstract\\:\\:setConnection\\(\\) expects string\\|Zend_Db_Adapter_Abstract\\|null, Varien_Db_Adapter_Interface\\|false given\\.$#" - count: 1 - path: app/code/core/Mage/Sales/Model/Entity/Quote/Address.php - - message: "#^Return type \\(\\$this\\(Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Custbalance\\)\\) of method Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend_Custbalance\\:\\:fetchTotals\\(\\) should be compatible with return type \\(array\\) of method Mage_Sales_Model_Entity_Quote_Address_Attribute_Frontend\\:\\:fetchTotals\\(\\)$#" count: 1 @@ -6480,46 +5910,6 @@ parameters: count: 1 path: app/code/core/Mage/Sales/Model/Entity/Quote/Address/Attribute/Frontend/Tax.php - - - message: "#^Parameter \\#1 \\$read of method Mage_Eav_Model_Entity_Abstract\\:\\:setConnection\\(\\) expects string\\|Zend_Db_Adapter_Abstract, Varien_Db_Adapter_Interface\\|false given\\.$#" - count: 1 - path: app/code/core/Mage/Sales/Model/Entity/Quote/Address/Item.php - - - - message: "#^Parameter \\#2 \\$write of method Mage_Eav_Model_Entity_Abstract\\:\\:setConnection\\(\\) expects string\\|Zend_Db_Adapter_Abstract\\|null, Varien_Db_Adapter_Interface\\|false given\\.$#" - count: 1 - path: app/code/core/Mage/Sales/Model/Entity/Quote/Address/Item.php - - - - message: "#^Parameter \\#1 \\$read of method Mage_Eav_Model_Entity_Abstract\\:\\:setConnection\\(\\) expects string\\|Zend_Db_Adapter_Abstract, Varien_Db_Adapter_Interface\\|false given\\.$#" - count: 1 - path: app/code/core/Mage/Sales/Model/Entity/Quote/Address/Rate.php - - - - message: "#^Parameter \\#2 \\$write of method Mage_Eav_Model_Entity_Abstract\\:\\:setConnection\\(\\) expects string\\|Zend_Db_Adapter_Abstract\\|null, Varien_Db_Adapter_Interface\\|false given\\.$#" - count: 1 - path: app/code/core/Mage/Sales/Model/Entity/Quote/Address/Rate.php - - - - message: "#^Parameter \\#1 \\$read of method Mage_Eav_Model_Entity_Abstract\\:\\:setConnection\\(\\) expects string\\|Zend_Db_Adapter_Abstract, Varien_Db_Adapter_Interface\\|false given\\.$#" - count: 1 - path: app/code/core/Mage/Sales/Model/Entity/Quote/Item.php - - - - message: "#^Parameter \\#2 \\$write of method Mage_Eav_Model_Entity_Abstract\\:\\:setConnection\\(\\) expects string\\|Zend_Db_Adapter_Abstract\\|null, Varien_Db_Adapter_Interface\\|false given\\.$#" - count: 1 - path: app/code/core/Mage/Sales/Model/Entity/Quote/Item.php - - - - message: "#^Parameter \\#1 \\$read of method Mage_Eav_Model_Entity_Abstract\\:\\:setConnection\\(\\) expects string\\|Zend_Db_Adapter_Abstract, Varien_Db_Adapter_Interface\\|false given\\.$#" - count: 1 - path: app/code/core/Mage/Sales/Model/Entity/Quote/Payment.php - - - - message: "#^Parameter \\#2 \\$write of method Mage_Eav_Model_Entity_Abstract\\:\\:setConnection\\(\\) expects string\\|Zend_Db_Adapter_Abstract\\|null, Varien_Db_Adapter_Interface\\|false given\\.$#" - count: 1 - path: app/code/core/Mage/Sales/Model/Entity/Quote/Payment.php - - message: "#^Variable \\$oldArea might not be defined\\.$#" count: 1 @@ -6985,11 +6375,6 @@ parameters: count: 1 path: app/code/core/Mage/Sales/Model/Resource/Report/Bestsellers/Collection.php - - - message: "#^Parameter \\#1 \\$conn of method Varien_Data_Collection_Db\\:\\:setConnection\\(\\) expects Zend_Db_Adapter_Abstract, Varien_Db_Adapter_Interface given\\.$#" - count: 1 - path: app/code/core/Mage/Sales/Model/Resource/Report/Bestsellers/Collection.php - - message: "#^Parameter \\#1 \\$select of method Mage_Core_Model_Resource_Helper_Mysql4\\:\\:getQueryUsingAnalyticFunction\\(\\) expects Varien_Db_Select, Zend_Db_Select given\\.$#" count: 1 @@ -7010,51 +6395,16 @@ parameters: count: 1 path: app/code/core/Mage/Sales/Model/Resource/Report/Invoiced.php - - - message: "#^Parameter \\#1 \\$conn of method Varien_Data_Collection_Db\\:\\:setConnection\\(\\) expects Zend_Db_Adapter_Abstract, Varien_Db_Adapter_Interface given\\.$#" - count: 1 - path: app/code/core/Mage/Sales/Model/Resource/Report/Invoiced/Collection/Invoiced.php - - - - message: "#^Parameter \\#1 \\$conn of method Varien_Data_Collection_Db\\:\\:setConnection\\(\\) expects Zend_Db_Adapter_Abstract, Varien_Db_Adapter_Interface given\\.$#" - count: 1 - path: app/code/core/Mage/Sales/Model/Resource/Report/Invoiced/Collection/Order.php - - - - message: "#^Parameter \\#1 \\$conn of method Varien_Data_Collection_Db\\:\\:setConnection\\(\\) expects Zend_Db_Adapter_Abstract, Varien_Db_Adapter_Interface given\\.$#" - count: 1 - path: app/code/core/Mage/Sales/Model/Resource/Report/Order/Collection.php - - message: "#^Parameter \\#1 \\$expression of class Zend_Db_Expr constructor expects string, int given\\.$#" count: 1 path: app/code/core/Mage/Sales/Model/Resource/Report/Order/Createdat.php - - - message: "#^Parameter \\#1 \\$conn of method Varien_Data_Collection_Db\\:\\:setConnection\\(\\) expects Zend_Db_Adapter_Abstract, Varien_Db_Adapter_Interface given\\.$#" - count: 1 - path: app/code/core/Mage/Sales/Model/Resource/Report/Refunded/Collection/Order.php - - - - message: "#^Parameter \\#1 \\$conn of method Varien_Data_Collection_Db\\:\\:setConnection\\(\\) expects Zend_Db_Adapter_Abstract, Varien_Db_Adapter_Interface given\\.$#" - count: 1 - path: app/code/core/Mage/Sales/Model/Resource/Report/Refunded/Collection/Refunded.php - - message: "#^Parameter \\#1 \\$expression of class Zend_Db_Expr constructor expects string, int given\\.$#" count: 2 path: app/code/core/Mage/Sales/Model/Resource/Report/Shipping.php - - - message: "#^Parameter \\#1 \\$conn of method Varien_Data_Collection_Db\\:\\:setConnection\\(\\) expects Zend_Db_Adapter_Abstract, Varien_Db_Adapter_Interface given\\.$#" - count: 1 - path: app/code/core/Mage/Sales/Model/Resource/Report/Shipping/Collection/Order.php - - - - message: "#^Parameter \\#1 \\$conn of method Varien_Data_Collection_Db\\:\\:setConnection\\(\\) expects Zend_Db_Adapter_Abstract, Varien_Db_Adapter_Interface given\\.$#" - count: 1 - path: app/code/core/Mage/Sales/Model/Resource/Report/Shipping/Collection/Shipment.php - - message: "#^Call to an undefined method Varien_Db_Adapter_Interface\\:\\:listTables\\(\\)\\.$#" count: 1 @@ -7135,11 +6485,6 @@ parameters: count: 1 path: app/code/core/Mage/SalesRule/Model/Resource/Coupon/Usage.php - - - message: "#^Parameter \\#1 \\$conn of method Varien_Data_Collection_Db\\:\\:setConnection\\(\\) expects Zend_Db_Adapter_Abstract, Varien_Db_Adapter_Interface given\\.$#" - count: 1 - path: app/code/core/Mage/SalesRule/Model/Resource/Report/Collection.php - - message: "#^Return type \\(Mage_SalesRule_Model_Rule_Condition_Product_Combine\\) of method Mage_SalesRule_Model_Rule\\:\\:getActionsInstance\\(\\) should be compatible with return type \\(Mage_Rule_Model_Action_Collection\\) of method Mage_Rule_Model_Abstract\\:\\:getActionsInstance\\(\\)$#" count: 1 @@ -7400,11 +6745,6 @@ parameters: count: 1 path: app/code/core/Mage/Tax/Model/Resource/Calculation/Rate/Title/Collection.php - - - message: "#^Parameter \\#1 \\$conn of method Varien_Data_Collection_Db\\:\\:setConnection\\(\\) expects Zend_Db_Adapter_Abstract, Varien_Db_Adapter_Interface given\\.$#" - count: 1 - path: app/code/core/Mage/Tax/Model/Resource/Report/Collection.php - - message: "#^Parameter \\#1 \\$expression of class Zend_Db_Expr constructor expects string, int given\\.$#" count: 1 @@ -7980,11 +7320,6 @@ parameters: count: 1 path: app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/Layout.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 - path: app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main.php - - message: "#^Variable \\$productsOptions might not be defined\\.$#" count: 1 diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Crosssell.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Crosssell.php index d9d3339f9dc..96cfebc330a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Crosssell.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Crosssell.php @@ -42,7 +42,7 @@ public function __construct() } /** - * Retirve currently edited product model + * Retrieve currently edited product model * * @return Mage_Catalog_Model_Product */ @@ -54,7 +54,7 @@ protected function _getProduct() /** * Add filter * - * @param object $column + * @param Mage_Adminhtml_Block_Widget_Grid_Column $column * @return $this */ protected function _addColumnFilterToCollection($column) diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Related.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Related.php index 791c054c05e..9c20a97217d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Related.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Related.php @@ -42,7 +42,7 @@ public function __construct() } /** - * Retirve currently edited product model + * Retrieve currently edited product model * * @return Mage_Catalog_Model_Product */ @@ -54,7 +54,7 @@ protected function _getProduct() /** * Add filter * - * @param object $column + * @param Mage_Adminhtml_Block_Widget_Grid_Column $column * @return $this */ protected function _addColumnFilterToCollection($column) diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Upsell.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Upsell.php index c62487dc770..9cbb7444a72 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Upsell.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Upsell.php @@ -42,7 +42,7 @@ public function __construct() } /** - * Retirve currently edited product model + * Retrieve currently edited product model * * @return Mage_Catalog_Model_Product */ @@ -54,7 +54,7 @@ protected function _getProduct() /** * Add filter * - * @param object $column + * @param Mage_Adminhtml_Block_Widget_Grid_Column $column * @return $this */ protected function _addColumnFilterToCollection($column) diff --git a/app/code/core/Mage/Adminhtml/Block/Checkout/Agreement/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Checkout/Agreement/Edit/Form.php index 669070bf002..5ca118fdb90 100644 --- a/app/code/core/Mage/Adminhtml/Block/Checkout/Agreement/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Checkout/Agreement/Edit/Form.php @@ -93,7 +93,7 @@ protected function _prepareForm() 'required' => true, 'values' => Mage::getSingleton('adminhtml/system_store')->getStoreValuesForForm(false, true), ]); - $renderer = $this->getLayout()->createBlock('adminhtml/store_switcher_form_renderer_fieldset_element'); + $renderer = $this->getStoreSwitcherRenderer(); $field->setRenderer($renderer); } else { $fieldset->addField('store_id', 'hidden', [ diff --git a/app/code/core/Mage/Adminhtml/Block/Cms/Block/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Cms/Block/Edit/Form.php index 19a13b39984..580bc63a1d2 100644 --- a/app/code/core/Mage/Adminhtml/Block/Cms/Block/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Cms/Block/Edit/Form.php @@ -87,7 +87,7 @@ protected function _prepareForm() 'required' => true, 'values' => Mage::getSingleton('adminhtml/system_store')->getStoreValuesForForm(false, true), ]); - $renderer = $this->getLayout()->createBlock('adminhtml/store_switcher_form_renderer_fieldset_element'); + $renderer = $this->getStoreSwitcherRenderer(); $field->setRenderer($renderer); } else { $fieldset->addField('store_id', 'hidden', [ diff --git a/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tab/Main.php b/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tab/Main.php index 7c96ef14fc2..3992765164d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tab/Main.php +++ b/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tab/Main.php @@ -80,7 +80,7 @@ protected function _prepareForm() 'values' => Mage::getSingleton('adminhtml/system_store')->getStoreValuesForForm(false, true), 'disabled' => $isElementDisabled, ]); - $renderer = $this->getLayout()->createBlock('adminhtml/store_switcher_form_renderer_fieldset_element'); + $renderer = $this->getStoreSwitcherRenderer(); $field->setRenderer($renderer); } else { $fieldset->addField('store_id', 'hidden', [ diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Account.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Account.php index e54cbf69ec5..decfbf46129 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Account.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Account.php @@ -96,7 +96,7 @@ function(v, elem){ ); // @codingStandardsIgnoreEnd } - $renderer = $this->getLayout()->createBlock('adminhtml/store_switcher_form_renderer_fieldset_element'); + $renderer = $this->getStoreSwitcherRenderer(); $form->getElement('website_id')->setRenderer($renderer); $customerStoreId = null; diff --git a/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Tab/Main.php b/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Tab/Main.php index 1338916611e..29709db48b0 100644 --- a/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Tab/Main.php +++ b/app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Tab/Main.php @@ -127,7 +127,7 @@ protected function _prepareForm() 'required' => true, 'values' => Mage::getSingleton('adminhtml/system_store')->getWebsiteValuesForForm() ]); - $renderer = $this->getLayout()->createBlock('adminhtml/store_switcher_form_renderer_fieldset_element'); + $renderer = $this->getStoreSwitcherRenderer(); $field->setRenderer($renderer); } diff --git a/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Main.php b/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Main.php index 0332a3d4e6c..471c4243e53 100644 --- a/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Main.php +++ b/app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Main.php @@ -131,7 +131,7 @@ protected function _prepareForm() 'required' => true, 'values' => Mage::getSingleton('adminhtml/system_store')->getWebsiteValuesForForm() ]); - $renderer = $this->getLayout()->createBlock('adminhtml/store_switcher_form_renderer_fieldset_element'); + $renderer = $this->getStoreSwitcherRenderer(); $field->setRenderer($renderer); } diff --git a/app/code/core/Mage/Adminhtml/Block/Rating/Edit/Tab/Form.php b/app/code/core/Mage/Adminhtml/Block/Rating/Edit/Tab/Form.php index 0f4abe26579..696f66f401b 100644 --- a/app/code/core/Mage/Adminhtml/Block/Rating/Edit/Tab/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Rating/Edit/Tab/Form.php @@ -98,7 +98,7 @@ protected function _prepareForm() 'name' => 'stores[]', 'values' => Mage::getSingleton('adminhtml/system_store')->getStoreValuesForForm() ]); - $renderer = $this->getLayout()->createBlock('adminhtml/store_switcher_form_renderer_fieldset_element'); + $renderer = $this->getStoreSwitcherRenderer(); $field->setRenderer($renderer); $fieldset->addField('position', 'text', [ diff --git a/app/code/core/Mage/Adminhtml/Block/Review/Add/Form.php b/app/code/core/Mage/Adminhtml/Block/Review/Add/Form.php index a3eebf4e4c7..6d95780d277 100644 --- a/app/code/core/Mage/Adminhtml/Block/Review/Add/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Review/Add/Form.php @@ -56,7 +56,7 @@ protected function _prepareForm() 'name' => 'select_stores[]', 'values' => Mage::getSingleton('adminhtml/system_store')->getStoreValuesForForm(), ]); - $renderer = $this->getLayout()->createBlock('adminhtml/store_switcher_form_renderer_fieldset_element'); + $renderer = $this->getStoreSwitcherRenderer(); $field->setRenderer($renderer); } diff --git a/app/code/core/Mage/Adminhtml/Block/Review/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Review/Edit/Form.php index a13bea753ce..46ad61ce963 100644 --- a/app/code/core/Mage/Adminhtml/Block/Review/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Review/Edit/Form.php @@ -86,7 +86,7 @@ protected function _prepareForm() 'name' => 'stores[]', 'values' => Mage::getSingleton('adminhtml/system_store')->getStoreValuesForForm(), ]); - $renderer = $this->getLayout()->createBlock('adminhtml/store_switcher_form_renderer_fieldset_element'); + $renderer = $this->getStoreSwitcherRenderer(); $field->setRenderer($renderer); $review->setSelectStores($review->getStores()); } else { diff --git a/app/code/core/Mage/Adminhtml/Block/Sitemap/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Sitemap/Edit/Form.php index bfb9dd78f3b..83f30cd493a 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sitemap/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Sitemap/Edit/Form.php @@ -74,7 +74,7 @@ protected function _prepareForm() 'value' => $model->getStoreId(), 'values' => Mage::getSingleton('adminhtml/system_store')->getStoreValuesForForm(), ]); - $renderer = $this->getLayout()->createBlock('adminhtml/store_switcher_form_renderer_fieldset_element'); + $renderer = $this->getStoreSwitcherRenderer(); $field->setRenderer($renderer); } else { $fieldset->addField('store_id', 'hidden', [ diff --git a/app/code/core/Mage/Adminhtml/Block/System/Design/Edit/Tab/General.php b/app/code/core/Mage/Adminhtml/Block/System/Design/Edit/Tab/General.php index b98619c2573..e54b65c40f5 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Design/Edit/Tab/General.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Design/Edit/Tab/General.php @@ -33,7 +33,7 @@ protected function _prepareForm() 'name' => 'store_id', 'required' => true, ]); - $renderer = $this->getLayout()->createBlock('adminhtml/store_switcher_form_renderer_fieldset_element'); + $renderer = $this->getStoreSwitcherRenderer(); $field->setRenderer($renderer); } else { $fieldset->addField('store_id', 'hidden', [ diff --git a/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Edit/Form.php index 434cdc6c4c1..ee88670a29c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Edit/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Edit/Form.php @@ -145,7 +145,7 @@ protected function _prepareForm() 'disabled' => true, 'value' => $formValues['store_id'], ]); - $renderer = $this->getLayout()->createBlock('adminhtml/store_switcher_form_renderer_fieldset_element'); + $renderer = $this->getStoreSwitcherRenderer(); $element->setRenderer($renderer); if ($noStoreError) { $element->setAfterElementHtml($noStoreError); diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Form.php b/app/code/core/Mage/Adminhtml/Block/Widget/Form.php index aa953698ccb..bd68ad8d93d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Form.php @@ -238,8 +238,16 @@ protected function _getAdditionalElementTypes() * @param Varien_Data_Form_Element_Abstract $element * @return string */ + // phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter.FoundInExtendedClass protected function _getAdditionalElementHtml($element) { return ''; } + + protected function getStoreSwitcherRenderer(): Mage_Adminhtml_Block_Store_Switcher_Form_Renderer_Fieldset_Element + { + /** @var Mage_Adminhtml_Block_Store_Switcher_Form_Renderer_Fieldset_Element $renderer */ + $renderer = $this->getLayout()->createBlock('adminhtml/store_switcher_form_renderer_fieldset_element'); + return $renderer; + } } diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid.php index 4b83e07d74b..1be4bffe042 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid.php @@ -45,7 +45,7 @@ class Mage_Adminhtml_Block_Widget_Grid extends Mage_Adminhtml_Block_Widget /** * Collection object * - * @var Mage_Core_Model_Resource_Db_Collection_Abstract|null + * @var Mage_Core_Model_Resource_Db_Collection_Abstract|Varien_Data_Collection_Db|null */ protected $_collection = null; @@ -306,7 +306,7 @@ public function getMainButtonsHtml() /** * set collection object * - * @param Mage_Core_Model_Resource_Db_Collection_Abstract $collection + * @param Mage_Core_Model_Resource_Db_Collection_Abstract|Varien_Data_Collection_Db $collection */ public function setCollection($collection) { @@ -316,7 +316,7 @@ public function setCollection($collection) /** * get collection object * - * @return Mage_Core_Model_Resource_Db_Collection_Abstract + * @return Mage_Core_Model_Resource_Db_Collection_Abstract|Varien_Data_Collection_Db */ public function getCollection() { diff --git a/app/code/core/Mage/Adminhtml/Model/Giftmessage/Save.php b/app/code/core/Mage/Adminhtml/Model/Giftmessage/Save.php index 23ffc872810..e4cfba1e12d 100644 --- a/app/code/core/Mage/Adminhtml/Model/Giftmessage/Save.php +++ b/app/code/core/Mage/Adminhtml/Model/Giftmessage/Save.php @@ -256,6 +256,7 @@ public function importAllowQuoteItemsFromProducts($products) foreach ($products as $productId => $data) { $product = Mage::getModel('catalog/product') ->setStore($this->_getSession()->getStore()) + // phpcs:ignore Ecg.Performance.Loop.ModelLSD ->load($productId); $item = $this->_getQuote()->getItemByProduct($product); diff --git a/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php b/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php index acec3c4ae20..a105dbd23ca 100644 --- a/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php +++ b/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php @@ -236,8 +236,8 @@ public function getSelectionTitlePrice($_selection, $includeContainer = true) /** * Set JS validation container for element * - * @param int $elementId - * @param int $containerId + * @param string $elementId + * @param string $containerId * @return string */ public function setValidationContainer($elementId, $containerId) diff --git a/app/code/core/Mage/Catalog/Model/Product.php b/app/code/core/Mage/Catalog/Model/Product.php index 1681d37577a..fa33a886f48 100644 --- a/app/code/core/Mage/Catalog/Model/Product.php +++ b/app/code/core/Mage/Catalog/Model/Product.php @@ -530,7 +530,7 @@ public function getLinkInstance() * Retrieve product id by sku * * @param string $sku - * @return int + * @return string */ public function getIdBySku($sku) { diff --git a/app/code/core/Mage/Catalog/Model/Product/Option.php b/app/code/core/Mage/Catalog/Model/Product/Option.php index 2110503689e..f8a3743853a 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Option.php +++ b/app/code/core/Mage/Catalog/Model/Product/Option.php @@ -169,7 +169,7 @@ public function addValue(Mage_Catalog_Model_Product_Option_Value $value) /** * Get value by given id * - * @param int $valueId + * @param int|string $valueId * @return Mage_Catalog_Model_Product_Option_Value */ public function getValueById($valueId) diff --git a/app/code/core/Mage/Catalog/Model/Product/Option/Value.php b/app/code/core/Mage/Catalog/Model/Product/Option/Value.php index e03007a61be..207b1e8866c 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Option/Value.php +++ b/app/code/core/Mage/Catalog/Model/Product/Option/Value.php @@ -49,7 +49,7 @@ protected function _construct() } /** - * @param string $value + * @param array $value * @return $this */ public function addValue($value) diff --git a/app/code/core/Mage/Catalog/Model/Resource/Abstract.php b/app/code/core/Mage/Catalog/Model/Resource/Abstract.php index 782561cc3d7..63a484f9903 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Abstract.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Abstract.php @@ -203,7 +203,7 @@ protected function _setAttributeValue($object, $valueRow) /** * Insert or Update attribute data * - * @param Mage_Catalog_Model_Abstract $object + * @param Mage_Catalog_Model_Abstract|Varien_Object $object * @param Mage_Eav_Model_Entity_Attribute_Abstract|Mage_Catalog_Model_Resource_Eav_Attribute $attribute * @param mixed $value * @return Mage_Catalog_Model_Resource_Abstract diff --git a/app/code/core/Mage/Catalog/Model/Resource/Category.php b/app/code/core/Mage/Catalog/Model/Resource/Category.php index d56be287cd2..60a1cd35dc1 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Category.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Category.php @@ -376,10 +376,10 @@ public function getProductsPosition($category) } /** - * Get chlden categories count + * Get children categories count * * @param int $categoryId - * @return int + * @return string */ public function getChildrenCount($categoryId) { @@ -395,7 +395,7 @@ public function getChildrenCount($categoryId) * Check if category id exist * * @param int $entityId - * @return bool + * @return string */ public function checkId($entityId) { @@ -430,7 +430,7 @@ public function verifyIds(array $ids) * * @param Mage_Catalog_Model_Category $category * @param bool $isActiveFlag - * @return int + * @return string */ public function getChildrenAmount($category, $isActiveFlag = true) { @@ -458,6 +458,7 @@ public function getChildrenAmount($category, $isActiveFlag = true) 'c.attribute_id = :attribute_id AND c.store_id = :store_id AND c.entity_id = m.entity_id', [] ) + // phpcs:ignore Ecg.Sql.SlowQuery.SlowRawSql ->where('m.path LIKE :c_path') ->where($checkSql . ' = :active_flag'); @@ -597,6 +598,7 @@ public function getParentDesignCategory($category) ->addFieldToFilter('level', ['neq' => 0]) ->setOrder('level', 'DESC') ->load(); + // phpcs:ignore Ecg.Performance.GetFirstItem.Found return $collection->getFirstItem(); } @@ -793,7 +795,7 @@ public function changeParent( Mage_Catalog_Model_Category $newParent, $afterCategoryId = null ) { - $childrenCount = $this->getChildrenCount($category->getId()) + 1; + $childrenCount = (int)$this->getChildrenCount($category->getId()) + 1; $table = $this->getEntityTable(); $adapter = $this->_getWriteAdapter(); $levelFiled = $adapter->quoteIdentifier('level'); @@ -909,7 +911,7 @@ protected function _processPositions($category, $newParent, $afterCategoryId) ->where('parent_id = :parent_id'); $position = $adapter->fetchOne($select, ['parent_id' => $newParent->getId()]); } - $position += 1; + ++$position; return $position; } diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product.php b/app/code/core/Mage/Catalog/Model/Resource/Product.php index 32a7579c2ed..5178c78ca10 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product.php @@ -92,6 +92,7 @@ public function getWebsiteIdsByProductIds($productIds) ->from($this->_productWebsiteTable, ['product_id', 'website_id']) ->where('product_id IN (?)', $productIds); $productsWebsites = []; + // phpcs:ignore Ecg.Performance.FetchAll.Found foreach ($this->_getWriteAdapter()->fetchAll($select) as $productInfo) { $productId = $productInfo['product_id']; if (!isset($productsWebsites[$productId])) { @@ -106,7 +107,7 @@ public function getWebsiteIdsByProductIds($productIds) /** * Retrieve product category identifiers * - * @param Mage_Catalog_Model_Product $product + * @param Mage_Catalog_Model_Product|Varien_Object $product * @return array */ public function getCategoryIds($product) @@ -124,7 +125,7 @@ public function getCategoryIds($product) * Get product identifier by sku * * @param string $sku - * @return int|false + * @return string */ public function getIdBySku($sku) { @@ -148,7 +149,7 @@ public function getIdBySku($sku) protected function _beforeSave(Varien_Object $object) { /** - * Try detect product id by sku if id is not declared + * Try to detect product id by sku if id is not declared */ if (!$object->getId() && $object->getSku()) { $object->setId($this->getIdBySku($object->getSku())); @@ -219,6 +220,7 @@ protected function _saveWebsiteIds($product) 'website_id = ?' => (int)$websiteId, ]; + // phpcs:ignore Ecg.Performance.Loop.ModelLSD $adapter->delete($this->_productWebsiteTable, $condition); } } @@ -276,6 +278,7 @@ protected function _saveCategories(Varien_Object $object) 'category_id = ?' => (int)$categoryId, ]; + // phpcs:ignore Ecg.Performance.Loop.ModelLSD $write->delete($this->_productCategoryTable, $where); } } @@ -316,6 +319,7 @@ public function refreshIndex($product) ->from($this->getTable('catalog/category')) ->where('entity_id IN (?)', $categoryIds); + // phpcs:ignore Ecg.Performance.FetchAll.Found $categoriesInfo = $writeAdapter->fetchAll($categoriesSelect); $indexCategoryIds = []; @@ -513,6 +517,7 @@ public function getAvailableInCategories($object) { // is_parent=1 ensures that we'll get only category IDs those are direct parents of the product, instead of // fetching all parent IDs, including those are higher on the tree + // phpcs:ignore Ecg.Sql.SlowQuery.SlowSql $select = $this->_getReadAdapter()->select()->distinct() ->from($this->getTable('catalog/category_product_index'), ['category_id']) ->where('product_id = ? AND is_parent = 1', (int)$object->getEntityId()); @@ -616,6 +621,7 @@ public function getProductsSku(array $productIds) $select = $this->_getReadAdapter()->select() ->from($this->getTable('catalog/product'), ['entity_id', 'sku']) ->where('entity_id IN (?)', $productIds); + // phpcs:ignore Ecg.Performance.FetchAll.Found return $this->_getReadAdapter()->fetchAll($select); } @@ -624,6 +630,7 @@ public function getProductsSku(array $productIds) * @return array * @deprecated after 1.4.2.0 */ + // phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter.FoundInExtendedClass public function getParentProductIds($object) { return []; @@ -648,6 +655,7 @@ public function getProductEntitiesInfo($columns = null) $select = $adapter->select() ->from($this->getTable('catalog/product'), $columns); + // phpcs:ignore Ecg.Performance.FetchAll.Found return $adapter->fetchAll($select); } @@ -683,6 +691,7 @@ public function getAssignedImages($product, $storeIds) ->where('store_id IN (?)', $storeIds) ->where('attribute_code IN (?)', ['small_image', 'thumbnail', 'image']); + // phpcs:ignore Ecg.Performance.FetchAll.Found return $read->fetchAll($select); } diff --git a/app/code/core/Mage/Customer/Model/Resource/Customer.php b/app/code/core/Mage/Customer/Model/Resource/Customer.php index 5287148b8cb..9d8d8886ba9 100644 --- a/app/code/core/Mage/Customer/Model/Resource/Customer.php +++ b/app/code/core/Mage/Customer/Model/Resource/Customer.php @@ -277,7 +277,7 @@ public function checkCustomerId($customerId) * Get customer website id * * @param int $customerId - * @return int + * @return string */ public function getWebsiteId($customerId) { diff --git a/app/code/core/Mage/Eav/Model/Entity/Abstract.php b/app/code/core/Mage/Eav/Model/Entity/Abstract.php index 304c2823f86..d83e627976e 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Abstract.php +++ b/app/code/core/Mage/Eav/Model/Entity/Abstract.php @@ -24,14 +24,14 @@ abstract class Mage_Eav_Model_Entity_Abstract extends Mage_Core_Model_Resource_A /** * Read connection * - * @var Varien_Db_Adapter_Pdo_Mysql + * @var string|Varien_Db_Adapter_Interface|Zend_Db_Adapter_Abstract */ protected $_read; /** * Write connection * - * @var Varien_Db_Adapter_Pdo_Mysql + * @var string|Varien_Db_Adapter_Interface|Zend_Db_Adapter_Abstract */ protected $_write; @@ -164,9 +164,9 @@ abstract class Mage_Eav_Model_Entity_Abstract extends Mage_Core_Model_Resource_A /** * Set connections for entity operations * - * @param Zend_Db_Adapter_Abstract|string $read - * @param Zend_Db_Adapter_Abstract|string|null $write - * @return Mage_Eav_Model_Entity_Abstract + * @param Varien_Db_Adapter_Interface|Zend_Db_Adapter_Abstract|string $read + * @param Varien_Db_Adapter_Interface|Zend_Db_Adapter_Abstract|string|null $write + * @return $this */ public function setConnection($read, $write = null) { @@ -183,7 +183,7 @@ protected function _construct() /** * Retrieve connection for read data * - * @return Magento_Db_Adapter_Pdo_Mysql + * @return Varien_Db_Adapter_Interface|false */ protected function _getReadAdapter() { @@ -196,7 +196,7 @@ protected function _getReadAdapter() /** * Retrieve connection for write data * - * @return Magento_Db_Adapter_Pdo_Mysql + * @return Varien_Db_Adapter_Interface|false */ protected function _getWriteAdapter() { @@ -209,7 +209,7 @@ protected function _getWriteAdapter() /** * Retrieve read DB connection * - * @return Magento_Db_Adapter_Pdo_Mysql + * @return Varien_Db_Adapter_Interface|false */ public function getReadConnection() { @@ -239,7 +239,7 @@ public function getIdFieldName() /** * Retrieve table name * - * @param string $alias + * @param string|array $alias * @return string */ public function getTable($alias) @@ -253,7 +253,7 @@ public function getTable($alias) * Accepts config node or name of entity type * * @param string|Mage_Eav_Model_Entity_Type $type - * @return Mage_Eav_Model_Entity_Abstract + * @return $this */ public function setType($type) { @@ -302,7 +302,7 @@ public function getTypeId() * If string - removes only one, if array - all specified * * @param array|string|null $attributes - * @return Mage_Eav_Model_Entity_Abstract + * @return $this */ public function unsetAttributes($attributes = null) { @@ -433,7 +433,7 @@ protected function _getDefaultAttribute($attributeCode) /** * Adding attribute to entity * - * @return Mage_Eav_Model_Entity_Abstract + * @return $this */ public function addAttribute(Mage_Eav_Model_Entity_Attribute_Abstract $attribute) { @@ -635,6 +635,7 @@ public function walkAttributes($partMethod, array $args = []) } try { + // phpcs:ignore Ecg.Security.ForbiddenFunction.Found $results[$attrCode] = call_user_func_array([$instance, $method], $args); } catch (Mage_Eav_Model_Entity_Attribute_Exception $e) { throw $e; @@ -656,6 +657,7 @@ public function walkAttributes($partMethod, array $args = []) * @param array $args array of arguments * @return bool */ + // phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter.FoundInExtendedClassAfterLastUsed protected function _isCallableAttributeInstance($instance, $method, $args) { if (!is_object($instance) || !method_exists($instance, $method)) { @@ -823,7 +825,7 @@ public function validate($object) /** * Set new increment id to object * - * @return Mage_Eav_Model_Entity_Abstract + * @return $this */ public function setNewIncrementId(Varien_Object $object) { @@ -906,7 +908,7 @@ public function getDefaultAttributeSourceModel() * @param Mage_Core_Model_Abstract $object * @param int $entityId * @param array|null $attributes - * @return Mage_Eav_Model_Entity_Abstract + * @return $this */ public function load($object, $entityId, $attributes = []) { @@ -946,8 +948,8 @@ public function load($object, $entityId, $attributes = []) /** * Load model attributes data * - * @param Mage_Core_Model_Abstract $object - * @return Mage_Eav_Model_Entity_Abstract + * @param Mage_Core_Model_Abstract|Varien_Object $object + * @return $this */ protected function _loadModelAttributes($object) { @@ -975,6 +977,7 @@ protected function _loadModelAttributes($object) $select = $selects; } + // phpcs:ignore Ecg.Performance.FetchAll.Found $values = $this->_getReadAdapter()->fetchAll($select); foreach ($values as $valueRow) { $this->_setAttributeValue($object, $valueRow); @@ -994,6 +997,7 @@ protected function _loadModelAttributes($object) */ protected function _prepareLoadSelect(array $selects) { + // phpcs:ignore Ecg.Sql.SlowQuery.SlowSql return $this->_getReadAdapter()->select()->union($selects, Zend_Db_Select::SQL_UNION_ALL); } @@ -1004,6 +1008,7 @@ protected function _prepareLoadSelect(array $selects) * @param mixed $rowId * @return Zend_Db_Select */ + // phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter.FoundInExtendedClassBeforeLastUsed protected function _getLoadRowSelect($object, $rowId) { return $this->_getReadAdapter()->select() @@ -1016,7 +1021,7 @@ protected function _getLoadRowSelect($object, $rowId) * * @param Varien_Object $object * @param string $table - * @return Zend_Db_Select + * @return Varien_Db_Select */ protected function _getLoadAttributesSelect($object, $table) { @@ -1046,7 +1051,7 @@ protected function _addLoadAttributesSelectFields($select, $table, $type) * * @param Varien_Object $object * @param array $valueRow - * @return Mage_Eav_Model_Entity_Abstract + * @return $this */ protected function _setAttributeValue($object, $valueRow) { @@ -1063,7 +1068,7 @@ protected function _setAttributeValue($object, $valueRow) /** * Save entity's attributes into the object's resource * - * @return Mage_Eav_Model_Entity_Abstract + * @return $this */ public function save(Varien_Object $object) { @@ -1216,6 +1221,7 @@ protected function _collectSaveData($newObject) * @param mixed $v New value of the attribute. Can be used in subclasses. * @return bool */ + // phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter.FoundInExtendedClassBeforeLastUsed protected function _canUpdateAttribute(Mage_Eav_Model_Entity_Attribute_Abstract $attribute, $v, array &$origData) { return array_key_exists($attribute->getAttributeCode(), $origData); @@ -1263,7 +1269,7 @@ protected function _prepareStaticValue($key, $value) * Save object collected data * * @param array $saveData array('newObject', 'entityRow', 'insert', 'update', 'delete') - * @return Mage_Eav_Model_Entity_Abstract + * @return $this */ protected function _processSaveData($saveData) { @@ -1372,7 +1378,7 @@ protected function _processSaveData($saveData) * @param Varien_Object $object * @param Mage_Eav_Model_Entity_Attribute_Abstract $attribute * @param mixed $value - * @return Mage_Eav_Model_Entity_Abstract + * @return $this */ protected function _insertAttribute($object, $attribute, $value) { @@ -1386,8 +1392,9 @@ protected function _insertAttribute($object, $attribute, $value) * @param Mage_Eav_Model_Entity_Attribute_Abstract $attribute * @param mixed $valueId * @param mixed $value - * @return Mage_Eav_Model_Entity_Abstract + * @return $this */ + // phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter.FoundInExtendedClassBeforeLastUsed protected function _updateAttribute($object, $attribute, $valueId, $value) { return $this->_saveAttribute($object, $attribute, $value); @@ -1398,10 +1405,10 @@ protected function _updateAttribute($object, $attribute, $valueId, $value) * * Collect for mass save * - * @param Mage_Core_Model_Abstract $object + * @param Mage_Core_Model_Abstract|Varien_Object $object * @param Mage_Eav_Model_Entity_Attribute_Abstract $attribute * @param mixed $value - * @return Mage_Eav_Model_Entity_Abstract + * @return $this */ protected function _saveAttribute($object, $attribute, $value) { @@ -1427,7 +1434,7 @@ protected function _saveAttribute($object, $attribute, $value) /** * Save and detele collected attribute values * - * @return Mage_Eav_Model_Entity_Abstract + * @return $this */ protected function _processAttributeValues() { @@ -1438,6 +1445,7 @@ protected function _processAttributeValues() } foreach ($this->_attributeValuesToDelete as $table => $valueIds) { + // phpcs:ignore Ecg.Performance.Loop.ModelLSD $adapter->delete($table, ['value_id IN (?)' => $valueIds]); } @@ -1481,6 +1489,7 @@ protected function _prepareValueForSave($value, Mage_Eav_Model_Entity_Attribute_ * @param array $info * @return $this */ + // phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter.FoundInExtendedClassBeforeLastUsed protected function _deleteAttributes($object, $table, $info) { $valueIds = []; @@ -1505,7 +1514,7 @@ protected function _deleteAttributes($object, $table, $info) * Save attribute * * @param string $attributeCode - * @return Mage_Eav_Model_Entity_Abstract + * @return $this */ public function saveAttribute(Varien_Object $object, $attributeCode) { @@ -1565,7 +1574,7 @@ public function saveAttribute(Varien_Object $object, $attributeCode) * Delete entity using current object's data * * @param int|string|Varien_Object $object - * @return Mage_Eav_Model_Entity_Abstract + * @return $this * @throws Exception */ public function delete($object) @@ -1585,6 +1594,7 @@ public function delete($object) $this->_getWriteAdapter()->delete($this->getEntityTable(), $where); $this->loadAllAttributes($object); foreach (array_keys($this->getAttributesByTable()) as $table) { + // phpcs:ignore Ecg.Performance.Loop.ModelLSD $this->_getWriteAdapter()->delete($table, $where); } } catch (Exception $e) { @@ -1598,7 +1608,7 @@ public function delete($object) /** * After Load Entity process * - * @return Mage_Eav_Model_Entity_Abstract + * @return $this */ protected function _afterLoad(Varien_Object $object) { @@ -1609,7 +1619,7 @@ protected function _afterLoad(Varien_Object $object) /** * Before delete Entity process * - * @return Mage_Eav_Model_Entity_Abstract + * @return $this */ protected function _beforeSave(Varien_Object $object) { @@ -1620,7 +1630,7 @@ protected function _beforeSave(Varien_Object $object) /** * After Save Entity process * - * @return Mage_Eav_Model_Entity_Abstract + * @return $this */ protected function _afterSave(Varien_Object $object) { @@ -1631,7 +1641,7 @@ protected function _afterSave(Varien_Object $object) /** * Before Delete Entity process * - * @return Mage_Eav_Model_Entity_Abstract + * @return $this */ protected function _beforeDelete(Varien_Object $object) { @@ -1642,7 +1652,7 @@ protected function _beforeDelete(Varien_Object $object) /** * After delete entity process * - * @return Mage_Eav_Model_Entity_Abstract + * @return $this */ protected function _afterDelete(Varien_Object $object) { @@ -1684,7 +1694,7 @@ public function getDefaultAttributes() * After set config process * * @deprecated - * @return Mage_Eav_Model_Entity_Abstract + * @return $this */ protected function _afterSetConfig() { diff --git a/app/code/core/Mage/Sales/Model/Entity/Sale/Collection.php b/app/code/core/Mage/Sales/Model/Entity/Sale/Collection.php index 812d79fe36a..118e596649f 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Sale/Collection.php +++ b/app/code/core/Mage/Sales/Model/Entity/Sale/Collection.php @@ -22,7 +22,7 @@ class Mage_Sales_Model_Entity_Sale_Collection extends Varien_Object implements I /** * Read connection * - * @var Zend_Db_Adapter_Abstract + * @var Varien_Db_Adapter_Interface|false */ protected $_read; @@ -87,6 +87,7 @@ public function load($printQuery = false, $logQuery = false) ] ) ->where('sales.entity_type_id=?', $this->getEntity()->getTypeId()) + // phpcs:ignore Ecg.Sql.SlowQuery.SlowSql ->group('sales.store_id') ; if ($this->_customer instanceof Mage_Customer_Model_Customer) { @@ -96,6 +97,7 @@ public function load($printQuery = false, $logQuery = false) $this->printLogQuery($printQuery, $logQuery); try { + // phpcs:ignore Ecg.Performance.FetchAll.Found $values = $this->_read->fetchAll($this->getSelect()->__toString()); } catch (Exception $e) { $this->printLogQuery(true, true, $this->getSelect()->__toString()); @@ -133,6 +135,7 @@ public function load($printQuery = false, $logQuery = false) public function printLogQuery($printQuery = false, $logQuery = false, $sql = null) { if ($printQuery) { + // phpcs:ignore Ecg.Security.LanguageConstruct.DirectOutput echo is_null($sql) ? $this->getSelect()->__toString() : $sql; } diff --git a/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main.php b/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main.php index b4d841d8982..39948f8b9aa 100644 --- a/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main.php +++ b/app/code/core/Mage/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main.php @@ -138,7 +138,7 @@ protected function _prepareForm() 'required' => true, 'values' => Mage::getSingleton('adminhtml/system_store')->getStoreValuesForForm(false, true), ]); - $renderer = $this->getLayout()->createBlock('adminhtml/store_switcher_form_renderer_fieldset_element'); + $renderer = $this->getStoreSwitcherRenderer(); $field->setRenderer($renderer); } diff --git a/lib/Varien/Data/Collection/Db.php b/lib/Varien/Data/Collection/Db.php index ba70ad75f06..6f15aa43fa6 100644 --- a/lib/Varien/Data/Collection/Db.php +++ b/lib/Varien/Data/Collection/Db.php @@ -164,7 +164,7 @@ protected function _getItemId(Varien_Object $item) /** * Set database connection adapter * - * @param Zend_Db_Adapter_Abstract $conn + * @param Varien_Db_Adapter_Interface|Zend_Db_Adapter_Abstract $conn * @return $this */ public function setConnection($conn)