From 01dc0a0230d3ccb12b20c25f7ddf297bd934dfb0 Mon Sep 17 00:00:00 2001 From: Sven Reichel Date: Sun, 24 Jul 2022 21:22:30 +0200 Subject: [PATCH 1/6] PHPStan/DOCBlock fixes ... - fixed "a few" phpstan errors - added some DOCs - removed useless @return void --- .github/phpstan-baseline.neon | 720 +----------------- app/code/core/Mage/Admin/Model/Observer.php | 1 - .../core/Mage/Admin/Model/Redirectpolicy.php | 1 - app/code/core/Mage/Admin/Model/Session.php | 1 - .../Block/Catalog/Category/Abstract.php | 1 + .../Product/Attribute/Edit/Tab/Front.php | 5 +- .../Catalog/Product/Attribute/Set/Grid.php | 12 +- .../Product/Composite/Fieldset/Options.php | 2 - .../Product/Composite/Fieldset/Qty.php | 2 - .../Catalog/Product/Edit/Tab/Attributes.php | 2 +- .../Block/Checkout/Agreement/Grid.php | 4 +- .../Mage/Adminhtml/Block/Cms/Block/Grid.php | 17 +- .../Mage/Adminhtml/Block/Cms/Page/Edit.php | 2 - .../Mage/Adminhtml/Block/Cms/Page/Grid.php | 19 +- .../Block/Customer/Edit/Tab/Cart.php | 12 +- .../Edit/Tab/View/Grid/Renderer/Item.php | 11 +- .../Block/Customer/Edit/Tab/View/Wishlist.php | 2 - .../Adminhtml/Block/Customer/Group/Grid.php | 2 +- .../Adminhtml/Block/Customer/Online/Grid.php | 2 +- .../Mage/Adminhtml/Block/Dashboard/Graph.php | 6 - .../Adminhtml/Block/Dashboard/Orders/Grid.php | 9 +- .../Adminhtml/Block/Dashboard/Tab/Amounts.php | 2 - .../Adminhtml/Block/Dashboard/Tab/Orders.php | 2 - .../Block/Dashboard/Tab/Products/Ordered.php | 3 +- .../Template/Grid/Renderer/Action.php | 2 +- .../Adminhtml/Block/Notification/Window.php | 2 - .../Block/Permissions/Variable/Grid.php | 4 +- .../Block/Report/Customer/Accounts/Grid.php | 3 + .../Adminhtml/Block/Report/Filter/Form.php | 8 +- .../core/Mage/Adminhtml/Block/Report/Grid.php | 12 +- .../Adminhtml/Block/Report/Grid/Shopcart.php | 2 +- .../Adminhtml/Block/Report/Product/Grid.php | 13 +- .../Block/Report/Product/Ordered/Grid.php | 3 + .../Block/Report/Shopcart/Customer/Grid.php | 12 +- .../core/Mage/Adminhtml/Block/Review/Grid.php | 3 + .../Adminhtml/Block/Review/Product/Grid.php | 14 +- .../Block/Sales/Order/Create/Search/Grid.php | 17 +- .../Block/Sales/Order/Shipment/Packaging.php | 2 +- .../Block/Sales/Order/View/Giftmessage.php | 2 +- .../Block/Sales/Order/View/Items.php | 2 +- .../Order/View/Items/Renderer/Default.php | 2 +- .../Block/Sales/Reorder/Renderer/Action.php | 1 - .../Block/Shipping/Carrier/Tablerate/Grid.php | 4 +- .../Config/Form/Field/Array/Abstract.php | 4 +- .../System/Storage/Media/Synchronize.php | 2 +- .../Adminhtml/Block/Tag/Customer/Grid.php | 18 +- .../core/Mage/Adminhtml/Block/Tag/Edit.php | 2 - .../Mage/Adminhtml/Block/Tag/Grid/Pending.php | 4 +- .../core/Mage/Adminhtml/Block/Tag/Pending.php | 2 - .../Mage/Adminhtml/Block/Tag/Product/Grid.php | 2 +- .../Mage/Adminhtml/Block/Tag/Tag/Grid.php | 6 +- .../Mage/Adminhtml/Block/Widget/Container.php | 4 +- .../core/Mage/Adminhtml/Block/Widget/Grid.php | 30 +- .../Widget/Grid/Column/Filter/Datetime.php | 2 +- .../Block/Widget/Grid/Serializer.php | 5 +- .../core/Mage/Adminhtml/Controller/Action.php | 10 +- app/code/core/Mage/Adminhtml/Model/Config.php | 2 - .../Adminhtml/Model/Sales/Order/Create.php | 6 +- .../System/Config/Backend/Serialized.php | 3 + .../Config/Backend/Serialized/Array.php | 4 +- .../Mage/Adminhtml/Model/System/Store.php | 5 +- .../Catalog/CategoryController.php | 4 - .../Catalog/Product/WidgetController.php | 1 - .../controllers/Catalog/ProductController.php | 2 - .../controllers/Cms/PageController.php | 2 +- .../Cms/Wysiwyg/ImagesController.php | 2 - .../System/Config/ValidatevatController.php | 4 - .../controllers/CustomerController.php | 2 +- .../Permissions/VariableController.php | 1 - .../controllers/Promo/QuoteController.php | 5 - .../controllers/Promo/WidgetController.php | 5 +- .../Sales/Order/CreateController.php | 4 +- .../Sales/Order/CreditmemoController.php | 2 + .../Sales/Order/ShipmentController.php | 7 - .../Sales/Recurring/ProfileController.php | 2 +- .../Config/System/StorageController.php | 4 - .../Adminhtml/controllers/TagController.php | 2 - app/code/core/Mage/Api/Helper/Data.php | 1 - .../Api2/Block/Adminhtml/Attribute/Grid.php | 1 + .../Mage/Api2/Model/Acl/Filter/Attribute.php | 2 - .../core/Mage/Api2/Model/Acl/Global/Role.php | 2 - .../core/Mage/Api2/Model/Acl/Global/Rule.php | 2 - app/code/core/Mage/Api2/Model/Config.php | 2 +- app/code/core/Mage/Api2/Model/Observer.php | 1 - .../Model/Resource/Acl/Filter/Attribute.php | 2 - .../Acl/Filter/Attribute/Collection.php | 2 - .../Api2/Model/Resource/Acl/Global/Role.php | 2 - .../Resource/Acl/Global/Role/Collection.php | 2 - .../Api2/Model/Resource/Acl/Global/Rule.php | 2 - .../Resource/Acl/Global/Rule/Collection.php | 2 - .../core/Mage/Api2/Model/Route/Abstract.php | 2 +- app/code/core/Mage/Api2/Model/Server.php | 1 - .../core/Mage/Authorizenet/Helper/Data.php | 2 +- .../Mage/Authorizenet/Model/Directpost.php | 9 +- .../Authorizenet/Model/Directpost/Request.php | 1 - app/code/core/Mage/Backup/Model/Backup.php | 4 +- .../Fieldset/Options/Type/Checkbox.php | 2 - .../Composite/Fieldset/Options/Type/Multi.php | 2 - .../Composite/Fieldset/Options/Type/Radio.php | 2 - .../Fieldset/Options/Type/Select.php | 2 - .../View/Type/Bundle/Option/Checkbox.php | 2 - .../Product/View/Type/Bundle/Option/Multi.php | 2 - .../Product/View/Type/Bundle/Option/Radio.php | 2 - .../View/Type/Bundle/Option/Select.php | 2 - .../Model/Sales/Order/Pdf/Items/Invoice.php | 2 - app/code/core/Mage/Bundle/Model/Selection.php | 6 +- .../core/Mage/Captcha/Model/Interface.php | 1 - .../core/Mage/Captcha/Model/Resource/Log.php | 2 - .../Adminhtml/RefreshController.php | 2 - .../Captcha/controllers/RefreshController.php | 2 - .../Mage/Catalog/Block/Product/Abstract.php | 2 +- app/code/core/Mage/Catalog/Helper/Image.php | 1 - .../Mage/Catalog/Helper/Product/Compare.php | 6 +- .../Api2/Product/Image/Rest/Admin/V1.php | 1 - app/code/core/Mage/Catalog/Model/Category.php | 2 - .../Category/Attribute/Backend/Image.php | 1 + .../Model/Layer/Filter/Price/Algorithm.php | 1 - app/code/core/Mage/Catalog/Model/Observer.php | 1 - app/code/core/Mage/Catalog/Model/Product.php | 3 - .../core/Mage/Catalog/Model/Product/Api.php | 4 - .../Mage/Catalog/Model/Product/Api/V2.php | 1 - .../Catalog/Model/Product/Attribute/Api.php | 1 - .../Product/Attribute/Backend/Recurring.php | 1 + .../Model/Product/Attribute/Backend/Sku.php | 2 +- .../Mage/Catalog/Model/Product/Option/Api.php | 2 - .../Model/Product/Option/Type/Date.php | 1 - .../Model/Product/Option/Type/File.php | 5 +- .../Catalog/Model/Resource/Product/Option.php | 1 - .../core/Mage/Catalog/Model/Resource/Url.php | 2 - app/code/core/Mage/Catalog/Model/Url.php | 1 - app/code/core/Mage/CatalogRule/Model/Rule.php | 4 - .../core/Mage/CatalogSearch/Helper/Data.php | 3 +- .../Checkout/Block/Cart/Item/Renderer.php | 4 +- .../Block/Multishipping/Addresses.php | 4 +- .../core/Mage/Checkout/Model/Type/Onepage.php | 5 - .../Checkout/controllers/CartController.php | 3 - .../controllers/OnepageController.php | 2 +- app/code/core/Mage/Cms/Block/Block.php | 2 - app/code/core/Mage/Cms/Block/Widget/Block.php | 2 - .../Mage/Cms/Model/Wysiwyg/Images/Storage.php | 1 - .../Helper/List/Price.php | 1 - .../Helper/Mediafallback.php | 5 - .../Helper/Productimg.php | 1 - .../Helper/Productlist.php | 1 - .../Controller/Varien/Router/Standard.php | 1 - .../core/Mage/Core/Model/Domainpolicy.php | 2 +- app/code/core/Mage/Core/Model/Logger.php | 2 - .../Model/Resource/Email/Queue/Collection.php | 2 - .../Model/Resource/Setup/Query/Modifier.php | 1 - app/code/core/Mage/Core/Model/Store.php | 2 +- .../core/Mage/Core/Model/Translate/Inline.php | 1 - .../Model/System/Currencysymbol.php | 2 +- .../Mage/Customer/Model/Address/Abstract.php | 2 - .../Customer/Attribute/Backend/Billing.php | 2 + .../Customer/Attribute/Backend/Shipping.php | 2 + .../Mage/Customer/Model/Resource/Setup.php | 2 - .../Mage/Dataflow/Model/Resource/Profile.php | 2 +- app/code/core/Mage/Directory/Helper/Data.php | 4 +- .../Model/Resource/Currency/Collection.php | 2 - .../Downloadable/Model/Link/Api/Uploader.php | 1 - .../Mage/Downloadable/Model/Link/Api/V2.php | 1 - .../Mage/Eav/Model/Convert/Adapter/Entity.php | 1 - .../Eav/Model/Entity/Attribute/Abstract.php | 2 - app/code/core/Mage/GiftMessage/Model/Api.php | 6 +- .../core/Mage/GoogleAnalytics/Helper/Data.php | 4 +- .../Block/Adminhtml/Export/Edit.php | 4 - .../Block/Adminhtml/Export/Filter.php | 2 - .../Block/Adminhtml/Import/Edit.php | 4 - .../Model/Export/Adapter/Abstract.php | 1 - .../Model/Export/Entity/Abstract.php | 2 - .../Model/Export/Entity/Customer.php | 4 - .../Model/Export/Entity/Product.php | 3 - .../core/Mage/ImportExport/Model/Import.php | 2 - .../Model/Import/Adapter/Abstract.php | 2 - .../Model/Import/Entity/Abstract.php | 2 - .../Model/Import/Entity/Customer.php | 2 - .../Model/Import/Entity/Customer/Address.php | 1 - .../Import/Entity/Product/Type/Abstract.php | 1 - .../Model/Import/Proxy/Product.php | 2 - .../Adminhtml/ExportController.php | 6 - .../Adminhtml/ImportController.php | 8 - app/code/core/Mage/Index/Model/Indexer.php | 1 - app/code/core/Mage/Index/Model/Process.php | 2 +- app/code/core/Mage/Oauth/Model/Consumer.php | 2 - app/code/core/Mage/Oauth/Model/Nonce.php | 2 - .../Mage/Oauth/Model/Resource/Consumer.php | 2 - .../Model/Resource/Consumer/Collection.php | 2 - .../core/Mage/Oauth/Model/Resource/Nonce.php | 2 - .../Oauth/Model/Resource/Nonce/Collection.php | 2 - .../core/Mage/Oauth/Model/Resource/Token.php | 2 - .../Oauth/Model/Resource/Token/Collection.php | 2 - app/code/core/Mage/Oauth/Model/Token.php | 2 - .../Oauth/controllers/AuthorizeController.php | 4 - .../Mage/Page/Block/Html/Topmenu/Renderer.php | 2 - app/code/core/Mage/PageCache/Helper/Data.php | 2 - .../PageCache/Model/Control/Interface.php | 2 - .../Mage/PageCache/Model/Control/Zend.php | 2 - .../Adminhtml/PageCacheController.php | 6 +- .../core/Mage/Paygate/Model/Authorizenet.php | 18 +- .../Mage/Paygate/Model/Authorizenet/Cards.php | 4 +- app/code/core/Mage/Payment/Helper/Data.php | 4 +- app/code/core/Mage/Payment/Model/Observer.php | 1 - .../Adminhtml/Settlement/Report/Grid.php | 6 +- .../System/Config/Fieldset/Global.php | 4 +- .../core/Mage/Paypal/Block/Express/Review.php | 2 +- .../core/Mage/Paypal/Block/Payment/Info.php | 1 + app/code/core/Mage/Paypal/Model/Api/Nvp.php | 17 +- app/code/core/Mage/Paypal/Model/Cert.php | 2 - app/code/core/Mage/Paypal/Model/Config.php | 10 +- app/code/core/Mage/Paypal/Model/Direct.php | 7 +- app/code/core/Mage/Paypal/Model/Express.php | 7 +- app/code/core/Mage/Paypal/Model/Info.php | 2 + app/code/core/Mage/Paypal/Model/Ipn.php | 3 - .../Mage/Paypal/Model/Method/Agreement.php | 1 + app/code/core/Mage/Paypal/Model/Observer.php | 1 - .../core/Mage/Paypal/Model/Payflowlink.php | 3 +- .../core/Mage/Paypal/Model/Payflowpro.php | 4 +- .../Mage/Paypal/Model/Payment/Transaction.php | 3 +- app/code/core/Mage/Paypal/Model/Pro.php | 10 +- .../Paypal/Model/Report/Settlement/Row.php | 8 +- .../Model/Resource/Payment/Transaction.php | 4 +- app/code/core/Mage/Paypal/Model/Standard.php | 4 +- .../controllers/PayflowadvancedController.php | 8 - .../core/Mage/Poll/Model/Resource/Poll.php | 1 + .../Mage/Poll/controllers/VoteController.php | 2 - app/code/core/Mage/Rating/Model/Rating.php | 2 - .../Mage/Reports/Model/Resource/Event.php | 2 - .../Mage/Rss/Block/Catalog/NotifyStock.php | 3 - .../core/Mage/Rss/Block/Catalog/Review.php | 3 - app/code/core/Mage/Rss/Model/Observer.php | 3 - .../core/Mage/Sales/Block/Order/Comments.php | 2 +- .../core/Mage/Sales/Controller/Abstract.php | 2 - .../Order/Attribute/Backend/Shipping.php | 2 + app/code/core/Mage/Sales/Model/Observer.php | 1 - app/code/core/Mage/Sales/Model/Order.php | 6 +- .../Mage/Sales/Model/Order/Creditmemo.php | 2 +- .../core/Mage/Sales/Model/Order/Invoice.php | 2 +- .../Mage/Sales/Model/Order/Pdf/Abstract.php | 1 - .../Mage/Sales/Model/Order/Pdf/Creditmemo.php | 1 - .../Mage/Sales/Model/Order/Pdf/Invoice.php | 1 - .../Mage/Sales/Model/Order/Pdf/Shipment.php | 1 - .../core/Mage/Sales/Model/Order/Shipment.php | 4 +- app/code/core/Mage/Sales/Model/Quote.php | 10 +- .../core/Mage/Sales/Model/Quote/Address.php | 2 - .../Model/Quote/Address/Total/Abstract.php | 2 +- .../Order/Attribute/Backend/Billing.php | 2 + .../Order/Attribute/Backend/Shipping.php | 2 + .../Resource/Order/Payment/Transaction.php | 2 +- .../Model/Resource/Report/Bestsellers.php | 2 +- .../Sales/controllers/GuestController.php | 3 - .../Model/Resource/Rule/Collection.php | 4 +- .../core/Mage/SalesRule/Model/Validator.php | 1 - .../Mage/Shipping/Model/Carrier/Abstract.php | 1 - .../Shipping/Model/Carrier/Freeshipping.php | 1 - .../Mage/Shipping/Model/Carrier/Tablerate.php | 2 +- .../core/Mage/Shipping/Model/Rate/Result.php | 1 - .../Model/Resource/Carrier/Tablerate.php | 2 - .../core/Mage/Shipping/Model/Shipping.php | 1 - .../Mage/Tag/controllers/IndexController.php | 1 - .../Tax/Model/Sales/Total/Quote/Shipping.php | 1 - .../Mage/Tax/Model/Sales/Total/Quote/Tax.php | 6 +- .../Model/System/Config/Source/Tax/Region.php | 1 - .../Usa/Block/Adminhtml/Dhl/Unitofmeasure.php | 2 - .../Carrier/Abstract/Backend/Abstract.php | 4 - .../Mage/Usa/Model/Shipping/Carrier/Dhl.php | 3 - .../Shipping/Carrier/Dhl/International.php | 8 +- .../Mage/Usa/Model/Shipping/Carrier/Fedex.php | 5 - .../Carrier/Ups/Backend/Freemethod.php | 4 - .../Carrier/Ups/Backend/OriginShipment.php | 4 - .../Shipping/Carrier/Ups/Backend/Type.php | 4 - .../Mage/Usa/Model/Shipping/Carrier/Usps.php | 1 - .../core/Mage/Weee/Model/Total/Quote/Weee.php | 1 - .../Mage/Wishlist/Block/Customer/Wishlist.php | 2 +- .../Block/Customer/Wishlist/Item/Options.php | 2 +- .../Model/Resource/Item/Collection.php | 2 - .../Model/Resource/Item/Option/Collection.php | 2 - 276 files changed, 363 insertions(+), 1290 deletions(-) diff --git a/.github/phpstan-baseline.neon b/.github/phpstan-baseline.neon index 7c65d44ed5c..67765cea832 100644 --- a/.github/phpstan-baseline.neon +++ b/.github/phpstan-baseline.neon @@ -5,11 +5,6 @@ parameters: count: 1 path: ../app/code/core/Mage/Admin/Model/Config.php - - - message: "#^PHPDoc tag @var above assignment does not specify variable name\\.$#" - count: 1 - path: ../app/code/core/Mage/Admin/Model/Redirectpolicy.php - - message: "#^Cannot call method getClassName\\(\\) on SimpleXMLElement\\|false\\.$#" count: 1 @@ -150,11 +145,6 @@ parameters: count: 2 path: ../app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Alerts.php - - - message: "#^Method Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Attributes\\:\\:_prepareForm\\(\\) should return null but return statement is missing\\.$#" - count: 1 - path: ../app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Attributes.php - - message: "#^Call to an undefined method Varien_Data_Collection\\:\\:addFieldToFilter\\(\\)\\.$#" count: 2 @@ -215,11 +205,6 @@ parameters: count: 1 path: ../app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Simple.php - - - message: "#^Method Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Super_Config_Simple\\:\\:_prepareForm\\(\\) should return null but return statement is missing\\.$#" - count: 1 - path: ../app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Simple.php - - message: "#^Call to an undefined method Varien_Data_Collection\\:\\:addFieldToFilter\\(\\)\\.$#" count: 2 @@ -335,11 +320,6 @@ parameters: count: 1 path: ../app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Cart.php - - - message: "#^PHPDoc tag @param has invalid value \\(Mage_Wishlist_Item_Option\\)\\: Unexpected token \"\\\\n \\* \", expected variable at offset 100$#" - count: 1 - path: ../app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Grid/Renderer/Item.php - - message: "#^Method Mage_Adminhtml_Block_Widget_Grid\\:\\:setDefaultSort\\(\\) invoked with 2 parameters, 1 required\\.$#" count: 1 @@ -390,11 +370,6 @@ parameters: count: 1 path: ../app/code/core/Mage/Adminhtml/Block/Customer/Online/Grid.php - - - message: "#^PHPDoc tag @param has invalid value \\(Mage_Core_Model_Abstract\\)\\: Unexpected token \"\\\\n \\* \", expected variable at offset 73$#" - count: 1 - path: ../app/code/core/Mage/Adminhtml/Block/Customer/Online/Grid.php - - message: "#^Access to an undefined property Mage_Adminhtml_Block_Dashboard_Bar\\:\\:\\$_currency\\.$#" count: 1 @@ -465,11 +440,6 @@ parameters: count: 1 path: ../app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Grid/Renderer/Action.php - - - message: "#^PHPDoc tag @var above a method has no effect\\.$#" - count: 1 - path: ../app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Grid/Renderer/Action.php - - message: "#^Cannot call method addValueFilter\\(\\) on Mage_Core_Model_Resource_Db_Collection_Abstract\\|false\\.$#" count: 1 @@ -510,11 +480,6 @@ parameters: count: 1 path: ../app/code/core/Mage/Adminhtml/Block/Notification/Window.php - - - message: "#^PHPDoc tag @param references unknown parameter\\: \\$resourcePath$#" - count: 1 - path: ../app/code/core/Mage/Adminhtml/Block/Notification/Window.php - - message: "#^Method Mage_Adminhtml_Block_Page\\:\\:getLang\\(\\) has invalid return type unknown\\.$#" count: 1 @@ -585,46 +550,16 @@ parameters: count: 1 path: ../app/code/core/Mage/Adminhtml/Block/Report/Customer/Accounts/Grid.php - - - message: "#^Method Mage_Adminhtml_Block_Report_Customer_Accounts_Grid\\:\\:_prepareCollection\\(\\) should return \\$this\\(Mage_Adminhtml_Block_Report_Customer_Accounts_Grid\\) but return statement is missing\\.$#" - count: 1 - path: ../app/code/core/Mage/Adminhtml/Block/Report/Customer/Accounts/Grid.php - - message: "#^Call to an undefined method Varien_Data_Collection\\:\\:initReport\\(\\)\\.$#" count: 1 path: ../app/code/core/Mage/Adminhtml/Block/Report/Customer/Orders/Grid.php - - - message: "#^Method Mage_Adminhtml_Block_Report_Customer_Orders_Grid\\:\\:_prepareCollection\\(\\) should return \\$this\\(Mage_Adminhtml_Block_Report_Customer_Orders_Grid\\) but return statement is missing\\.$#" - count: 1 - path: ../app/code/core/Mage/Adminhtml/Block/Report/Customer/Orders/Grid.php - - message: "#^Call to an undefined method Varien_Data_Collection\\:\\:initReport\\(\\)\\.$#" count: 1 path: ../app/code/core/Mage/Adminhtml/Block/Report/Customer/Totals/Grid.php - - - message: "#^Method Mage_Adminhtml_Block_Report_Customer_Totals_Grid\\:\\:_prepareCollection\\(\\) should return \\$this\\(Mage_Adminhtml_Block_Report_Customer_Totals_Grid\\) but return statement is missing\\.$#" - count: 1 - path: ../app/code/core/Mage/Adminhtml/Block/Report/Customer/Totals/Grid.php - - - - message: "#^PHPDoc tag @param has invalid value \\(bool Default field visibility\\)\\: Unexpected token \"Default\", expected variable at offset 88$#" - count: 1 - path: ../app/code/core/Mage/Adminhtml/Block/Report/Filter/Form.php - - - - message: "#^PHPDoc tag @param has invalid value \\(bool Field visibility\\)\\: Unexpected token \"Field\", expected variable at offset 88$#" - count: 1 - path: ../app/code/core/Mage/Adminhtml/Block/Report/Filter/Form.php - - - - message: "#^PHPDoc tag @param has invalid value \\(string Field id\\)\\: Unexpected token \"Field\", expected variable at offset 60$#" - count: 2 - path: ../app/code/core/Mage/Adminhtml/Block/Report/Filter/Form.php - - message: "#^Access to an undefined property Mage_Adminhtml_Block_Report_Grid\\:\\:\\$_filterValues\\.$#" count: 1 @@ -650,26 +585,11 @@ parameters: count: 1 path: ../app/code/core/Mage/Adminhtml/Block/Report/Grid.php - - - message: "#^Method Mage_Adminhtml_Block_Report_Grid\\:\\:_prepareCollection\\(\\) should return \\$this\\(Mage_Adminhtml_Block_Report_Grid\\) but return statement is missing\\.$#" - count: 1 - path: ../app/code/core/Mage/Adminhtml/Block/Report/Grid.php - - - - message: "#^Method Mage_Adminhtml_Block_Report_Grid\\:\\:getCsv\\(\\) has invalid return type unknown\\.$#" - count: 1 - path: ../app/code/core/Mage/Adminhtml/Block/Report/Grid.php - - message: "#^Method Mage_Adminhtml_Block_Report_Grid\\:\\:getExcel\\(\\) has invalid return type unknown\\.$#" count: 1 path: ../app/code/core/Mage/Adminhtml/Block/Report/Grid.php - - - message: "#^PHPDoc tag @param references unknown parameter\\: \\$currencyCode$#" - count: 1 - path: ../app/code/core/Mage/Adminhtml/Block/Report/Grid.php - - message: "#^Access to an undefined property Mage_Adminhtml_Block_Report_Grid_Abstract\\:\\:\\$_columnGroupBy\\.$#" count: 1 @@ -700,11 +620,6 @@ parameters: count: 1 path: ../app/code/core/Mage/Adminhtml/Block/Report/Grid/Shopcart.php - - - message: "#^PHPDoc tag @param references unknown parameter\\: \\$currencyCode$#" - count: 1 - path: ../app/code/core/Mage/Adminhtml/Block/Report/Grid/Shopcart.php - - message: "#^Call to an undefined method Mage_Eav_Model_Entity_Abstract\\:\\:setStore\\(\\)\\.$#" count: 1 @@ -720,11 +635,6 @@ parameters: count: 1 path: ../app/code/core/Mage/Adminhtml/Block/Report/Product/Ordered/Grid.php - - - message: "#^Method Mage_Adminhtml_Block_Report_Product_Ordered_Grid\\:\\:_prepareCollection\\(\\) should return \\$this\\(Mage_Adminhtml_Block_Report_Product_Ordered_Grid\\) but return statement is missing\\.$#" - count: 1 - path: ../app/code/core/Mage/Adminhtml/Block/Report/Product/Ordered/Grid.php - - message: "#^Call to an undefined method Varien_Data_Collection\\:\\:initReport\\(\\)\\.$#" count: 1 @@ -740,11 +650,6 @@ parameters: count: 1 path: ../app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Customer/Grid.php - - - message: "#^Method Mage_Adminhtml_Block_Review_Grid\\:\\:_prepareMassaction\\(\\) should return \\$this\\(Mage_Adminhtml_Block_Review_Grid\\) but return statement is missing\\.$#" - count: 1 - path: ../app/code/core/Mage/Adminhtml/Block/Review/Grid.php - - message: "#^Method Mage_Adminhtml_Block_Review_Grid_Renderer_Type\\:\\:render\\(\\) should return string but return statement is missing\\.$#" count: 1 @@ -970,16 +875,6 @@ parameters: count: 1 path: ../app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Giftmessage.php - - - message: "#^PHPDoc tag @param references unknown parameter\\: \\$name$#" - count: 1 - path: ../app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Giftmessage.php - - - - message: "#^Method Mage_Adminhtml_Block_Sales_Order_View_Items\\:\\:getItemsCollection\\(\\) has invalid return type unknown\\.$#" - count: 1 - path: ../app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Items.php - - message: "#^Call to an undefined method Mage_Core_Helper_Abstract\\:\\:getBasePriceInclTax\\(\\)\\.$#" count: 1 @@ -1015,11 +910,6 @@ parameters: count: 1 path: ../app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Items/Renderer/Default.php - - - message: "#^PHPDoc tag @param references unknown parameter\\: \\$name$#" - count: 1 - path: ../app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Items/Renderer/Default.php - - message: "#^Call to an undefined method Mage_Core_Model_Resource_Db_Collection_Abstract\\:\\:setOrderFilter\\(\\)\\.$#" count: 1 @@ -1070,11 +960,6 @@ parameters: count: 1 path: ../app/code/core/Mage/Adminhtml/Block/Sales/Transactions/Grid.php - - - message: "#^PHPDoc tag @param references unknown parameter\\: \\$websiteId$#" - count: 1 - path: ../app/code/core/Mage/Adminhtml/Block/Shipping/Carrier/Tablerate/Grid.php - - message: "#^Cannot call method addIdFilter\\(\\) on Mage_Core_Model_Resource_Db_Collection_Abstract\\|false\\.$#" count: 1 @@ -1100,16 +985,6 @@ parameters: count: 2 path: ../app/code/core/Mage/Adminhtml/Block/System/Config/Form.php - - - message: "#^PHPDoc tag @param has invalid value \\(Varien_Object\\)\\: Unexpected token \"\\\\n \", expected variable at offset 78$#" - count: 1 - path: ../app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Array/Abstract.php - - - - message: "#^Property Mage_Adminhtml_Block_System_Config_Form_Field_Array_Abstract\\:\\:\\$_addButtonLabel has unknown class unknown_type as its type\\.$#" - count: 1 - path: ../app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Array/Abstract.php - - message: "#^Call to an undefined method object\\:\\:descend\\(\\)\\.$#" count: 1 @@ -1345,11 +1220,6 @@ parameters: count: 1 path: ../app/code/core/Mage/Adminhtml/Block/Widget.php - - - message: "#^PHPDoc tag @param references unknown parameter\\: \\$placement$#" - count: 2 - path: ../app/code/core/Mage/Adminhtml/Block/Widget/Container.php - - message: "#^Call to an undefined method Mage_Core_Helper_Abstract\\:\\:decodeFilter\\(\\)\\.$#" count: 1 @@ -1370,46 +1240,6 @@ parameters: count: 3 path: ../app/code/core/Mage/Adminhtml/Block/Widget/Grid.php - - - message: "#^Method Mage_Adminhtml_Block_Widget_Grid\\:\\:_prepareMassactionColumn\\(\\) has invalid return type unknown\\.$#" - count: 1 - path: ../app/code/core/Mage/Adminhtml/Block/Widget/Grid.php - - - - message: "#^Method Mage_Adminhtml_Block_Widget_Grid\\:\\:getSubTotalColumns\\(\\) has invalid return type unknown\\.$#" - count: 1 - path: ../app/code/core/Mage/Adminhtml/Block/Widget/Grid.php - - - - message: "#^PHPDoc tag @param has invalid value \\(Mage_Catalog_Model_Product\\|Varien_Object\\)\\: Unexpected token \"\\\\n \\* \", expected variable at offset 109$#" - count: 1 - path: ../app/code/core/Mage/Adminhtml/Block/Widget/Grid.php - - - - message: "#^PHPDoc tag @param references unknown parameter\\: \\$item$#" - count: 2 - path: ../app/code/core/Mage/Adminhtml/Block/Widget/Grid.php - - - - message: "#^PHPDoc tag @param references unknown parameter\\: \\$visible$#" - count: 2 - path: ../app/code/core/Mage/Adminhtml/Block/Widget/Grid.php - - - - message: "#^PHPDoc tag @var above a method has no effect\\.$#" - count: 1 - path: ../app/code/core/Mage/Adminhtml/Block/Widget/Grid.php - - - - message: "#^Property Mage_Adminhtml_Block_Widget_Grid\\:\\:\\$_emptyText has unknown class sting as its type\\.$#" - count: 1 - path: ../app/code/core/Mage/Adminhtml/Block/Widget/Grid.php - - - - message: "#^Property Mage_Adminhtml_Block_Widget_Grid\\:\\:\\$_emptyTextCss has unknown class sting as its type\\.$#" - count: 1 - path: ../app/code/core/Mage/Adminhtml/Block/Widget/Grid.php - - message: "#^Parameter \\$action of method Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Action\\:\\:_toOptionHtml\\(\\) has invalid type unknown_type\\.$#" count: 1 @@ -1435,16 +1265,6 @@ parameters: count: 1 path: ../app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction/Item.php - - - message: "#^Method Mage_Adminhtml_Block_Widget_Grid_Serializer\\:\\:getColumnInputNames\\(\\) has invalid return type unknown\\.$#" - count: 1 - path: ../app/code/core/Mage/Adminhtml/Block/Widget/Grid/Serializer.php - - - - message: "#^PHPDoc tag @param references unknown parameter\\: \\$name$#" - count: 1 - path: ../app/code/core/Mage/Adminhtml/Block/Widget/Grid/Serializer.php - - message: "#^Call to an undefined method Mage_Adminhtml_Block_Widget_Tab_Interface\\:\\:getSkipGenerateContent\\(\\)\\.$#" count: 1 @@ -1535,16 +1355,6 @@ parameters: count: 1 path: ../app/code/core/Mage/Adminhtml/Model/Sales/Order/Create.php - - - message: "#^PHPDoc tag @param references unknown parameter\\: \\$options$#" - count: 1 - path: ../app/code/core/Mage/Adminhtml/Model/Sales/Order/Create.php - - - - message: "#^PHPDoc tag @param references unknown parameter\\: \\$product$#" - count: 1 - path: ../app/code/core/Mage/Adminhtml/Model/Sales/Order/Create.php - - message: "#^Variable \\$billingAddress might not be defined\\.$#" count: 2 @@ -1610,21 +1420,6 @@ parameters: count: 1 path: ../app/code/core/Mage/Adminhtml/Model/System/Config/Source/Country.php - - - message: "#^PHPDoc tag @param has invalid value \\(int groupId\\)\\: Unexpected token \"groupId\", expected variable at offset 62$#" - count: 1 - path: ../app/code/core/Mage/Adminhtml/Model/System/Store.php - - - - message: "#^PHPDoc tag @param has invalid value \\(int websiteId\\)\\: Unexpected token \"websiteId\", expected variable at offset 64$#" - count: 1 - path: ../app/code/core/Mage/Adminhtml/Model/System/Store.php - - - - message: "#^Variable \\$options might not be defined\\.$#" - count: 1 - path: ../app/code/core/Mage/Adminhtml/Model/System/Store.php - - message: "#^Variable \\$values might not be defined\\.$#" count: 1 @@ -1650,21 +1445,11 @@ parameters: count: 2 path: ../app/code/core/Mage/Adminhtml/controllers/Catalog/ProductController.php - - - message: "#^Method Mage_Adminhtml_Catalog_ProductController\\:\\:_filterStockData\\(\\) should return null but return statement is missing\\.$#" - count: 1 - path: ../app/code/core/Mage/Adminhtml/controllers/Catalog/ProductController.php - - message: "#^Method Mage_Adminhtml_Controller_Action\\:\\:_setForcedFormKeyActions\\(\\) invoked with 2 parameters, 1 required\\.$#" count: 1 path: ../app/code/core/Mage/Adminhtml/controllers/Catalog/SearchController.php - - - message: "#^PHPDoc tag @param has invalid value \\(array\\)\\: Unexpected token \"\\\\n \\* \", expected variable at offset 96$#" - count: 1 - path: ../app/code/core/Mage/Adminhtml/controllers/Cms/PageController.php - - message: "#^Call to method _saveSessionCurrentPath\\(\\) on an unknown class Mage_Adminhtml_Cms_Page_Wysiwyg_ImagesController\\.$#" count: 1 @@ -1690,11 +1475,6 @@ parameters: count: 1 path: ../app/code/core/Mage/Adminhtml/controllers/CustomerController.php - - - message: "#^PHPDoc tag @param has invalid value \\(array\\)\\: Unexpected token \"\\\\n \\* \", expected variable at offset 96$#" - count: 1 - path: ../app/code/core/Mage/Adminhtml/controllers/CustomerController.php - - message: "#^Call to an undefined method Varien_Simplexml_Element\\:\\:getClassName\\(\\)\\.$#" count: 1 @@ -1710,11 +1490,6 @@ parameters: count: 1 path: ../app/code/core/Mage/Adminhtml/controllers/Permissions/BlockController.php - - - message: "#^PHPDoc tag @var for variable \\$block contains unknown class Mage_Adminhtml_Block_Permissions_Variables\\.$#" - count: 1 - path: ../app/code/core/Mage/Adminhtml/controllers/Permissions/VariableController.php - - message: "#^Variable \\$id in isset\\(\\) always exists and is not nullable\\.$#" count: 1 @@ -1790,21 +1565,6 @@ parameters: count: 1 path: ../app/code/core/Mage/Adminhtml/controllers/Sales/Order/ShipmentController.php - - - message: "#^Method Mage_Adminhtml_Sales_Order_ShipmentController\\:\\:massPrintShippingLabelAction\\(\\) should return null but return statement is missing\\.$#" - count: 1 - path: ../app/code/core/Mage/Adminhtml/controllers/Sales/Order/ShipmentController.php - - - - message: "#^Method Mage_Adminhtml_Sales_Order_ShipmentController\\:\\:saveAction\\(\\) should return null but return statement is missing\\.$#" - count: 1 - path: ../app/code/core/Mage/Adminhtml/controllers/Sales/Order/ShipmentController.php - - - - message: "#^Result of method Mage_Sales_Model_Order_Shipment\\:\\:getShippingLabel\\(\\) \\(void\\) is used\\.$#" - count: 1 - path: ../app/code/core/Mage/Adminhtml/controllers/Sales/Order/ShipmentController.php - - message: "#^Method Mage_Adminhtml_Controller_Action\\:\\:_setForcedFormKeyActions\\(\\) invoked with 2 parameters, 1 required\\.$#" count: 1 @@ -2005,11 +1765,6 @@ parameters: count: 1 path: ../app/code/core/Mage/Api/Model/Wsdl/Config/Element.php - - - message: "#^Method Mage_Api2_Block_Adminhtml_Attribute_Grid\\:\\:_prepareCollection\\(\\) should return \\$this\\(Mage_Api2_Block_Adminhtml_Attribute_Grid\\) but return statement is missing\\.$#" - count: 1 - path: ../app/code/core/Mage/Api2/Block/Adminhtml/Attribute/Grid.php - - message: "#^Call to an undefined method Varien_Data_Collection\\:\\:addFieldToFilter\\(\\)\\.$#" count: 2 @@ -2030,11 +1785,6 @@ parameters: count: 2 path: ../app/code/core/Mage/Api2/Model/Acl/Global/Rule/Tree.php - - - message: "#^Variable \\$routes in PHPDoc tag @var does not match any variable in the foreach loop\\: \\$route$#" - count: 1 - path: ../app/code/core/Mage/Api2/Model/Config.php - - message: "#^Call to an undefined method Mage_Api2_Model_Config\\:\\:getMainRoute\\(\\)\\.$#" count: 1 @@ -2105,11 +1855,6 @@ parameters: count: 1 path: ../app/code/core/Mage/Api2/Model/Route/ApiType.php - - - message: "#^PHPDoc tag @param has invalid value \\(array params\\)\\: Unexpected token \"params\", expected variable at offset 63$#" - count: 1 - path: ../app/code/core/Mage/Authorizenet/Helper/Data.php - - message: "#^Call to an undefined method Mage_Payment_Model_Info\\:\\:authorize\\(\\)\\.$#" count: 1 @@ -2135,26 +1880,6 @@ parameters: count: 1 path: ../app/code/core/Mage/Authorizenet/Model/Directpost.php - - - message: "#^PHPDoc tag @param for parameter \\$payment with type string is incompatible with native type Varien_Object\\.$#" - count: 1 - path: ../app/code/core/Mage/Authorizenet/Model/Directpost.php - - - - message: "#^PHPDoc tag @param has invalid value \\(Varien_Object\\)\\: Unexpected token \"\\\\n \", expected variable at offset 126$#" - count: 1 - path: ../app/code/core/Mage/Authorizenet/Model/Directpost.php - - - - message: "#^PHPDoc tag @param references unknown parameter\\: \\$entity$#" - count: 1 - path: ../app/code/core/Mage/Authorizenet/Model/Directpost.php - - - - message: "#^PHPDoc tag @param references unknown parameter\\: \\$invoicePayment$#" - count: 1 - path: ../app/code/core/Mage/Authorizenet/Model/Directpost.php - - message: "#^Call to an undefined method Mage_Payment_Model_Method_Abstract\\:\\:generateRequestFromOrder\\(\\)\\.$#" count: 1 @@ -2165,16 +1890,6 @@ parameters: count: 1 path: ../app/code/core/Mage/Authorizenet/controllers/Directpost/PaymentController.php - - - message: "#^PHPDoc tag @param has invalid value \\(string fileName\\)\\: Unexpected token \"fileName\", expected variable at offset 61$#" - count: 1 - path: ../app/code/core/Mage/Backup/Model/Backup.php - - - - message: "#^PHPDoc tag @param has invalid value \\(string filePath\\)\\: Unexpected token \"filePath\", expected variable at offset 91$#" - count: 1 - path: ../app/code/core/Mage/Backup/Model/Backup.php - - message: "#^Variable \\$filePath might not be defined\\.$#" count: 4 @@ -2495,21 +2210,11 @@ parameters: count: 1 path: ../app/code/core/Mage/Captcha/controllers/Adminhtml/RefreshController.php - - - message: "#^Method Mage_Captcha_Adminhtml_RefreshController\\:\\:refreshAction\\(\\) should return null but return statement is missing\\.$#" - count: 1 - path: ../app/code/core/Mage/Captcha/controllers/Adminhtml/RefreshController.php - - message: "#^Call to an undefined method Mage_Captcha_Model_Interface\\:\\:getImgSrc\\(\\)\\.$#" count: 1 path: ../app/code/core/Mage/Captcha/controllers/RefreshController.php - - - message: "#^Method Mage_Captcha_RefreshController\\:\\:indexAction\\(\\) should return null but return statement is missing\\.$#" - count: 1 - path: ../app/code/core/Mage/Captcha/controllers/RefreshController.php - - message: "#^Call to an undefined method Mage_Core_Block_Abstract\\:\\:addCrumb\\(\\)\\.$#" count: 2 @@ -2720,16 +2425,6 @@ parameters: count: 3 path: ../app/code/core/Mage/Catalog/Helper/Product.php - - - message: "#^Method Mage_Catalog_Model_Resource_Product_Compare_Item_Collection\\:\\:useProductItem\\(\\) invoked with 1 parameter, 0 required\\.$#" - count: 2 - path: ../app/code/core/Mage/Catalog/Helper/Product/Compare.php - - - - message: "#^PHPDoc tag @var above assignment does not specify variable name\\.$#" - count: 1 - path: ../app/code/core/Mage/Catalog/Helper/Product/Compare.php - - message: "#^Call to an undefined method Mage_Catalog_Model_Product_Type_Abstract\\:\\:getSelectedAttributesInfo\\(\\)\\.$#" count: 1 @@ -2945,11 +2640,6 @@ parameters: count: 1 path: ../app/code/core/Mage/Catalog/Model/Product/Action.php - - - message: "#^Variable \\$product in PHPDoc tag @var does not match assigned variable \\$productAttributes\\.$#" - count: 1 - path: ../app/code/core/Mage/Catalog/Model/Product/Api.php - - message: "#^Cannot access property \\$additional_attributes on array\\.$#" count: 5 @@ -3000,11 +2690,6 @@ parameters: count: 1 path: ../app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Recurring.php - - - message: "#^PHPDoc tag @var for constant Mage_Catalog_Model_Product_Attribute_Backend_Sku\\:\\:SKU_MAX_LENGTH with type string is incompatible with value 64\\.$#" - count: 1 - path: ../app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Sku.php - - message: "#^Cannot call method getBackend\\(\\) on bool\\|Mage_Catalog_Model_Resource_Eav_Mysql4_Attribute\\.$#" count: 11 @@ -3080,11 +2765,6 @@ parameters: count: 1 path: ../app/code/core/Mage/Catalog/Model/Product/Option/Type/File.php - - - message: "#^PHPDoc tag @param has invalid value \\(string Absolute directory path\\)\\: Unexpected token \"Absolute\", expected variable at offset 86$#" - count: 1 - path: ../app/code/core/Mage/Catalog/Model/Product/Option/Type/File.php - - message: "#^Variable \\$value in isset\\(\\) always exists and is not nullable\\.$#" count: 1 @@ -3715,16 +3395,6 @@ parameters: count: 1 path: ../app/code/core/Mage/Checkout/Block/Cart/Item/Renderer.php - - - message: "#^PHPDoc tag @method has invalid value \\(\\$this setDeleteUrl\\(string\\)\\)\\: Unexpected token \"\\)\", expected variable at offset 297$#" - count: 1 - path: ../app/code/core/Mage/Checkout/Block/Cart/Item/Renderer.php - - - - message: "#^PHPDoc tag @method has invalid value \\(\\$this setProductName\\(string\\)\\)\\: Unexpected token \"\\)\", expected variable at offset 228$#" - count: 1 - path: ../app/code/core/Mage/Checkout/Block/Cart/Item/Renderer.php - - message: "#^Call to an undefined method Mage_Catalog_Model_Product_Type_Abstract\\:\\:getSelectedAttributesInfo\\(\\)\\.$#" count: 1 @@ -3765,11 +3435,6 @@ parameters: count: 1 path: ../app/code/core/Mage/Checkout/Block/Links.php - - - message: "#^PHPDoc tag @param has invalid value \\(\\$item\\)\\: Unexpected token \"\\$item\", expected type at offset 18$#" - count: 2 - path: ../app/code/core/Mage/Checkout/Block/Multishipping/Addresses.php - - message: "#^Call to an undefined method Mage_Core_Helper_Abstract\\:\\:displayCartBothPrices\\(\\)\\.$#" count: 1 @@ -3871,42 +3536,22 @@ parameters: path: ../app/code/core/Mage/Checkout/Model/Type/Onepage.php - - message: "#^Method Mage_Checkout_CartController\\:\\:estimateUpdatePostAction\\(\\) should return null but return statement is missing\\.$#" + message: "#^Call to an undefined method Mage_Core_Block_Abstract\\:\\:addBodyClass\\(\\)\\.$#" count: 1 - path: ../app/code/core/Mage/Checkout/controllers/CartController.php + path: ../app/code/core/Mage/Cms/Block/Page.php - - message: "#^PHPDoc tag @param has invalid value \\(array\\)\\: Unexpected token \"\\\\n \\* \", expected variable at offset 96$#" + message: "#^Call to an undefined method Mage_Core_Helper_Abstract\\:\\:isEnabled\\(\\)\\.$#" count: 1 - path: ../app/code/core/Mage/Checkout/controllers/OnepageController.php + path: ../app/code/core/Mage/ConfigurableSwatches/Block/Catalog/Product/List/Price.php - - message: "#^Method Mage_Cms_Block_Block\\:\\:_construct\\(\\) should return null but return statement is missing\\.$#" + message: "#^Call to an undefined method Mage_Core_Helper_Abstract\\:\\:jsonEncode\\(\\)\\.$#" count: 1 - path: ../app/code/core/Mage/Cms/Block/Block.php + path: ../app/code/core/Mage/ConfigurableSwatches/Block/Catalog/Product/List/Price.php - - message: "#^Call to an undefined method Mage_Core_Block_Abstract\\:\\:addBodyClass\\(\\)\\.$#" - count: 1 - path: ../app/code/core/Mage/Cms/Block/Page.php - - - - message: "#^Method Mage_Cms_Block_Widget_Block\\:\\:_construct\\(\\) should return null but return statement is missing\\.$#" - count: 1 - path: ../app/code/core/Mage/Cms/Block/Widget/Block.php - - - - message: "#^Call to an undefined method Mage_Core_Helper_Abstract\\:\\:isEnabled\\(\\)\\.$#" - count: 1 - path: ../app/code/core/Mage/ConfigurableSwatches/Block/Catalog/Product/List/Price.php - - - - message: "#^Call to an undefined method Mage_Core_Helper_Abstract\\:\\:jsonEncode\\(\\)\\.$#" - count: 1 - path: ../app/code/core/Mage/ConfigurableSwatches/Block/Catalog/Product/List/Price.php - - - - message: "#^Call to an undefined method Mage_Catalog_Model_Product_Type_Abstract\\:\\:getConfigurableAttributesAsArray\\(\\)\\.$#" + message: "#^Call to an undefined method Mage_Catalog_Model_Product_Type_Abstract\\:\\:getConfigurableAttributesAsArray\\(\\)\\.$#" count: 1 path: ../app/code/core/Mage/ConfigurableSwatches/Helper/Data.php @@ -4075,11 +3720,6 @@ parameters: count: 1 path: ../app/code/core/Mage/Core/Model/Design/Package.php - - - message: "#^PHPDoc tag @var above a method has no effect\\.$#" - count: 1 - path: ../app/code/core/Mage/Core/Model/Domainpolicy.php - - message: "#^Cannot call method addOnlyForSendingFilter\\(\\) on Mage_Core_Model_Resource_Db_Collection_Abstract\\|false\\.$#" count: 1 @@ -4165,11 +3805,6 @@ parameters: count: 1 path: ../app/code/core/Mage/Core/Model/Resource/Email/Queue.php - - - message: "#^Method Mage_Core_Model_Resource_Email_Queue_Collection\\:\\:_construct\\(\\) should return null but return statement is missing\\.$#" - count: 1 - path: ../app/code/core/Mage/Core/Model/Resource/Email/Queue/Collection.php - - message: "#^PHPDoc tag @param for parameter \\$callbacks with type array\\|string is not subtype of native type array\\.$#" count: 1 @@ -4195,11 +3830,6 @@ parameters: count: 2 path: ../app/code/core/Mage/Core/Model/Session/Abstract/Zend.php - - - message: "#^PHPDoc tag @method has invalid value \\(\\$thissetRootCategoryPath\\(string \\$value\\)\\)\\: Unexpected token \"\\$thissetRootCategoryPath\", expected type at offset 569$#" - count: 1 - path: ../app/code/core/Mage/Core/Model/Store.php - - message: "#^Variable \\$store might not be defined\\.$#" count: 8 @@ -5040,11 +4670,6 @@ parameters: count: 2 path: ../app/code/core/Mage/GiftMessage/Block/Message/Inline.php - - - message: "#^Variable \\$quote in PHPDoc tag @var does not match assigned variable \\$quoteItem\\.$#" - count: 1 - path: ../app/code/core/Mage/GiftMessage/Model/Api.php - - message: "#^Method Mage_GiftMessage_Model_Entity_Attribute_Backend_Boolean_Config\\:\\:afterLoad\\(\\) should return \\$this\\(Mage_GiftMessage_Model_Entity_Attribute_Backend_Boolean_Config\\) but return statement is missing\\.$#" count: 1 @@ -5075,16 +4700,6 @@ parameters: count: 3 path: ../app/code/core/Mage/GoogleAnalytics/Block/Ga.php - - - message: "#^PHPDoc tag @var for constant Mage_GoogleAnalytics_Helper_Data\\:\\:TYPE_ANALYTICS with type classic is incompatible with value 'analytics'\\.$#" - count: 1 - path: ../app/code/core/Mage/GoogleAnalytics/Helper/Data.php - - - - message: "#^PHPDoc tag @var for constant Mage_GoogleAnalytics_Helper_Data\\:\\:TYPE_UNIVERSAL with type google is incompatible with value 'universal'\\.$#" - count: 1 - path: ../app/code/core/Mage/GoogleAnalytics/Helper/Data.php - - message: "#^Method Mage_Eav_Model_Entity_Attribute_Source_Interface\\:\\:getAllOptions\\(\\) invoked with 1 parameter, 0 required\\.$#" count: 4 @@ -5120,11 +4735,6 @@ parameters: count: 1 path: ../app/code/core/Mage/ImportExport/Model/Export/Entity/Product.php - - - message: "#^Variable \\$collection in PHPDoc tag @var does not match assigned variable \\$validAttrCodes\\.$#" - count: 1 - path: ../app/code/core/Mage/ImportExport/Model/Export/Entity/Product.php - - message: "#^Variable \\$collection might not be defined\\.$#" count: 1 @@ -5265,11 +4875,6 @@ parameters: count: 2 path: ../app/code/core/Mage/ImportExport/Model/Import/Entity/Product.php - - - message: "#^Variable \\$attributeSet in PHPDoc tag @var does not match any variable in the foreach loop\\: \\$attribute$#" - count: 1 - path: ../app/code/core/Mage/ImportExport/Model/Import/Entity/Product/Type/Abstract.php - - message: "#^Call to an undefined method Mage_Core_Model_Resource_Helper_Abstract\\:\\:getNextAutoincrement\\(\\)\\.$#" count: 1 @@ -5325,21 +4930,6 @@ parameters: count: 1 path: ../app/code/core/Mage/Index/Model/Lock/Storage/Db.php - - - message: "#^Cannot call method addProcessId\\(\\) on Varien_Object\\|true\\.$#" - count: 2 - path: ../app/code/core/Mage/Index/Model/Process.php - - - - message: "#^Cannot call method save\\(\\) on Varien_Object\\|true\\.$#" - count: 1 - path: ../app/code/core/Mage/Index/Model/Process.php - - - - message: "#^Variable \\$event in PHPDoc tag @var does not exist\\.$#" - count: 1 - path: ../app/code/core/Mage/Index/Model/Process.php - - message: "#^Call to an undefined method Mage_Core_Model_Resource_Helper_Abstract\\:\\:insertData\\(\\)\\.$#" count: 1 @@ -5555,36 +5145,6 @@ parameters: count: 2 path: ../app/code/core/Mage/Paygate/Model/Authorizenet.php - - - message: "#^Cannot call method setRequestedAmount\\(\\) on string\\.$#" - count: 1 - path: ../app/code/core/Mage/Paygate/Model/Authorizenet.php - - - - message: "#^PHPDoc tag @param has invalid value \\(Mage_Payment_Model_Info\\)\\: Unexpected token \"\\\\n \\* \", expected variable at offset 97$#" - count: 1 - path: ../app/code/core/Mage/Paygate/Model/Authorizenet.php - - - - message: "#^PHPDoc tag @param references unknown parameter\\: \\$amount$#" - count: 2 - path: ../app/code/core/Mage/Paygate/Model/Authorizenet.php - - - - message: "#^PHPDoc tag @param references unknown parameter\\: \\$invoicePayment$#" - count: 1 - path: ../app/code/core/Mage/Paygate/Model/Authorizenet.php - - - - message: "#^PHPDoc tag @param references unknown parameter\\: \\$message$#" - count: 1 - path: ../app/code/core/Mage/Paygate/Model/Authorizenet.php - - - - message: "#^PHPDoc tag @param references unknown parameter\\: \\$payment$#" - count: 1 - path: ../app/code/core/Mage/Paygate/Model/Authorizenet.php - - message: "#^Variable \\$defaultExceptionMessage might not be defined\\.$#" count: 2 @@ -5630,16 +5190,6 @@ parameters: count: 1 path: ../app/code/core/Mage/Payment/Helper/Data.php - - - message: "#^PHPDoc tag @param has invalid value \\(\\$a\\)\\: Unexpected token \"\\$a\", expected type at offset 18$#" - count: 1 - path: ../app/code/core/Mage/Payment/Helper/Data.php - - - - message: "#^PHPDoc tag @param has invalid value \\(\\$b\\)\\: Unexpected token \"\\$b\", expected type at offset 35$#" - count: 1 - path: ../app/code/core/Mage/Payment/Helper/Data.php - - message: "#^Comparison operation \"\\<\" between \\(array\\|float\\|int\\) and 0\\.0001 results in an error\\.$#" count: 1 @@ -5670,26 +5220,11 @@ parameters: count: 2 path: ../app/code/core/Mage/Paypal/Block/Adminhtml/Settlement/Details/Form.php - - - message: "#^Method Mage_Paypal_Block_Adminhtml_Settlement_Report_Grid\\:\\:_prepareCollection\\(\\) has invalid return type Mage_Paypal_Block_Adminhtml_Settlement_Grid\\.$#" - count: 1 - path: ../app/code/core/Mage/Paypal/Block/Adminhtml/Settlement/Report/Grid.php - - - - message: "#^Method Mage_Paypal_Block_Adminhtml_Settlement_Report_Grid\\:\\:_prepareColumns\\(\\) has invalid return type Mage_Paypal_Block_Adminhtml_Settlement_Grid\\.$#" - count: 1 - path: ../app/code/core/Mage/Paypal/Block/Adminhtml/Settlement/Report/Grid.php - - message: "#^Call to an undefined method Mage_Core_Helper_Abstract\\:\\:getScript\\(\\)\\.$#" count: 1 path: ../app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Field/Country.php - - - message: "#^PHPDoc tag @param references unknown parameter\\: \\$elementId$#" - count: 1 - path: ../app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Global.php - - message: "#^Call to an undefined method Mage_Core_Helper_Abstract\\:\\:getScript\\(\\)\\.$#" count: 1 @@ -5725,11 +5260,6 @@ parameters: count: 1 path: ../app/code/core/Mage/Paypal/Block/Express/Review.php - - - message: "#^PHPDoc tag @param has invalid value \\(Mage_Sales_Model_Quote_Address\\)\\: Unexpected token \"\\\\n \\* \", expected variable at offset 100$#" - count: 1 - path: ../app/code/core/Mage/Paypal/Block/Express/Review.php - - message: "#^Access to an undefined property Mage_Paypal_Model_Config\\:\\:\\$visible_on_cart\\.$#" count: 1 @@ -5830,51 +5360,6 @@ parameters: count: 1 path: ../app/code/core/Mage/Paypal/Model/Api/Nvp.php - - - message: "#^Method Mage_Paypal_Model_Api_Nvp\\:\\:_filterBillingAgreementStatus\\(\\) should return string but return statement is missing\\.$#" - count: 1 - path: ../app/code/core/Mage/Paypal/Model/Api/Nvp.php - - - - message: "#^Method Mage_Paypal_Model_Api_Nvp\\:\\:_filterPaymentReviewAction\\(\\) should return string\\|null but return statement is missing\\.$#" - count: 1 - path: ../app/code/core/Mage/Paypal/Model/Api/Nvp.php - - - - message: "#^Method Mage_Paypal_Model_Api_Nvp\\:\\:_filterPaymentStatusFromNvpToInfo\\(\\) should return string\\|null but return statement is missing\\.$#" - count: 1 - path: ../app/code/core/Mage/Paypal/Model/Api/Nvp.php - - - - message: "#^Method Mage_Paypal_Model_Api_Nvp\\:\\:_filterPeriodUnit\\(\\) should return string but return statement is missing\\.$#" - count: 1 - path: ../app/code/core/Mage/Paypal/Model/Api/Nvp.php - - - - message: "#^Method Mage_Paypal_Model_Api_Nvp\\:\\:_filterRecurringProfileActionToNvp\\(\\) should return string\\|null but return statement is missing\\.$#" - count: 1 - path: ../app/code/core/Mage/Paypal/Model/Api/Nvp.php - - - - message: "#^Method Mage_Paypal_Model_Api_Nvp\\:\\:_isCallSuccessful\\(\\) has invalid return type success\\.$#" - count: 1 - path: ../app/code/core/Mage/Paypal/Model/Api/Nvp.php - - - - message: "#^PHPDoc tag @param has invalid value \\(&array \\$requestFields\\)\\: Unexpected token \"&\", expected type at offset 119$#" - count: 1 - path: ../app/code/core/Mage/Paypal/Model/Api/Nvp.php - - - - message: "#^PHPDoc tag @param has invalid value \\(array\\)\\: Unexpected token \"\\\\n \\* \", expected variable at offset 78$#" - count: 1 - path: ../app/code/core/Mage/Paypal/Model/Api/Nvp.php - - - - message: "#^PHPDoc tag @param references unknown parameter\\: \\$payment$#" - count: 1 - path: ../app/code/core/Mage/Paypal/Model/Api/Nvp.php - - message: "#^Call to an undefined method Varien_Object\\:\\:isNominal\\(\\)\\.$#" count: 1 @@ -5960,11 +5445,6 @@ parameters: count: 1 path: ../app/code/core/Mage/Paypal/Model/Config.php - - - message: "#^PHPDoc tag @param references unknown parameter\\: \\$method$#" - count: 1 - path: ../app/code/core/Mage/Paypal/Model/Config.php - - message: "#^Access to an undefined property Mage_Paypal_Model_Config\\:\\:\\$cctypes\\.$#" count: 1 @@ -5980,21 +5460,6 @@ parameters: count: 1 path: ../app/code/core/Mage/Paypal/Model/Direct.php - - - message: "#^PHPDoc tag @param has invalid value \\(Mage_Paypal_Model_Api_Nvp\\)\\: Unexpected token \"\\\\n \\* \", expected variable at offset 98$#" - count: 1 - path: ../app/code/core/Mage/Paypal/Model/Direct.php - - - - message: "#^PHPDoc tag @param has invalid value \\(Mage_Sales_Model_Order_Payment\\)\\: Unexpected token \"\\\\n \", expected variable at offset 143$#" - count: 1 - path: ../app/code/core/Mage/Paypal/Model/Direct.php - - - - message: "#^PHPDoc tag @param has invalid value \\(Mage_Sales_Model_Quote\\)\\: Unexpected token \"\\\\n \\* \", expected variable at offset 88$#" - count: 1 - path: ../app/code/core/Mage/Paypal/Model/Direct.php - - message: "#^Access to an undefined property Mage_Paypal_Model_Config\\:\\:\\$lineItemsEnabled\\.$#" count: 1 @@ -6010,21 +5475,6 @@ parameters: count: 2 path: ../app/code/core/Mage/Paypal/Model/Express.php - - - message: "#^PHPDoc tag @param has invalid value \\(Mage_Paypal_Model_Api_Nvp\\)\\: Unexpected token \"\\\\n \\* \", expected variable at offset 88$#" - count: 1 - path: ../app/code/core/Mage/Paypal/Model/Express.php - - - - message: "#^PHPDoc tag @param has invalid value \\(Mage_Sales_Model_Order_Payment\\)\\: Unexpected token \"\\\\n \", expected variable at offset 133$#" - count: 1 - path: ../app/code/core/Mage/Paypal/Model/Express.php - - - - message: "#^PHPDoc tag @param has invalid value \\(Mage_Sales_Model_Quote\\)\\: Unexpected token \"\\\\n \\* \", expected variable at offset 88$#" - count: 1 - path: ../app/code/core/Mage/Paypal/Model/Express.php - - message: "#^Access to an undefined property Mage_Paypal_Model_Config\\:\\:\\$allow_ba_signup\\.$#" count: 1 @@ -6105,16 +5555,6 @@ parameters: count: 1 path: ../app/code/core/Mage/Paypal/Model/Ipn.php - - - message: "#^PHPDoc tag @param references unknown parameter\\: \\$debugData$#" - count: 1 - path: ../app/code/core/Mage/Paypal/Model/Ipn.php - - - - message: "#^PHPDoc tag @param references unknown parameter\\: \\$payment$#" - count: 1 - path: ../app/code/core/Mage/Paypal/Model/Ipn.php - - message: "#^Access to an undefined property Mage_Paypal_Model_Config\\:\\:\\$lineItemsEnabled\\.$#" count: 1 @@ -6220,11 +5660,6 @@ parameters: count: 1 path: ../app/code/core/Mage/Paypal/Model/Payflowlink.php - - - message: "#^PHPDoc tag @param has invalid value \\(Mage_Sales_Model_Quote\\)\\: Unexpected token \"\\\\n \\* \", expected variable at offset 95$#" - count: 1 - path: ../app/code/core/Mage/Paypal/Model/Payflowlink.php - - message: "#^Variable \\$order in empty\\(\\) always exists and is not falsy\\.$#" count: 1 @@ -6255,16 +5690,6 @@ parameters: count: 1 path: ../app/code/core/Mage/Paypal/Model/Payflowpro.php - - - message: "#^PHPDoc tag @param has invalid value \\(Mage_Sales_Model_Quote\\)\\: Unexpected token \"\\\\n \\* \", expected variable at offset 95$#" - count: 1 - path: ../app/code/core/Mage/Paypal/Model/Payflowpro.php - - - - message: "#^PHPDoc tag @param references unknown parameter\\: \\$statusCode$#" - count: 1 - path: ../app/code/core/Mage/Paypal/Model/Payflowpro.php - - message: "#^Variable \\$order in empty\\(\\) always exists and is not falsy\\.$#" count: 1 @@ -6275,66 +5700,16 @@ parameters: count: 1 path: ../app/code/core/Mage/Paypal/Model/Payment/Transaction.php - - - message: "#^PHPDoc tag @param references unknown parameter\\: \\$failsafe$#" - count: 1 - path: ../app/code/core/Mage/Paypal/Model/Payment/Transaction.php - - message: "#^Method Mage_Paypal_Model_Pro\\:\\:capture\\(\\) should return false\\|null but return statement is missing\\.$#" count: 1 path: ../app/code/core/Mage/Paypal/Model/Pro.php - - - message: "#^PHPDoc tag @param has invalid value \\(Mage_Paypal_Model_Api_Nvp\\)\\: Unexpected token \"\\\\n \\* \", expected variable at offset 90$#" - count: 1 - path: ../app/code/core/Mage/Paypal/Model/Pro.php - - - - message: "#^PHPDoc tag @param has invalid value \\(Mage_Paypal_Model_Api_Nvp\\)\\: Unexpected token \"\\\\n \\* \", expected variable at offset 91$#" - count: 1 - path: ../app/code/core/Mage/Paypal/Model/Pro.php - - - - message: "#^PHPDoc tag @param has invalid value \\(Mage_Sales_Model_Order_Payment\\)\\: Unexpected token \"\\\\n \", expected variable at offset 136$#" - count: 1 - path: ../app/code/core/Mage/Paypal/Model/Pro.php - - - - message: "#^PHPDoc tag @param has invalid value \\(Mage_Sales_Model_Order_Payment\\)\\: Unexpected token \"\\\\n \\* \", expected variable at offset 135$#" - count: 1 - path: ../app/code/core/Mage/Paypal/Model/Pro.php - - - - message: "#^PHPDoc tag @param has invalid value \\(string code\\)\\: Unexpected token \"code\", expected variable at offset 157$#" - count: 1 - path: ../app/code/core/Mage/Paypal/Model/Report/Settlement/Row.php - - - - message: "#^PHPDoc tag @param has invalid value \\(string code\\)\\: Unexpected token \"code\", expected variable at offset 163$#" - count: 1 - path: ../app/code/core/Mage/Paypal/Model/Report/Settlement/Row.php - - - - message: "#^PHPDoc tag @param has invalid value \\(string code\\)\\: Unexpected token \"code\", expected variable at offset 83$#" - count: 1 - path: ../app/code/core/Mage/Paypal/Model/Report/Settlement/Row.php - - - - message: "#^PHPDoc tag @return has invalid value \\(&array\\)\\: Unexpected token \"&\", expected type at offset 79$#" - count: 1 - path: ../app/code/core/Mage/Paypal/Model/Report/Settlement/Row.php - - message: "#^Call to an undefined method Mage_Core_Model_Abstract\\:\\:isFailsafe\\(\\)\\.$#" count: 1 path: ../app/code/core/Mage/Paypal/Model/Resource/Payment/Transaction.php - - - message: "#^PHPDoc tag @param has invalid value \\(mixed \\(array\\|string\\|object\\) \\$columns\\)\\: Unexpected token \"\\(\", expected variable at offset 110$#" - count: 1 - path: ../app/code/core/Mage/Paypal/Model/Resource/Payment/Transaction.php - - message: "#^Call to method Varien_Db_Adapter_Pdo_Mysql\\:\\:rollback\\(\\) with incorrect case\\: rollBack$#" count: 1 @@ -6355,16 +5730,6 @@ parameters: count: 1 path: ../app/code/core/Mage/Paypal/Model/Standard.php - - - message: "#^PHPDoc tag @param has invalid value \\(Mage_Sales_Model_Quote\\)\\: Unexpected token \"\\\\n \\* \", expected variable at offset 88$#" - count: 1 - path: ../app/code/core/Mage/Paypal/Model/Standard.php - - - - message: "#^PHPDoc tag @param has invalid value \\(Varien_Object\\)\\: Unexpected token \"\\\\n \", expected variable at offset 119$#" - count: 1 - path: ../app/code/core/Mage/Paypal/Model/Standard.php - - message: "#^Method Mage_Paypal_Model_System_Config_Backend_MerchantCountry\\:\\:_afterLoad\\(\\) should return \\$this\\(Mage_Paypal_Model_System_Config_Backend_MerchantCountry\\) but return statement is missing\\.$#" count: 1 @@ -6590,21 +5955,6 @@ parameters: count: 1 path: ../app/code/core/Mage/Rss/Block/Catalog/New.php - - - message: "#^Method Mage_Rss_Block_Catalog_NotifyStock\\:\\:_construct\\(\\) should return null but return statement is missing\\.$#" - count: 1 - path: ../app/code/core/Mage/Rss/Block/Catalog/NotifyStock.php - - - - message: "#^Method Mage_Rss_Block_Catalog_Review\\:\\:_construct\\(\\) should return null but return statement is missing\\.$#" - count: 1 - path: ../app/code/core/Mage/Rss/Block/Catalog/Review.php - - - - message: "#^Method Mage_Rss_Block_Catalog_Review\\:\\:addReviewItemXmlCallback\\(\\) should return null but return statement is missing\\.$#" - count: 1 - path: ../app/code/core/Mage/Rss/Block/Catalog/Review.php - - message: "#^Call to an undefined method Mage_Core_Helper_Abstract\\:\\:init\\(\\)\\.$#" count: 1 @@ -6755,11 +6105,6 @@ parameters: count: 1 path: ../app/code/core/Mage/Sales/Block/Order/Comments.php - - - message: "#^PHPDoc tag @param has invalid value \\(Mage_Sales_Model_Abstract\\)\\: Unexpected token \"\\\\n \\* \", expected variable at offset 93$#" - count: 1 - path: ../app/code/core/Mage/Sales/Block/Order/Comments.php - - message: "#^Call to an undefined method Mage_Core_Helper_Abstract\\:\\:getInfoBlock\\(\\)\\.$#" count: 1 @@ -6810,11 +6155,6 @@ parameters: count: 1 path: ../app/code/core/Mage/Sales/Block/Order/View.php - - - message: "#^Method Mage_Sales_Controller_Abstract\\:\\:_viewAction\\(\\) should return null but return statement is missing\\.$#" - count: 1 - path: ../app/code/core/Mage/Sales/Controller/Abstract.php - - message: "#^Cannot call method addCrumb\\(\\) on Mage_Core_Block_Abstract\\|false\\.$#" count: 2 @@ -6850,11 +6190,6 @@ parameters: count: 1 path: ../app/code/core/Mage/Sales/Model/Observer.php - - - message: "#^Method Mage_Sales_Model_Observer\\:\\:addVatRequestParamsOrderComment\\(\\) should return null but return statement is missing\\.$#" - count: 1 - path: ../app/code/core/Mage/Sales/Model/Observer.php - - message: "#^Variable \\$oldArea might not be defined\\.$#" count: 1 @@ -6950,11 +6285,6 @@ parameters: count: 1 path: ../app/code/core/Mage/Sales/Model/Quote.php - - - message: "#^PHPDoc tag @param for parameter \\$product with type mixed is not subtype of native type Mage_Catalog_Model_Product\\.$#" - count: 2 - path: ../app/code/core/Mage/Sales/Model/Quote.php - - message: "#^Variable \\$item might not be defined\\.$#" count: 1 @@ -7030,11 +6360,6 @@ parameters: count: 1 path: ../app/code/core/Mage/Sales/Model/Resource/Order/Payment/Transaction.php - - - message: "#^PHPDoc tag @param has invalid value \\(mixed \\(array\\|string\\|object\\) \\$columns\\)\\: Unexpected token \"\\(\", expected variable at offset 166$#" - count: 1 - path: ../app/code/core/Mage/Sales/Model/Resource/Order/Payment/Transaction.php - - message: "#^Call to an undefined method Mage_Core_Model_Resource_Helper_Abstract\\:\\:getBestsellersReportUpdateRatingPos\\(\\)\\.$#" count: 1 @@ -7050,11 +6375,6 @@ parameters: count: 2 path: ../app/code/core/Mage/Sales/Model/Resource/Report/Bestsellers.php - - - message: "#^PHPDoc tag @param has invalid value \\(object Varien_Db_Select\\|null \\$subSelect\\)\\: Unexpected token \"Varien_Db_Select\", expected variable at offset 79$#" - count: 1 - path: ../app/code/core/Mage/Sales/Model/Resource/Report/Bestsellers.php - - message: "#^Call to an undefined method Mage_Core_Model_Resource_Helper_Abstract\\:\\:getQueryUsingAnalyticFunction\\(\\)\\.$#" count: 1 @@ -7185,16 +6505,6 @@ parameters: count: 1 path: ../app/code/core/Mage/SalesRule/Model/Resource/Rule.php - - - message: "#^PHPDoc tag @use has invalid value \\(\\$this\\-\\>addWebsiteFilter\\(\\)\\)\\: Unexpected token \"\\$this\", expected type at offset 264$#" - count: 1 - path: ../app/code/core/Mage/SalesRule/Model/Resource/Rule/Collection.php - - - - message: "#^PHPDoc tag @use has invalid value \\(\\$this\\-\\>addWebsiteGroupDateFilter\\(\\)\\)\\: Unexpected token \"\\$this\", expected type at offset 330$#" - count: 1 - path: ../app/code/core/Mage/SalesRule/Model/Resource/Rule/Collection.php - - message: "#^Call to an undefined method Mage_Core_Helper_Abstract\\:\\:getApplied\\(\\)\\.$#" count: 1 @@ -7245,11 +6555,6 @@ parameters: count: 1 path: ../app/code/core/Mage/Shipping/Model/Carrier/Abstract.php - - - message: "#^Method Mage_Shipping_Model_Carrier_Abstract\\:\\:_updateFreeMethodQuote\\(\\) should return null but return statement is missing\\.$#" - count: 1 - path: ../app/code/core/Mage/Shipping/Model/Carrier/Abstract.php - - message: "#^Variable \\$rate in empty\\(\\) is never defined\\.$#" count: 1 @@ -7295,11 +6600,6 @@ parameters: count: 1 path: ../app/code/core/Mage/Shipping/Model/Shipping.php - - - message: "#^Method Mage_Shipping_Model_Shipping\\:\\:setOrigData\\(\\) should return null but return statement is missing\\.$#" - count: 1 - path: ../app/code/core/Mage/Shipping/Model/Shipping.php - - message: "#^Variable \\$sumResults in empty\\(\\) always exists and is not falsy\\.$#" count: 1 @@ -7515,11 +6815,6 @@ parameters: count: 1 path: ../app/code/core/Mage/Tax/Model/Sales/Total/Quote/Tax.php - - - message: "#^PHPDoc tag @var above assignment does not specify variable name\\.$#" - count: 1 - path: ../app/code/core/Mage/Tax/Model/System/Config/Source/Tax/Region.php - - message: "#^Call to an undefined method Mage_Core_Helper_Abstract\\:\\:jsonEncode\\(\\)\\.$#" count: 1 @@ -7654,4 +6949,3 @@ parameters: message: "#^Variable \\$emails in empty\\(\\) always exists and is not falsy\\.$#" count: 1 path: ../app/code/core/Mage/Wishlist/controllers/IndexController.php - diff --git a/app/code/core/Mage/Admin/Model/Observer.php b/app/code/core/Mage/Admin/Model/Observer.php index b88c5232ef7..1f2c621d6fa 100644 --- a/app/code/core/Mage/Admin/Model/Observer.php +++ b/app/code/core/Mage/Admin/Model/Observer.php @@ -39,7 +39,6 @@ class Mage_Admin_Model_Observer * Handler for controller_action_predispatch event * * @param Varien_Event_Observer $observer - * @return void */ public function actionPreDispatchAdmin($observer) { diff --git a/app/code/core/Mage/Admin/Model/Redirectpolicy.php b/app/code/core/Mage/Admin/Model/Redirectpolicy.php index b00b3549e68..ef46cc56402 100644 --- a/app/code/core/Mage/Admin/Model/Redirectpolicy.php +++ b/app/code/core/Mage/Admin/Model/Redirectpolicy.php @@ -43,7 +43,6 @@ class Mage_Admin_Model_Redirectpolicy */ public function __construct($parameters = array()) { - /** @var Mage_Adminhtml_Model_Url _urlModel */ $this->_urlModel = (!empty($parameters['urlModel'])) ? $parameters['urlModel'] : Mage::getModel('adminhtml/url'); } diff --git a/app/code/core/Mage/Admin/Model/Session.php b/app/code/core/Mage/Admin/Model/Session.php index 9445a55eb66..8133a6de745 100644 --- a/app/code/core/Mage/Admin/Model/Session.php +++ b/app/code/core/Mage/Admin/Model/Session.php @@ -315,7 +315,6 @@ protected function _getRequestUri($request = null) * @param string $username * @param string $message * @param Mage_Core_Controller_Request_Http|null $request - * @return void */ protected function _loginFailed($e, $request, $username, $message) { diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Abstract.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Abstract.php index bb77d917ccc..b595687a0c0 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Abstract.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Abstract.php @@ -134,6 +134,7 @@ public function getRoot($parentNodeCategory=null, $recursionLevel=3) * If ids are empty, default tree with depth = 2 will be returned. * * @param array $ids + * @return mixed|Varien_Data_Tree_Node|null */ public function getRootByIds($ids) { diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tab/Front.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tab/Front.php index 3ac6975a6c9..f5fbc88700c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tab/Front.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tab/Front.php @@ -34,7 +34,9 @@ class Mage_Adminhtml_Block_Catalog_Product_Attribute_Edit_Tab_Front extends Mage_Adminhtml_Block_Widget_Form { - + /** + * @inheritDoc + */ protected function _prepareForm() { $model = Mage::registry('entity_attribute'); @@ -102,5 +104,4 @@ protected function _prepareForm() return parent::_prepareForm(); } - } diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Grid.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Grid.php index 49f270ece7a..aa626cf87da 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Grid.php @@ -33,7 +33,6 @@ */ class Mage_Adminhtml_Block_Catalog_Product_Attribute_Set_Grid extends Mage_Adminhtml_Block_Widget_Grid { - public function __construct() { parent::__construct(); @@ -43,6 +42,9 @@ public function __construct() $this->setSaveParametersInSession(true); } + /** + * @inheritDoc + */ protected function _prepareCollection() { $collection = Mage::getResourceModel('eav/entity_attribute_set_collection') @@ -52,6 +54,10 @@ protected function _prepareCollection() return parent::_prepareCollection(); } + /** + * @return void + * @throws Exception + */ protected function _prepareColumns() { /*$this->addColumn('set_id', array( @@ -70,6 +76,10 @@ protected function _prepareColumns() )); } + /** + * @param Varien_Object $row + * @return string + */ public function getRowUrl($row) { return $this->getUrl('*/*/edit', array('id'=>$row->getAttributeSetId())); diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Fieldset/Options.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Fieldset/Options.php index 9f327bb44cb..34da924a8f1 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Fieldset/Options.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Fieldset/Options.php @@ -35,8 +35,6 @@ class Mage_Adminhtml_Block_Catalog_Product_Composite_Fieldset_Options extends Ma { /** * Constructor for our block with options - * - * @return void */ public function __construct() { diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Fieldset/Qty.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Fieldset/Qty.php index 1c3de723ccc..0462ad60d82 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Fieldset/Qty.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Fieldset/Qty.php @@ -35,8 +35,6 @@ class Mage_Adminhtml_Block_Catalog_Product_Composite_Fieldset_Qty extends Mage_C { /** * Constructor for our block with options - * - * @return void */ public function _construct() { diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Attributes.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Attributes.php index add49baf308..2cb6464e85b 100644 --- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Attributes.php +++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Attributes.php @@ -50,7 +50,7 @@ protected function _prepareLayout() /** * Prepare attributes form * - * @return null + * @return void */ protected function _prepareForm() { diff --git a/app/code/core/Mage/Adminhtml/Block/Checkout/Agreement/Grid.php b/app/code/core/Mage/Adminhtml/Block/Checkout/Agreement/Grid.php index c6aa18c0a5c..99b1a45a3a4 100644 --- a/app/code/core/Mage/Adminhtml/Block/Checkout/Agreement/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Checkout/Agreement/Grid.php @@ -110,12 +110,12 @@ protected function _prepareColumns() } /** - * @return void + * @inheritDoc */ protected function _afterLoadCollection() { $this->getCollection()->walk('afterLoad'); - parent::_afterLoadCollection(); + return parent::_afterLoadCollection(); } /** diff --git a/app/code/core/Mage/Adminhtml/Block/Cms/Block/Grid.php b/app/code/core/Mage/Adminhtml/Block/Cms/Block/Grid.php index 05fd2da7337..4517faa7f92 100644 --- a/app/code/core/Mage/Adminhtml/Block/Cms/Block/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Cms/Block/Grid.php @@ -33,7 +33,6 @@ */ class Mage_Adminhtml_Block_Cms_Block_Grid extends Mage_Adminhtml_Block_Widget_Grid { - public function __construct() { parent::__construct(); @@ -42,18 +41,23 @@ public function __construct() $this->setDefaultDir('ASC'); } + /** + * @inheritDoc + * @throws Exception + */ protected function _prepareCollection() { $collection = Mage::getModel('cms/block')->getCollection(); - /* @var $collection Mage_Cms_Model_Mysql4_Block_Collection */ $this->setCollection($collection); return parent::_prepareCollection(); } + /** + * @inheritDoc + * @throws Exception + */ protected function _prepareColumns() { - $baseUrl = $this->getUrl(); - $this->addColumn('title', array( 'header' => Mage::helper('cms')->__('Title'), 'align' => 'left', @@ -104,10 +108,13 @@ protected function _prepareColumns() return parent::_prepareColumns(); } + /** + * @inheritDoc + */ protected function _afterLoadCollection() { $this->getCollection()->walk('afterLoad'); - parent::_afterLoadCollection(); + return parent::_afterLoadCollection(); } protected function _filterStoreCondition($collection, $column) diff --git a/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit.php b/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit.php index 423fc5b4350..e3adcc3a4c8 100644 --- a/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit.php @@ -35,8 +35,6 @@ class Mage_Adminhtml_Block_Cms_Page_Edit extends Mage_Adminhtml_Block_Widget_For { /** * Initialize cms page edit block - * - * @return void */ public function __construct() { diff --git a/app/code/core/Mage/Adminhtml/Block/Cms/Page/Grid.php b/app/code/core/Mage/Adminhtml/Block/Cms/Page/Grid.php index f9b23070279..105c9fc5a2b 100644 --- a/app/code/core/Mage/Adminhtml/Block/Cms/Page/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Cms/Page/Grid.php @@ -33,7 +33,6 @@ */ class Mage_Adminhtml_Block_Cms_Page_Grid extends Mage_Adminhtml_Block_Widget_Grid { - public function __construct() { parent::__construct(); @@ -42,20 +41,25 @@ public function __construct() $this->setDefaultDir('ASC'); } + /** + * @inheritDoc + * @throws Exception + */ protected function _prepareCollection() { $collection = Mage::getModel('cms/page')->getCollection(); - /* @var $collection Mage_Cms_Model_Mysql4_Page_Collection */ $collection->setFirstStoreFlag(true); $this->setCollection($collection); return parent::_prepareCollection(); } + /** + * @inheritDoc + * @throws Exception + */ protected function _prepareColumns() { - $baseUrl = $this->getUrl(); - $this->addColumn('title', array( 'header' => Mage::helper('cms')->__('Title'), 'align' => 'left', @@ -68,8 +72,6 @@ protected function _prepareColumns() 'index' => 'identifier' )); - - $this->addColumn('root_template', array( 'header' => Mage::helper('cms')->__('Layout'), 'index' => 'root_template', @@ -123,10 +125,13 @@ protected function _prepareColumns() return parent::_prepareColumns(); } + /** + * @inheritDoc + */ protected function _afterLoadCollection() { $this->getCollection()->walk('afterLoad'); - parent::_afterLoadCollection(); + return parent::_afterLoadCollection(); } protected function _filterStoreCondition($collection, $column) diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Cart.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Cart.php index cd954ee0535..615c349e215 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Cart.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Cart.php @@ -43,16 +43,17 @@ public function __construct($attributes=array()) } /** - * Prepare grid - * - * @return void + * @inheritDoc */ protected function _prepareGrid() { $this->setId('customer_cart_grid' . $this->getWebsiteId()); - parent::_prepareGrid(); + return parent::_prepareGrid(); } + /** + * @inheritDoc + */ protected function _prepareCollection() { $customer = Mage::registry('current_customer'); @@ -76,6 +77,9 @@ protected function _prepareCollection() return parent::_prepareCollection(); } + /** + * @inheritDoc + */ protected function _prepareColumns() { $this->addColumn('product_id', array( diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Grid/Renderer/Item.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Grid/Renderer/Item.php index 5eeb30974df..b3fab491450 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Grid/Renderer/Item.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Grid/Renderer/Item.php @@ -84,11 +84,10 @@ protected function _getProductHelper($product) return $helper; } - /* + /** * Returns product associated with this block * - * @param Mage_Catalog_Model_Product $product - * @return string + * @return Mage_Catalog_Model_Product */ public function getProduct() { @@ -111,7 +110,7 @@ protected function getOptionList() /** * Returns formatted option value for an item * - * @param Mage_Wishlist_Item_Option + * @param Mage_Wishlist_Model_Item_Option $option * @return array */ protected function getFormattedOptionValue($option) @@ -122,10 +121,10 @@ protected function getFormattedOptionValue($option) return Mage::helper('catalog/product_configuration')->getFormattedOptionValue($option, $params); } - /* + /** * Renders item product name and its configuration * - * @param Mage_Catalog_Model_Product_Configuration_Item_Interface $item + * @param Varien_Object $item * @return string */ public function render(Varien_Object $item) diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Wishlist.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Wishlist.php index 07391edc019..76e856d158b 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Wishlist.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Wishlist.php @@ -35,8 +35,6 @@ class Mage_Adminhtml_Block_Customer_Edit_Tab_View_Wishlist extends Mage_Adminhtm { /** * Initial settings - * - * @return void */ public function __construct() { diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Group/Grid.php b/app/code/core/Mage/Adminhtml/Block/Customer/Group/Grid.php index 7789b9efa1b..7f390533d1b 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Group/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Group/Grid.php @@ -45,7 +45,7 @@ public function __construct() /** * Init customer groups collection - * @return void + * @inheritDoc */ protected function _prepareCollection() { diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Online/Grid.php b/app/code/core/Mage/Adminhtml/Block/Customer/Online/Grid.php index 0878dba5f1b..ec4945d6576 100644 --- a/app/code/core/Mage/Adminhtml/Block/Customer/Online/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Customer/Online/Grid.php @@ -160,7 +160,7 @@ protected function _prepareColumns() /** * Retrieve Row URL * - * @param Mage_Core_Model_Abstract + * @param Mage_Core_Model_Abstract $row * @return string */ public function getRowUrl($row) diff --git a/app/code/core/Mage/Adminhtml/Block/Dashboard/Graph.php b/app/code/core/Mage/Adminhtml/Block/Dashboard/Graph.php index 8672db23994..f502492d32f 100644 --- a/app/code/core/Mage/Adminhtml/Block/Dashboard/Graph.php +++ b/app/code/core/Mage/Adminhtml/Block/Dashboard/Graph.php @@ -113,8 +113,6 @@ class Mage_Adminhtml_Block_Dashboard_Graph extends Mage_Adminhtml_Block_Dashboar /** * Initialize object - * - * @return void */ public function __construct() { @@ -136,7 +134,6 @@ protected function _getTabTemplate() * Set data rows * * @param mixed $rows - * @return void */ public function setDataRows($rows) { @@ -148,7 +145,6 @@ public function setDataRows($rows) * * @param string $seriesId * @param array $options - * @return void */ public function addSeries($seriesId, array $options) { @@ -450,7 +446,6 @@ protected function getRowsData($attributes, $single = false) * * @param string $axis * @param array $labels - * @return void */ public function setAxisLabels($axis, $labels) { @@ -461,7 +456,6 @@ public function setAxisLabels($axis, $labels) * Set html id * * @param string $htmlId - * @return void */ public function setHtmlId($htmlId) { diff --git a/app/code/core/Mage/Adminhtml/Block/Dashboard/Orders/Grid.php b/app/code/core/Mage/Adminhtml/Block/Dashboard/Orders/Grid.php index 26141bdcfad..87d6249b298 100644 --- a/app/code/core/Mage/Adminhtml/Block/Dashboard/Orders/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Dashboard/Orders/Grid.php @@ -74,8 +74,6 @@ protected function _prepareCollection() /** * Prepares page sizes for dashboard grid with las 5 orders - * - * @return void */ protected function _preparePage() { @@ -83,6 +81,9 @@ protected function _preparePage() // Remove count of total orders $this->getCollection()->setCurPage($this->getParam($this->getVarNamePage(), $this->_defaultPage)); } + /** + * @inheritDoc + */ protected function _prepareColumns() { $this->addColumn('customer', array( @@ -117,6 +118,10 @@ protected function _prepareColumns() return parent::_prepareColumns(); } + /** + * @param Varien_Object $row + * @return string + */ public function getRowUrl($row) { return $this->getUrl('*/sales_order/view', array('order_id'=>$row->getId())); diff --git a/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Amounts.php b/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Amounts.php index 2ef41b159e0..f360507a706 100644 --- a/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Amounts.php +++ b/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Amounts.php @@ -36,8 +36,6 @@ class Mage_Adminhtml_Block_Dashboard_Tab_Amounts extends Mage_Adminhtml_Block_Da { /** * Initialize object - * - * @return void */ public function __construct() { diff --git a/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Orders.php b/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Orders.php index e8693996786..ed620cd09a8 100644 --- a/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Orders.php +++ b/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Orders.php @@ -36,8 +36,6 @@ class Mage_Adminhtml_Block_Dashboard_Tab_Orders extends Mage_Adminhtml_Block_Das { /** * Initialize object - * - * @return void */ public function __construct() { diff --git a/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Products/Ordered.php b/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Products/Ordered.php index a75121bb015..a123af2bcb0 100644 --- a/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Products/Ordered.php +++ b/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Products/Ordered.php @@ -99,12 +99,11 @@ protected function _prepareColumns() return parent::_prepareColumns(); } - /* + /** * Returns row url to show in admin dashboard * $row is bestseller row wrapped in Product model * * @param Mage_Catalog_Model_Product $row - * * @return string */ public function getRowUrl($row) diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Grid/Renderer/Action.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Grid/Renderer/Action.php index 07533c6df1f..acdceceb8b5 100644 --- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Grid/Renderer/Action.php +++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Grid/Renderer/Action.php @@ -37,7 +37,7 @@ class Mage_Adminhtml_Block_Newsletter_Template_Grid_Renderer_Action extends Mage /** * Renderer for "Action" column in Newsletter templates grid * - * @var Mage_Newsletter_Model_Template $row + * @param Mage_Newsletter_Model_Template|Varien_Object $row * @return string */ public function render(Varien_Object $row) diff --git a/app/code/core/Mage/Adminhtml/Block/Notification/Window.php b/app/code/core/Mage/Adminhtml/Block/Notification/Window.php index 7bfa2cd2115..9ab03730a6c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Notification/Window.php +++ b/app/code/core/Mage/Adminhtml/Block/Notification/Window.php @@ -47,7 +47,6 @@ class Mage_Adminhtml_Block_Notification_Window extends Mage_Adminhtml_Block_Noti /** * Initialize block window - * */ protected function _construct() { @@ -168,7 +167,6 @@ public function getSeverityText() /** * Check if current block allowed in ACL * - * @param string $resourcePath * @return bool */ protected function _isAllowed() diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/Variable/Grid.php b/app/code/core/Mage/Adminhtml/Block/Permissions/Variable/Grid.php index 4d00f241b54..1ceeb210471 100644 --- a/app/code/core/Mage/Adminhtml/Block/Permissions/Variable/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Permissions/Variable/Grid.php @@ -57,7 +57,7 @@ protected function _prepareCollection() } /** - * @throws Exception + * @inheritDoc */ protected function _prepareColumns() { @@ -82,7 +82,7 @@ protected function _prepareColumns() ) ); - parent::_prepareColumns(); + return parent::_prepareColumns(); } /** diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Customer/Accounts/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Customer/Accounts/Grid.php index 85304b904ed..1400a0e4c57 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Customer/Accounts/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Customer/Accounts/Grid.php @@ -46,6 +46,9 @@ protected function _prepareCollection() $this->getCollection()->initReport('reports/accounts_collection'); } + /** + * @inheritDoc + */ protected function _prepareColumns() { $this->addColumn('accounts', array( diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Filter/Form.php b/app/code/core/Mage/Adminhtml/Block/Report/Filter/Form.php index 7eeb6af64f6..2a1954d45cd 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Filter/Form.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Filter/Form.php @@ -51,8 +51,8 @@ class Mage_Adminhtml_Block_Report_Filter_Form extends Mage_Adminhtml_Block_Widge /** * Set field visibility * - * @param string Field id - * @param bool Field visibility + * @param string $fieldId Field id + * @param bool $visibility Field visibility */ public function setFieldVisibility($fieldId, $visibility) { @@ -62,8 +62,8 @@ public function setFieldVisibility($fieldId, $visibility) /** * Get field visibility * - * @param string Field id - * @param bool Default field visibility + * @param string $fieldId Field id + * @param bool $defaultVisibility Default field visibility * @return bool */ public function getFieldVisibility($fieldId, $defaultVisibility = true) diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Grid.php index f211c3fd146..1e56aa1c5e5 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Grid.php @@ -91,15 +91,21 @@ protected function _prepareLayout() return $this; } + /** + * @inheritDoc + */ protected function _prepareColumns() { foreach ($this->_columns as $_column) { $_column->setSortable(false); } - parent::_prepareColumns(); + return parent::_prepareColumns(); } + /** + * @return void + */ protected function _prepareCollection() { $filter = $this->getParam($this->getVarNameFilter(), null); @@ -424,7 +430,7 @@ public function getPeriodText() /** * Retrieve grid as CSV * - * @return unknown + * @return string */ public function getCsv() { @@ -618,7 +624,7 @@ public function getCurrentCurrencyCode() /** * Get currency rate (base to given currency) * - * @param string|Mage_Directory_Model_Currency $currencyCode + * @param string|Mage_Directory_Model_Currency $toCurrency * @return double */ public function getRate($toCurrency) diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Grid/Shopcart.php b/app/code/core/Mage/Adminhtml/Block/Report/Grid/Shopcart.php index 530fbc56803..69167de8fe6 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Grid/Shopcart.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Grid/Shopcart.php @@ -74,7 +74,7 @@ public function getCurrentCurrencyCode() /** * Get currency rate (base to given currency) * - * @param string|Mage_Directory_Model_Currency $currencyCode + * @param string|Mage_Directory_Model_Currency $toCurrency * @return double */ public function getRate($toCurrency) diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Product/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Product/Grid.php index 903ea7f2428..c7d7dbc6dbb 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Product/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Product/Grid.php @@ -33,7 +33,6 @@ */ class Mage_Adminhtml_Block_Report_Product_Grid extends Mage_Adminhtml_Block_Widget_Grid { - public function __construct() { parent::__construct(); @@ -42,9 +41,12 @@ public function __construct() $this->setDefaultDir('desc'); } + /** + * @inheritDoc + * @throws Exception + */ protected function _prepareCollection() { - $collection = Mage::getResourceModel('reports/product_collection'); $collection->getEntity()->setStore(0); @@ -53,12 +55,19 @@ protected function _prepareCollection() return parent::_prepareCollection(); } + /** + * @return void + */ protected function _afterLoadCollection() { $totalObj = new Mage_Reports_Model_Totals(); $this->setTotals($totalObj->countTotals($this)); } + /** + * @inheritDoc + * @throws Exception + */ protected function _prepareColumns() { $this->addColumn('entity_id', array( diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Product/Ordered/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Product/Ordered/Grid.php index ce059f3f17f..b9639b9e689 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Product/Ordered/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Product/Ordered/Grid.php @@ -38,6 +38,9 @@ public function __construct() $this->setId('gridOrderedProducts'); } + /** + * @return void + */ protected function _prepareCollection() { parent::_prepareCollection(); diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Customer/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Customer/Grid.php index eecda262756..a7f62f084e5 100644 --- a/app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Customer/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Customer/Grid.php @@ -33,13 +33,16 @@ */ class Mage_Adminhtml_Block_Report_Shopcart_Customer_Grid extends Mage_Adminhtml_Block_Report_Grid_Shopcart { - public function __construct() { parent::__construct(); $this->setId('grid'); } + /** + * @inheritDoc + * @throws Exception + */ protected function _prepareCollection() { //TODO: add full name logic @@ -51,11 +54,18 @@ protected function _prepareCollection() return parent::_prepareCollection(); } + /** + * @return void + */ protected function _afterLoadCollection() { $this->getCollection()->addCartInfo(); } + /** + * @inheritDoc + * @throws Exception + */ protected function _prepareColumns() { $this->addColumn('entity_id', array( diff --git a/app/code/core/Mage/Adminhtml/Block/Review/Grid.php b/app/code/core/Mage/Adminhtml/Block/Review/Grid.php index 2960235e583..ce15169e372 100644 --- a/app/code/core/Mage/Adminhtml/Block/Review/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Review/Grid.php @@ -204,6 +204,9 @@ protected function _prepareColumns() return parent::_prepareColumns(); } + /** + * @return void + */ protected function _prepareMassaction() { $this->setMassactionIdField('review_id'); diff --git a/app/code/core/Mage/Adminhtml/Block/Review/Product/Grid.php b/app/code/core/Mage/Adminhtml/Block/Review/Product/Grid.php index 227335a597c..1bd14e5a081 100644 --- a/app/code/core/Mage/Adminhtml/Block/Review/Product/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Review/Product/Grid.php @@ -33,7 +33,6 @@ */ class Mage_Adminhtml_Block_Review_Product_Grid extends Mage_Adminhtml_Block_Catalog_Product_Grid { - public function __construct() { parent::__construct(); @@ -42,6 +41,9 @@ public function __construct() $this->setUseAjax(true); } + /** + * @return void + */ protected function _prepareColumns() { $this->addColumn('entity_id', array( @@ -106,16 +108,26 @@ protected function _prepareColumns() } } + /** + * @return string + */ public function getGridUrl() { return $this->getUrl('*/*/productGrid', array('_current'=>true)); } + /** + * @param Varien_Object $row + * @return string + */ public function getRowUrl($row) { return $this->getUrl('*/*/jsonProductInfo', array('id' => $row->getId())); } + /** + * @return $this + */ protected function _prepareMassaction() { return $this; diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search/Grid.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search/Grid.php index 5cbd29dee29..7c99389fb94 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search/Grid.php @@ -33,7 +33,6 @@ */ class Mage_Adminhtml_Block_Sales_Order_Create_Search_Grid extends Mage_Adminhtml_Block_Widget_Grid { - public function __construct() { parent::__construct(); @@ -90,7 +89,7 @@ protected function _addColumnFilterToCollection($column) /** * Prepare collection to be displayed in the grid * - * @return $this + * @inheritDoc */ protected function _prepareCollection() { @@ -114,9 +113,7 @@ protected function _prepareCollection() } /** - * Prepare columns - * - * @return $this + * @inheritDoc */ protected function _prepareColumns() { @@ -175,6 +172,9 @@ protected function _prepareColumns() return parent::_prepareColumns(); } + /** + * @return string + */ public function getGridUrl() { return $this->getUrl('*/*/loadBlock', array('block'=>'search_grid', '_current' => true, 'collapse' => null)); @@ -198,12 +198,13 @@ protected function _getGiftmessageSaveModel() return Mage::getSingleton('adminhtml/giftmessage_save'); } - /* + /** * Add custom options to product collection * - * return Mage_Adminhtml_Block_Widget_Grid + * @inheritDoc */ - protected function _afterLoadCollection() { + protected function _afterLoadCollection() + { $this->getCollection()->addOptionsToResult(); return parent::_afterLoadCollection(); } diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Packaging.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Packaging.php index da7e996fa1f..ae9f5f08e1d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Packaging.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Packaging.php @@ -286,7 +286,7 @@ public function getPrintButton() /** * Check whether girth is allowed for current carrier * - * @return void + * @return bool */ public function isGirthAllowed() { diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Giftmessage.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Giftmessage.php index b74cee70edc..0be1f7d44ea 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Giftmessage.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Giftmessage.php @@ -183,7 +183,7 @@ public function getFieldName($name) /** * Retrieve real html id for field * - * @param string $name + * @param string $id * @return string */ public function getFieldId($id) diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Items.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Items.php index b97d86a7aab..88d85475de0 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Items.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Items.php @@ -48,7 +48,7 @@ protected function _beforeToHtml() /** * Retrieve order items collection * - * @return unknown + * @return Mage_Sales_Model_Order_Item[]|Mage_Sales_Model_Resource_Order_Item_Collection */ public function getItemsCollection() { diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Items/Renderer/Default.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Items/Renderer/Default.php index 0afe4b24595..6e9e0ef84ea 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Items/Renderer/Default.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Items/Renderer/Default.php @@ -41,7 +41,7 @@ public function getItem() /** * Retrieve real html id for field * - * @param string $name + * @param string $id * @return string */ public function getFieldId($id) diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Reorder/Renderer/Action.php b/app/code/core/Mage/Adminhtml/Block/Sales/Reorder/Renderer/Action.php index f8fd85bb811..9228efff747 100644 --- a/app/code/core/Mage/Adminhtml/Block/Sales/Reorder/Renderer/Action.php +++ b/app/code/core/Mage/Adminhtml/Block/Sales/Reorder/Renderer/Action.php @@ -87,7 +87,6 @@ protected function _actionsToHtml(array $actions = array()) * Add one action array to all options data storage * * @param array $actionArray - * @return void */ public function addToActions($actionArray) { diff --git a/app/code/core/Mage/Adminhtml/Block/Shipping/Carrier/Tablerate/Grid.php b/app/code/core/Mage/Adminhtml/Block/Shipping/Carrier/Tablerate/Grid.php index 7ed88601ea7..c7aa3888da0 100644 --- a/app/code/core/Mage/Adminhtml/Block/Shipping/Carrier/Tablerate/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Shipping/Carrier/Tablerate/Grid.php @@ -50,8 +50,6 @@ class Mage_Adminhtml_Block_Shipping_Carrier_Tablerate_Grid extends Mage_Adminhtm /** * Define grid properties - * - * @return void */ public function __construct() { @@ -88,7 +86,7 @@ public function getWebsiteId() /** * Set current website * - * @param int $websiteId + * @param int $name * @return $this */ public function setConditionName($name) diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Array/Abstract.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Array/Abstract.php index f7f0e13a6b7..44574aa65a7 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Array/Abstract.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Array/Abstract.php @@ -51,7 +51,7 @@ abstract class Mage_Adminhtml_Block_System_Config_Form_Field_Array_Abstract /** * Label of add button * - * @var unknown_type + * @var string */ protected $_addButtonLabel; @@ -121,7 +121,7 @@ protected function _getElementHtml(Varien_Data_Form_Element_Abstract $element) /** * Prepare existing row data object * - * @param Varien_Object + * @param Varien_Object $row */ protected function _prepareArrayRow(Varien_Object $row) { diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/System/Storage/Media/Synchronize.php b/app/code/core/Mage/Adminhtml/Block/System/Config/System/Storage/Media/Synchronize.php index 341ff746c33..dd923f7d66f 100644 --- a/app/code/core/Mage/Adminhtml/Block/System/Config/System/Storage/Media/Synchronize.php +++ b/app/code/core/Mage/Adminhtml/Block/System/Config/System/Storage/Media/Synchronize.php @@ -35,7 +35,7 @@ class Mage_Adminhtml_Block_System_Config_System_Storage_Media_Synchronize extends Mage_Adminhtml_Block_System_Config_Form_Field { - /* + /** * Set template */ protected function _construct() diff --git a/app/code/core/Mage/Adminhtml/Block/Tag/Customer/Grid.php b/app/code/core/Mage/Adminhtml/Block/Tag/Customer/Grid.php index 2fe84212654..04597345586 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tag/Customer/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Tag/Customer/Grid.php @@ -42,7 +42,8 @@ public function __construct() $this->setDefaultDir('ASC'); $this->setUseAjax(true); } - /* + + /** * Retrieves Grid Url * * @return string @@ -52,6 +53,9 @@ public function getGridUrl() return $this->getUrl('*/*/customer', array('_current' => true)); } + /** + * @inheritDoc + */ protected function _prepareCollection() { $tagId = Mage::registry('current_tag')->getId(); @@ -67,12 +71,18 @@ protected function _prepareCollection() return parent::_prepareCollection(); } + /** + * @inheritDoc + */ protected function _afterLoadCollection() { $this->getCollection()->addProductName(); return parent::_afterLoadCollection(); } + /** + * @inheritDoc + */ protected function _prepareColumns() { $this->addColumn('customer_id', array( @@ -113,11 +123,13 @@ protected function _prepareColumns() 'index' => 'product_sku', )); - - return parent::_prepareColumns(); } + /** + * @param Varien_Object $row + * @return string + */ public function getRowUrl($row) { return $this->getUrl('*/customer/edit', array('id' => $row->getId())); diff --git a/app/code/core/Mage/Adminhtml/Block/Tag/Edit.php b/app/code/core/Mage/Adminhtml/Block/Tag/Edit.php index 1ebb46ea508..bc2ceaa7524 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tag/Edit.php +++ b/app/code/core/Mage/Adminhtml/Block/Tag/Edit.php @@ -36,8 +36,6 @@ class Mage_Adminhtml_Block_Tag_Edit extends Mage_Adminhtml_Block_Widget_Form_Con { /** * Add and update buttons - * - * @return void */ public function __construct() { diff --git a/app/code/core/Mage/Adminhtml/Block/Tag/Grid/Pending.php b/app/code/core/Mage/Adminhtml/Block/Tag/Grid/Pending.php index 161382c2ed1..592209b329c 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tag/Grid/Pending.php +++ b/app/code/core/Mage/Adminhtml/Block/Tag/Grid/Pending.php @@ -35,8 +35,6 @@ class Mage_Adminhtml_Block_Tag_Grid_Pending extends Mage_Adminhtml_Block_Widget_ { /** * Constructor - * - * @return void */ public function __construct() { @@ -157,7 +155,7 @@ protected function _prepareMassaction() return $this; } - /* + /** * Retrieves Grid Url * * @return string diff --git a/app/code/core/Mage/Adminhtml/Block/Tag/Pending.php b/app/code/core/Mage/Adminhtml/Block/Tag/Pending.php index fb13616a399..a3fb97f720d 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tag/Pending.php +++ b/app/code/core/Mage/Adminhtml/Block/Tag/Pending.php @@ -35,8 +35,6 @@ class Mage_Adminhtml_Block_Tag_Pending extends Mage_Adminhtml_Block_Template { /** * Constructor - * - * @return void */ public function __construct() { diff --git a/app/code/core/Mage/Adminhtml/Block/Tag/Product/Grid.php b/app/code/core/Mage/Adminhtml/Block/Tag/Product/Grid.php index 046413e389d..3b1a2a83bdc 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tag/Product/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Tag/Product/Grid.php @@ -43,7 +43,7 @@ public function __construct() $this->setUseAjax(true); } - /* + /** * Retrieves Grid Url * * @return string diff --git a/app/code/core/Mage/Adminhtml/Block/Tag/Tag/Grid.php b/app/code/core/Mage/Adminhtml/Block/Tag/Tag/Grid.php index 3759ba2df81..ca184c49384 100644 --- a/app/code/core/Mage/Adminhtml/Block/Tag/Tag/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Tag/Tag/Grid.php @@ -35,8 +35,6 @@ class Mage_Adminhtml_Block_Tag_Tag_Grid extends Mage_Adminhtml_Block_Widget_Grid { /** * Constructor - * - * @return void */ public function __construct() { @@ -144,7 +142,7 @@ protected function _prepareMassaction() return $this; } - /* + /** * Retrieves Grid Url * * @return string @@ -157,7 +155,7 @@ public function getGridUrl() /** * Retrieves row click URL * - * @param mixed $row + * @param Varien_Object $row * @return string */ public function getRowUrl($row) diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Container.php b/app/code/core/Mage/Adminhtml/Block/Widget/Container.php index ba3b199781d..4f42ddf58ae 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Container.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Container.php @@ -67,7 +67,7 @@ class Mage_Adminhtml_Block_Widget_Container extends Mage_Adminhtml_Block_Templat * @param array $data * @param integer $level * @param integer $sortOrder - * @param string|null $placement area, that button should be displayed in ('header', 'footer', null) + * @param string|null $area area, that button should be displayed in ('header', 'footer', null) * @return $this */ protected function _addButton($id, $data, $level = 0, $sortOrder = 0, $area = 'header') @@ -92,7 +92,7 @@ protected function _addButton($id, $data, $level = 0, $sortOrder = 0, $area = 'h * @param array $data * @param integer $level * @param integer $sortOrder - * @param string|null $placement area, that button should be displayed in ('header', 'footer', null) + * @param string|null $area area, that button should be displayed in ('header', 'footer', null) * @return $this */ public function addButton($id, $data, $level = 0, $sortOrder = 0, $area = 'header') diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid.php index f520d700173..f63ac637720 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid.php @@ -85,14 +85,14 @@ class Mage_Adminhtml_Block_Widget_Grid extends Mage_Adminhtml_Block_Widget /** * Empty grid text * - * @var sting|null + * @var string|null */ protected $_emptyText; /** * Empty grid text CSS class * - * @var sting|null + * @var string|null */ protected $_emptyTextCss = 'a-center'; @@ -563,7 +563,7 @@ protected function _prepareCollection() /** * Decode URL encoded filter value recursive callback method * - * @var string $value + * @param string $value */ protected function _decodeFilter(&$value) { @@ -576,6 +576,9 @@ protected function _preparePage() $this->getCollection()->setCurPage((int) $this->getParam($this->getVarNamePage(), $this->_defaultPage)); } + /** + * @return $this + */ protected function _prepareColumns() { $this->sortColumnsByOrder(); @@ -611,7 +614,7 @@ protected function _prepareMassaction() /** * Prepare grid massaction column * - * @return unknown + * @return $this */ protected function _prepareMassactionColumn() { @@ -641,6 +644,9 @@ protected function _prepareMassactionColumn() return $this; } + /** + * @return $this + */ protected function _prepareGrid() { $this->_prepareColumns(); @@ -661,6 +667,9 @@ protected function _beforeToHtml() return parent::_beforeToHtml(); } + /** + * @return $this + */ protected function _afterLoadCollection() { return $this; @@ -1481,7 +1490,7 @@ public function getEmptyTextClass() /** * Set count totals * - * @param boolean $visible + * @param boolean $count */ public function setCountTotals($count=true) { @@ -1501,7 +1510,7 @@ public function getCountTotals() /** * Set totals * - * @param boolean $visible + * @param Varien_Object $totals */ public function setTotals(Varien_Object $totals) { @@ -1593,9 +1602,10 @@ public function shouldRenderSubTotal($item) { /** * Retrieve columns to render * - * @return unknown + * @return Mage_Adminhtml_Block_Widget_Grid_Column[] */ - public function getSubTotalColumns() { + public function getSubTotalColumns() + { return $this->getColumns(); } @@ -1647,7 +1657,6 @@ public function getMultipleRows($item) /** * Retrieve columns for multiple rows * - * @param Varien_Object $item * @return array */ public function getMultipleRowColumns() @@ -1692,7 +1701,6 @@ public function shouldRenderEmptyCell($item, $column) /** * Retrieve colspan for empty cell * - * @param Varien_Object $item * @return integer */ public function getEmptyCellColspan() @@ -1725,7 +1733,7 @@ public function setEmptyCellLabel($label) /** * Return row url for js event handlers * - * @param Mage_Catalog_Model_Product|Varien_Object + * @param Mage_Catalog_Model_Product|Varien_Object $item * @return string */ public function getRowUrl($item) diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Datetime.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Datetime.php index c2c4c62a7e7..3f22ced6022 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Datetime.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Datetime.php @@ -63,7 +63,7 @@ public function getValue($index=null) return $value; } - /* + /** * Convert given date to default (UTC) timezone * * @param string $date diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Serializer.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Serializer.php index d42c0684dea..e69152ed0fd 100644 --- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Serializer.php +++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Serializer.php @@ -56,7 +56,7 @@ public function _construct() /** * Register grid column input name to serialize * - * @param string $name + * @param array|string $names */ public function addColumnInputName($names) { @@ -75,7 +75,8 @@ public function addColumnInputName($names) /** * Get grid column input names to serialize * - * @return unknown + * @param bool $asJSON + * @return array */ public function getColumnInputNames($asJSON = false) { diff --git a/app/code/core/Mage/Adminhtml/Controller/Action.php b/app/code/core/Mage/Adminhtml/Controller/Action.php index c208b79c175..b3ec5e88293 100644 --- a/app/code/core/Mage/Adminhtml/Controller/Action.php +++ b/app/code/core/Mage/Adminhtml/Controller/Action.php @@ -76,6 +76,11 @@ class Mage_Adminhtml_Controller_Action extends Mage_Core_Controller_Varien_Actio */ protected $_sessionNamespace = self::SESSION_NAMESPACE; + /** + * Check current user permission on resource and privilege + * + * @return bool + */ protected function _isAllowed() { return Mage::getSingleton('admin/session')->isAllowed('admin'); @@ -354,8 +359,9 @@ protected function _redirectReferer($defaultUrl=null) /** * Set redirect into responce * - * @param string $path - * @param array $arguments + * @param string $path + * @param array $arguments + * @return $this */ protected function _redirect($path, $arguments=array()) { diff --git a/app/code/core/Mage/Adminhtml/Model/Config.php b/app/code/core/Mage/Adminhtml/Model/Config.php index 68deefd43c0..89105ff893c 100644 --- a/app/code/core/Mage/Adminhtml/Model/Config.php +++ b/app/code/core/Mage/Adminhtml/Model/Config.php @@ -140,8 +140,6 @@ public function loadCache() /** * Init modules configuration - * - * @return void */ protected function _initSectionsAndTabs() { diff --git a/app/code/core/Mage/Adminhtml/Model/Sales/Order/Create.php b/app/code/core/Mage/Adminhtml/Model/Sales/Order/Create.php index bdb3d63e249..388f4292504 100644 --- a/app/code/core/Mage/Adminhtml/Model/Sales/Order/Create.php +++ b/app/code/core/Mage/Adminhtml/Model/Sales/Order/Create.php @@ -894,8 +894,9 @@ public function updateQuoteItems($data) /** * Parse additional options and sync them with product options * - * @param Mage_Sales_Model_Quote_Item $product - * @param array $options + * @param Mage_Sales_Model_Quote_Item $item + * @param array $additionalOptions + * @return array */ protected function _parseOptions(Mage_Sales_Model_Quote_Item $item, $additionalOptions) { @@ -962,6 +963,7 @@ protected function _parseOptions(Mage_Sales_Model_Quote_Item $item, $additionalO * * @param Mage_Sales_Model_Quote_Item $item * @param array $options + * @return $this */ protected function _assignOptionsToItem(Mage_Sales_Model_Quote_Item $item, $options) { diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Serialized.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Serialized.php index 5ad7a6843d6..97bc5957b17 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Serialized.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Serialized.php @@ -43,6 +43,9 @@ protected function _afterLoad() } } + /** + * @inheritDoc + */ protected function _beforeSave() { if (is_array($this->getValue())) { diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Serialized/Array.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Serialized/Array.php index dd89d70524b..519f88eefa5 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Serialized/Array.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Serialized/Array.php @@ -33,8 +33,8 @@ class Mage_Adminhtml_Model_System_Config_Backend_Serialized_Array extends Mage_A /** * Check object existence in incoming data and unset array element with '__empty' key * + * @inheritDoc * @throws Mage_Core_Exception - * @return void */ protected function _beforeSave() { @@ -49,6 +49,6 @@ protected function _beforeSave() unset($value['__empty']); } $this->setValue($value); - parent::_beforeSave(); + return parent::_beforeSave(); } } diff --git a/app/code/core/Mage/Adminhtml/Model/System/Store.php b/app/code/core/Mage/Adminhtml/Model/System/Store.php index 2ab5a581e70..3c7b4aa3c85 100644 --- a/app/code/core/Mage/Adminhtml/Model/System/Store.php +++ b/app/code/core/Mage/Adminhtml/Model/System/Store.php @@ -315,6 +315,7 @@ public function getStoreOptionHash($withDefault = false, $attribute = 'name') */ public function getStoreGroupOptionHash($attribute = 'name') { + $options = []; foreach ($this->_groupCollection as $group) { $options[$group->getId()] = $group->getDataUsingMethod($attribute); } @@ -324,7 +325,7 @@ public function getStoreGroupOptionHash($attribute = 'name') /** * Retrieve Website name by Id * - * @param int websiteId + * @param int $websiteId * @return string */ public function getWebsiteName($websiteId) @@ -340,7 +341,7 @@ public function getWebsiteName($websiteId) /** * Retrieve Group name by Id * - * @param int groupId + * @param int $groupId * @return string */ public function getGroupName($groupId) diff --git a/app/code/core/Mage/Adminhtml/controllers/Catalog/CategoryController.php b/app/code/core/Mage/Adminhtml/controllers/Catalog/CategoryController.php index 34dee0d26ef..e25cdc32521 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Catalog/CategoryController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Catalog/CategoryController.php @@ -433,8 +433,6 @@ public function deleteAction() /** * Grid Action * Display list of products related to current category - * - * @return void */ public function gridAction() { @@ -450,8 +448,6 @@ public function gridAction() /** * Tree Action * Retrieve category tree - * - * @return void */ public function treeAction() { diff --git a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/WidgetController.php b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/WidgetController.php index e062d15a089..aeaaf4e0358 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/WidgetController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Catalog/Product/WidgetController.php @@ -38,7 +38,6 @@ class Mage_Adminhtml_Catalog_Product_WidgetController extends Mage_Adminhtml_Con * Chooser Source action * * @throws Mage_Core_Exception - * @return void */ public function chooserAction() { diff --git a/app/code/core/Mage/Adminhtml/controllers/Catalog/ProductController.php b/app/code/core/Mage/Adminhtml/controllers/Catalog/ProductController.php index 71b2a5e1acd..e5084cc7970 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Catalog/ProductController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Catalog/ProductController.php @@ -688,7 +688,6 @@ protected function _initProductSave() * Filter product stock data * * @param array $stockData - * @return null */ protected function _filterStockData(&$stockData) { @@ -975,7 +974,6 @@ public function massStatusAction() * @throws Mage_Core_Exception * @param array $productIds * @param int $status - * @return void */ public function _validateMassStatus(array $productIds, $status) { diff --git a/app/code/core/Mage/Adminhtml/controllers/Cms/PageController.php b/app/code/core/Mage/Adminhtml/controllers/Cms/PageController.php index 7aa9dea0db8..fa9459104d5 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Cms/PageController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Cms/PageController.php @@ -252,7 +252,7 @@ protected function _isAllowed() /** * Filtering posted data. Converting localized data if needed * - * @param array + * @param array $data * @return array */ protected function _filterPostData($data) diff --git a/app/code/core/Mage/Adminhtml/controllers/Cms/Wysiwyg/ImagesController.php b/app/code/core/Mage/Adminhtml/controllers/Cms/Wysiwyg/ImagesController.php index 5f47078ba62..074ab1f8ae3 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Cms/Wysiwyg/ImagesController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Cms/Wysiwyg/ImagesController.php @@ -112,8 +112,6 @@ public function deleteFolderAction() /** * Delete file from media storage - * - * @return void */ public function deleteFilesAction() { diff --git a/app/code/core/Mage/Adminhtml/controllers/Customer/System/Config/ValidatevatController.php b/app/code/core/Mage/Adminhtml/controllers/Customer/System/Config/ValidatevatController.php index 9d573d7cd0b..1c50b5815b0 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Customer/System/Config/ValidatevatController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Customer/System/Config/ValidatevatController.php @@ -48,8 +48,6 @@ protected function _validate() /** * Check whether vat is valid - * - * @return void */ public function validateAction() { @@ -59,8 +57,6 @@ public function validateAction() /** * Retrieve validation result as JSON - * - * @return void */ public function validateAdvancedAction() { diff --git a/app/code/core/Mage/Adminhtml/controllers/CustomerController.php b/app/code/core/Mage/Adminhtml/controllers/CustomerController.php index 710d09c0e68..9563eb2c89e 100644 --- a/app/code/core/Mage/Adminhtml/controllers/CustomerController.php +++ b/app/code/core/Mage/Adminhtml/controllers/CustomerController.php @@ -863,7 +863,7 @@ protected function _isAllowed() /** * Filtering posted data. Converting localized data if needed * - * @param array + * @param array $data * @return array */ protected function _filterPostData($data) diff --git a/app/code/core/Mage/Adminhtml/controllers/Permissions/VariableController.php b/app/code/core/Mage/Adminhtml/controllers/Permissions/VariableController.php index 0849a27a646..02f348c3251 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Permissions/VariableController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Permissions/VariableController.php @@ -55,7 +55,6 @@ public function indexAction() ->_title($this->__('Permissions')) ->_title($this->__('Variables')); - /** @var Mage_Adminhtml_Block_Permissions_Variables $block */ $block = $this->getLayout()->createBlock('adminhtml/permissions_variable'); $this->_initAction() ->_addContent($block) diff --git a/app/code/core/Mage/Adminhtml/controllers/Promo/QuoteController.php b/app/code/core/Mage/Adminhtml/controllers/Promo/QuoteController.php index 68b50b1ca38..c315213cd9b 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Promo/QuoteController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Promo/QuoteController.php @@ -245,7 +245,6 @@ public function deleteAction() * New condition HTML action * * @throws Mage_Core_Exception - * @return void */ public function newConditionHtmlAction() { @@ -324,8 +323,6 @@ public function couponsGridAction() /** * Export coupon codes as excel xml file - * - * @return void */ public function exportCouponsXmlAction() { @@ -345,8 +342,6 @@ public function exportCouponsXmlAction() /** * Export coupon codes as CSV file - * - * @return void */ public function exportCouponsCsvAction() { diff --git a/app/code/core/Mage/Adminhtml/controllers/Promo/WidgetController.php b/app/code/core/Mage/Adminhtml/controllers/Promo/WidgetController.php index e8ddeb7ea14..ecdf462cdf4 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Promo/WidgetController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Promo/WidgetController.php @@ -29,8 +29,6 @@ class Mage_Adminhtml_Promo_WidgetController extends Mage_Adminhtml_Controller_Ac { /** * Prepare block for chooser - * - * @return void */ public function chooserAction() { @@ -78,6 +76,9 @@ public function chooserAction() } } + /** + * @inheritDoc + */ protected function _isAllowed() { return Mage::getSingleton('admin/session')->isAllowed('promo/catalog'); diff --git a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/CreateController.php b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/CreateController.php index d79eb6b3b2d..03bcaf7bd22 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/CreateController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/CreateController.php @@ -581,7 +581,7 @@ protected function _getAclResourse() return $aclResource; } - /* + /** * Ajax handler to response configuration fieldset of composite product in order * * @return $this @@ -606,7 +606,7 @@ public function configureProductToAddAction() return $this; } - /* + /** * Ajax handler to response configuration fieldset of composite product in quote items * * @return $this diff --git a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/CreditmemoController.php b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/CreditmemoController.php index 4c17db008a4..97b012b9b4f 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/CreditmemoController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/CreditmemoController.php @@ -79,6 +79,7 @@ protected function _canCreditmemo($order) /** * Initialize requested invoice instance * @param unknown_type $order + * @return false|Mage_Sales_Model_Order_Invoice */ protected function _initInvoice($order) { @@ -166,6 +167,7 @@ protected function _initCreditmemo($update = false) /** * Save creditmemo and related order, invoice in one transaction * @param Mage_Sales_Model_Order_Creditmemo $creditmemo + * @return $this */ protected function _saveCreditmemo($creditmemo) { diff --git a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/ShipmentController.php b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/ShipmentController.php index 929524539be..46428435f62 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/ShipmentController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/ShipmentController.php @@ -176,8 +176,6 @@ public function newAction() /** * Save shipment * We can save only new shipment. Existing shipments are not editable - * - * @return null */ public function saveAction() { @@ -568,7 +566,6 @@ public function createLabelAction() /** * Print label for one specific shipment - * */ public function printLabelAction() { @@ -609,8 +606,6 @@ public function printLabelAction() /** * Create pdf document with information about packages - * - * @return void */ public function printPackageAction() { @@ -630,8 +625,6 @@ public function printPackageAction() /** * Batch print shipping labels for whole shipments. * Push pdf document with shipping labels to user browser - * - * @return null */ public function massPrintShippingLabelAction() { diff --git a/app/code/core/Mage/Adminhtml/controllers/Sales/Recurring/ProfileController.php b/app/code/core/Mage/Adminhtml/controllers/Sales/Recurring/ProfileController.php index a5f62c17f6d..31b80c69437 100644 --- a/app/code/core/Mage/Adminhtml/controllers/Sales/Recurring/ProfileController.php +++ b/app/code/core/Mage/Adminhtml/controllers/Sales/Recurring/ProfileController.php @@ -34,7 +34,7 @@ class Mage_Adminhtml_Sales_Recurring_ProfileController extends Mage_Adminhtml_Co /** * Recurring profiles list * - * @return void + * @return $this */ public function indexAction() { diff --git a/app/code/core/Mage/Adminhtml/controllers/System/Config/System/StorageController.php b/app/code/core/Mage/Adminhtml/controllers/System/Config/System/StorageController.php index bbbdec4e9bf..763d97d4eba 100644 --- a/app/code/core/Mage/Adminhtml/controllers/System/Config/System/StorageController.php +++ b/app/code/core/Mage/Adminhtml/controllers/System/Config/System/StorageController.php @@ -55,8 +55,6 @@ protected function _getSyncFlag() /** * Synchronize action between storages - * - * @return void */ public function synchronizeAction() { @@ -94,8 +92,6 @@ public function synchronizeAction() /** * Retrieve synchronize process state and it's parameters in json format - * - * @return void */ public function statusAction() { diff --git a/app/code/core/Mage/Adminhtml/controllers/TagController.php b/app/code/core/Mage/Adminhtml/controllers/TagController.php index 07b2870b088..ffa280d83d3 100644 --- a/app/code/core/Mage/Adminhtml/controllers/TagController.php +++ b/app/code/core/Mage/Adminhtml/controllers/TagController.php @@ -199,8 +199,6 @@ public function saveAction() /** * Delete tag action - * - * @return void */ public function deleteAction() { diff --git a/app/code/core/Mage/Api/Helper/Data.php b/app/code/core/Mage/Api/Helper/Data.php index 057c74973e9..6e44116e053 100644 --- a/app/code/core/Mage/Api/Helper/Data.php +++ b/app/code/core/Mage/Api/Helper/Data.php @@ -234,7 +234,6 @@ public function packArrayToObject(array $arr) * Convert objects and arrays to array recursively * * @param array|object $data - * @return void */ public function toArray(&$data) { diff --git a/app/code/core/Mage/Api2/Block/Adminhtml/Attribute/Grid.php b/app/code/core/Mage/Api2/Block/Adminhtml/Attribute/Grid.php index e8a9018c0a3..28fce97084e 100644 --- a/app/code/core/Mage/Api2/Block/Adminhtml/Attribute/Grid.php +++ b/app/code/core/Mage/Api2/Block/Adminhtml/Attribute/Grid.php @@ -46,6 +46,7 @@ public function __construct($attributes = array()) /** * Collection object set up + * @return void */ protected function _prepareCollection() { diff --git a/app/code/core/Mage/Api2/Model/Acl/Filter/Attribute.php b/app/code/core/Mage/Api2/Model/Acl/Filter/Attribute.php index 807e382c8e9..b1a82325368 100644 --- a/app/code/core/Mage/Api2/Model/Acl/Filter/Attribute.php +++ b/app/code/core/Mage/Api2/Model/Acl/Filter/Attribute.php @@ -54,8 +54,6 @@ class Mage_Api2_Model_Acl_Filter_Attribute extends Mage_Core_Model_Abstract /** * Initialize resource model - * - * @return void */ protected function _construct() { diff --git a/app/code/core/Mage/Api2/Model/Acl/Global/Role.php b/app/code/core/Mage/Api2/Model/Acl/Global/Role.php index 81bed891286..d969165c87c 100644 --- a/app/code/core/Mage/Api2/Model/Acl/Global/Role.php +++ b/app/code/core/Mage/Api2/Model/Acl/Global/Role.php @@ -67,8 +67,6 @@ class Mage_Api2_Model_Acl_Global_Role extends Mage_Core_Model_Abstract /** * Initialize resource model - * - * @return void */ protected function _construct() { diff --git a/app/code/core/Mage/Api2/Model/Acl/Global/Rule.php b/app/code/core/Mage/Api2/Model/Acl/Global/Rule.php index 020305f260c..537982b9997 100644 --- a/app/code/core/Mage/Api2/Model/Acl/Global/Rule.php +++ b/app/code/core/Mage/Api2/Model/Acl/Global/Rule.php @@ -55,8 +55,6 @@ class Mage_Api2_Model_Acl_Global_Rule extends Mage_Core_Model_Abstract /** * Initialize resource model - * - * @return void */ protected function _construct() { diff --git a/app/code/core/Mage/Api2/Model/Config.php b/app/code/core/Mage/Api2/Model/Config.php index d119f75b3b9..899d2f8ee5a 100644 --- a/app/code/core/Mage/Api2/Model/Config.php +++ b/app/code/core/Mage/Api2/Model/Config.php @@ -111,7 +111,7 @@ public function getRoutes($apiType) continue; } - /** @var Varien_Simplexml_Element $routes */ + /** @var Varien_Simplexml_Element $route */ foreach ($resource->routes->children() as $route) { $arguments = array( Mage_Api2_Model_Route_Abstract::PARAM_ROUTE => (string)$route->route, diff --git a/app/code/core/Mage/Api2/Model/Observer.php b/app/code/core/Mage/Api2/Model/Observer.php index e9744f2efcc..d83395683d6 100644 --- a/app/code/core/Mage/Api2/Model/Observer.php +++ b/app/code/core/Mage/Api2/Model/Observer.php @@ -37,7 +37,6 @@ class Mage_Api2_Model_Observer * Save relation of admin user to API2 role * * @param Varien_Event_Observer $observer - * @return void */ public function saveAdminToRoleRelation(Varien_Event_Observer $observer) { diff --git a/app/code/core/Mage/Api2/Model/Resource/Acl/Filter/Attribute.php b/app/code/core/Mage/Api2/Model/Resource/Acl/Filter/Attribute.php index 0d9b6b3509e..96e43e99b53 100644 --- a/app/code/core/Mage/Api2/Model/Resource/Acl/Filter/Attribute.php +++ b/app/code/core/Mage/Api2/Model/Resource/Acl/Filter/Attribute.php @@ -40,8 +40,6 @@ class Mage_Api2_Model_Resource_Acl_Filter_Attribute extends Mage_Core_Model_Reso /** * Initialize resource model - * - * @return void */ protected function _construct() { diff --git a/app/code/core/Mage/Api2/Model/Resource/Acl/Filter/Attribute/Collection.php b/app/code/core/Mage/Api2/Model/Resource/Acl/Filter/Attribute/Collection.php index 1ed755d608a..7cbbebaf6c5 100644 --- a/app/code/core/Mage/Api2/Model/Resource/Acl/Filter/Attribute/Collection.php +++ b/app/code/core/Mage/Api2/Model/Resource/Acl/Filter/Attribute/Collection.php @@ -35,8 +35,6 @@ class Mage_Api2_Model_Resource_Acl_Filter_Attribute_Collection extends Mage_Core { /** * Initialize collection model - * - * @return void */ protected function _construct() { diff --git a/app/code/core/Mage/Api2/Model/Resource/Acl/Global/Role.php b/app/code/core/Mage/Api2/Model/Resource/Acl/Global/Role.php index 664b9c5a871..85729e35868 100644 --- a/app/code/core/Mage/Api2/Model/Resource/Acl/Global/Role.php +++ b/app/code/core/Mage/Api2/Model/Resource/Acl/Global/Role.php @@ -38,8 +38,6 @@ class Mage_Api2_Model_Resource_Acl_Global_Role extends Mage_Core_Model_Resource_ { /** * Initialize resource model - * - * @return void */ protected function _construct() { diff --git a/app/code/core/Mage/Api2/Model/Resource/Acl/Global/Role/Collection.php b/app/code/core/Mage/Api2/Model/Resource/Acl/Global/Role/Collection.php index 3e830f7dbe1..7131faaa9a4 100644 --- a/app/code/core/Mage/Api2/Model/Resource/Acl/Global/Role/Collection.php +++ b/app/code/core/Mage/Api2/Model/Resource/Acl/Global/Role/Collection.php @@ -35,8 +35,6 @@ class Mage_Api2_Model_Resource_Acl_Global_Role_Collection extends Mage_Core_Mode { /** * Initialize collection model - * - * @return void */ protected function _construct() { diff --git a/app/code/core/Mage/Api2/Model/Resource/Acl/Global/Rule.php b/app/code/core/Mage/Api2/Model/Resource/Acl/Global/Rule.php index 625e0776269..4ec3d3a4a6e 100644 --- a/app/code/core/Mage/Api2/Model/Resource/Acl/Global/Rule.php +++ b/app/code/core/Mage/Api2/Model/Resource/Acl/Global/Rule.php @@ -35,8 +35,6 @@ class Mage_Api2_Model_Resource_Acl_Global_Rule extends Mage_Core_Model_Resource_ { /** * Initialize resource model - * - * @return void */ protected function _construct() { diff --git a/app/code/core/Mage/Api2/Model/Resource/Acl/Global/Rule/Collection.php b/app/code/core/Mage/Api2/Model/Resource/Acl/Global/Rule/Collection.php index 0018b99c9e9..dbf494767ec 100644 --- a/app/code/core/Mage/Api2/Model/Resource/Acl/Global/Rule/Collection.php +++ b/app/code/core/Mage/Api2/Model/Resource/Acl/Global/Rule/Collection.php @@ -35,8 +35,6 @@ class Mage_Api2_Model_Resource_Acl_Global_Rule_Collection extends Mage_Core_Mode { /** * Initialize collection model - * - * @return void */ protected function _construct() { diff --git a/app/code/core/Mage/Api2/Model/Route/Abstract.php b/app/code/core/Mage/Api2/Model/Route/Abstract.php index 85a8ea8f8d2..d3bf6eb0806 100644 --- a/app/code/core/Mage/Api2/Model/Route/Abstract.php +++ b/app/code/core/Mage/Api2/Model/Route/Abstract.php @@ -43,7 +43,7 @@ abstract class Mage_Api2_Model_Route_Abstract extends Zend_Controller_Router_Rou const PARAM_LOCALE = 'locale'; /**#@- */ - /* + /** * Default values of parent::__construct() params * * @var array diff --git a/app/code/core/Mage/Api2/Model/Server.php b/app/code/core/Mage/Api2/Model/Server.php index 19c279cbfdf..c32ba66d406 100644 --- a/app/code/core/Mage/Api2/Model/Server.php +++ b/app/code/core/Mage/Api2/Model/Server.php @@ -127,7 +127,6 @@ public function run() * * @param Mage_Api2_Model_Request $request * @param Mage_Api2_Model_Response $response - * @return void * @throws Mage_Api2_Exception */ public function internalCall(Mage_Api2_Model_Request $request, Mage_Api2_Model_Response $response) diff --git a/app/code/core/Mage/Authorizenet/Helper/Data.php b/app/code/core/Mage/Authorizenet/Helper/Data.php index 31db9ad6b8b..8a97072f583 100644 --- a/app/code/core/Mage/Authorizenet/Helper/Data.php +++ b/app/code/core/Mage/Authorizenet/Helper/Data.php @@ -115,7 +115,7 @@ public function getPlaceOrderAdminUrl() /** * Retrieve place order url * - * @param array params + * @param array $params * @return string */ public function getSuccessOrderUrl($params) diff --git a/app/code/core/Mage/Authorizenet/Model/Directpost.php b/app/code/core/Mage/Authorizenet/Model/Directpost.php index 349a3e72a96..01f3b1a369e 100644 --- a/app/code/core/Mage/Authorizenet/Model/Directpost.php +++ b/app/code/core/Mage/Authorizenet/Model/Directpost.php @@ -136,7 +136,7 @@ public function canRefund() /** * Check void availability * - * @param Varien_Object $invoicePayment + * @param Varien_Object $payment * @return bool */ public function canVoid(Varien_Object $payment) @@ -232,7 +232,8 @@ public function refund(Varien_Object $payment, $amount) /** * refund the amount with transaction id * - * @param string $payment Varien_Object object + * @param Varien_Object $payment + * @param string $amount * @return $this * @throws Mage_Core_Exception */ @@ -326,7 +327,7 @@ public function getResponse() * Instantiate state and set it to state object * * @param string $paymentAction - * @param Varien_Object + * @param Varien_Object $stateObject */ public function initialize($paymentAction, $stateObject) { @@ -353,7 +354,7 @@ public function initialize($paymentAction, $stateObject) /** * Generate request object and fill its fields from Quote or Order object * - * @param Mage_Core_Model_Abstract $entity Quote or order object. + * @param Mage_Sales_Model_Order $order Quote or order object. * @return Mage_Authorizenet_Model_Directpost_Request */ public function generateRequestFromOrder(Mage_Sales_Model_Order $order) diff --git a/app/code/core/Mage/Authorizenet/Model/Directpost/Request.php b/app/code/core/Mage/Authorizenet/Model/Directpost/Request.php index 01bc53a0f82..ec3b0fa27c7 100644 --- a/app/code/core/Mage/Authorizenet/Model/Directpost/Request.php +++ b/app/code/core/Mage/Authorizenet/Model/Directpost/Request.php @@ -243,7 +243,6 @@ protected function _getSignatureKey() * Needed to generate SHA2 sign. * * @param string $signatureKey - * @return void */ protected function _setSignatureKey($signatureKey) { diff --git a/app/code/core/Mage/Backup/Model/Backup.php b/app/code/core/Mage/Backup/Model/Backup.php index 467d88160d2..ac3fda7a0eb 100644 --- a/app/code/core/Mage/Backup/Model/Backup.php +++ b/app/code/core/Mage/Backup/Model/Backup.php @@ -53,8 +53,8 @@ class Mage_Backup_Model_Backup extends Varien_Object /** * Load backup file info * - * @param string fileName - * @param string filePath + * @param string $fileName + * @param string $filePath * @return $this */ public function load($fileName, $filePath) diff --git a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Checkbox.php b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Checkbox.php index f00f2f7bca9..5976f4aada8 100644 --- a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Checkbox.php +++ b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Checkbox.php @@ -36,8 +36,6 @@ class Mage_Bundle_Block_Adminhtml_Catalog_Product_Composite_Fieldset_Options_Typ { /** * Set template - * - * @return void */ protected function _construct() { diff --git a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Multi.php b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Multi.php index dea06c546a2..cb011b0e9b6 100644 --- a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Multi.php +++ b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Multi.php @@ -36,8 +36,6 @@ class Mage_Bundle_Block_Adminhtml_Catalog_Product_Composite_Fieldset_Options_Typ { /** * Set template - * - * @return void */ protected function _construct() { diff --git a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Radio.php b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Radio.php index 5e38a299a96..0ac030fae1f 100644 --- a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Radio.php +++ b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Radio.php @@ -36,8 +36,6 @@ class Mage_Bundle_Block_Adminhtml_Catalog_Product_Composite_Fieldset_Options_Typ { /** * Set template - * - * @return void */ protected function _construct() { diff --git a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Select.php b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Select.php index 342dad3d336..6f875f4fa6d 100644 --- a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Select.php +++ b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Select.php @@ -36,8 +36,6 @@ class Mage_Bundle_Block_Adminhtml_Catalog_Product_Composite_Fieldset_Options_Typ { /** * Set template - * - * @return void */ protected function _construct() { diff --git a/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Checkbox.php b/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Checkbox.php index e8247030657..111f6795c5c 100644 --- a/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Checkbox.php +++ b/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Checkbox.php @@ -36,8 +36,6 @@ class Mage_Bundle_Block_Catalog_Product_View_Type_Bundle_Option_Checkbox extends { /** * Set template - * - * @return void */ protected function _construct() { diff --git a/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Multi.php b/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Multi.php index d3e4b704828..a62bd86ea8c 100644 --- a/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Multi.php +++ b/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Multi.php @@ -36,8 +36,6 @@ class Mage_Bundle_Block_Catalog_Product_View_Type_Bundle_Option_Multi extends Ma { /** * Set template - * - * @return void */ protected function _construct() { diff --git a/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Radio.php b/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Radio.php index a6090ac4be6..eeb7e8ac65f 100644 --- a/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Radio.php +++ b/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Radio.php @@ -36,8 +36,6 @@ class Mage_Bundle_Block_Catalog_Product_View_Type_Bundle_Option_Radio extends Ma { /** * Set template - * - * @return void */ protected function _construct() { diff --git a/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Select.php b/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Select.php index 634791c2f66..71e9eb575eb 100644 --- a/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Select.php +++ b/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Select.php @@ -36,8 +36,6 @@ class Mage_Bundle_Block_Catalog_Product_View_Type_Bundle_Option_Select extends M { /** * Set template - * - * @return void */ protected function _construct() { diff --git a/app/code/core/Mage/Bundle/Model/Sales/Order/Pdf/Items/Invoice.php b/app/code/core/Mage/Bundle/Model/Sales/Order/Pdf/Items/Invoice.php index 47e64250156..7d9b2175bd8 100644 --- a/app/code/core/Mage/Bundle/Model/Sales/Order/Pdf/Items/Invoice.php +++ b/app/code/core/Mage/Bundle/Model/Sales/Order/Pdf/Items/Invoice.php @@ -35,8 +35,6 @@ class Mage_Bundle_Model_Sales_Order_Pdf_Items_Invoice extends Mage_Bundle_Model_ { /** * Draw item line - * - * @return void */ public function draw() { diff --git a/app/code/core/Mage/Bundle/Model/Selection.php b/app/code/core/Mage/Bundle/Model/Selection.php index 92b358dbf96..eb2079fd7ee 100644 --- a/app/code/core/Mage/Bundle/Model/Selection.php +++ b/app/code/core/Mage/Bundle/Model/Selection.php @@ -73,9 +73,7 @@ protected function _construct() } /** - * Processing object after save data - * - * @return void + * @inheritDoc * @throws Mage_Core_Model_Store_Exception */ protected function _afterSave() @@ -90,6 +88,6 @@ protected function _afterSave() $this->unsSelectionPriceType(); } } - parent::_afterSave(); + return parent::_afterSave(); } } diff --git a/app/code/core/Mage/Captcha/Model/Interface.php b/app/code/core/Mage/Captcha/Model/Interface.php index da3b816ef48..fe086295497 100644 --- a/app/code/core/Mage/Captcha/Model/Interface.php +++ b/app/code/core/Mage/Captcha/Model/Interface.php @@ -37,7 +37,6 @@ interface Mage_Captcha_Model_Interface * Generates captcha * * @abstract - * @return void */ public function generate(); diff --git a/app/code/core/Mage/Captcha/Model/Resource/Log.php b/app/code/core/Mage/Captcha/Model/Resource/Log.php index 31695c62ff1..053b0341e5a 100644 --- a/app/code/core/Mage/Captcha/Model/Resource/Log.php +++ b/app/code/core/Mage/Captcha/Model/Resource/Log.php @@ -146,8 +146,6 @@ public function countAttemptsByUserLogin($login) /** * Delete attempts with expired in update_at time - * - * @return void */ public function deleteOldAttempts() { diff --git a/app/code/core/Mage/Captcha/controllers/Adminhtml/RefreshController.php b/app/code/core/Mage/Captcha/controllers/Adminhtml/RefreshController.php index 9b986a0c147..bd10c3d575b 100644 --- a/app/code/core/Mage/Captcha/controllers/Adminhtml/RefreshController.php +++ b/app/code/core/Mage/Captcha/controllers/Adminhtml/RefreshController.php @@ -36,8 +36,6 @@ class Mage_Captcha_Adminhtml_RefreshController extends Mage_Adminhtml_Controller /** * Refreshes captcha and returns JSON encoded URL to image (AJAX action) * Example: {'imgSrc': 'http://example.com/media/captcha/67842gh187612ngf8s.png'} - * - * @return null */ public function refreshAction() { diff --git a/app/code/core/Mage/Captcha/controllers/RefreshController.php b/app/code/core/Mage/Captcha/controllers/RefreshController.php index f7496d48a75..5cb0df32afb 100644 --- a/app/code/core/Mage/Captcha/controllers/RefreshController.php +++ b/app/code/core/Mage/Captcha/controllers/RefreshController.php @@ -36,8 +36,6 @@ class Mage_Captcha_RefreshController extends Mage_Core_Controller_Front_Action /** * Refreshes captcha and returns JSON encoded URL to image (AJAX action) * Example: {'imgSrc': 'http://example.com/media/captcha/67842gh187612ngf8s.png'} - * - * @return null */ public function indexAction() { diff --git a/app/code/core/Mage/Catalog/Block/Product/Abstract.php b/app/code/core/Mage/Catalog/Block/Product/Abstract.php index 51b9a25192a..471e1ccc12f 100644 --- a/app/code/core/Mage/Catalog/Block/Product/Abstract.php +++ b/app/code/core/Mage/Catalog/Block/Product/Abstract.php @@ -662,7 +662,7 @@ public function getAddToCompareUrlCustom($product, $addFormKey = true) /** * If exists price template block, retrieve price blocks from it * - * @return Mage_Catalog_Block_Product_Abstract + * @return $this */ protected function _prepareLayout() { diff --git a/app/code/core/Mage/Catalog/Helper/Image.php b/app/code/core/Mage/Catalog/Helper/Image.php index 1a5505885ff..1b95c0e25ad 100644 --- a/app/code/core/Mage/Catalog/Helper/Image.php +++ b/app/code/core/Mage/Catalog/Helper/Image.php @@ -319,7 +319,6 @@ public function watermark($fileName, $position, $size = null, $imageOpacity = nu * Set placeholder * * @param string $fileName - * @return void */ public function placeholder($fileName) { diff --git a/app/code/core/Mage/Catalog/Helper/Product/Compare.php b/app/code/core/Mage/Catalog/Helper/Product/Compare.php index a32160cbdd0..17cc1afd703 100644 --- a/app/code/core/Mage/Catalog/Helper/Product/Compare.php +++ b/app/code/core/Mage/Catalog/Helper/Product/Compare.php @@ -222,9 +222,8 @@ public function getClearListUrl() public function getItemCollection() { if (!$this->_itemCollection) { - /** @var Mage_Catalog_Model_Resource_Product_Compare_Item_Collection _itemCollection */ $this->_itemCollection = Mage::getResourceModel('catalog/product_compare_item_collection') - ->useProductItem(true) + ->useProductItem() ->setStoreId(Mage::app()->getStore()->getId()); if ($this->_customerSession->isLoggedIn()) { @@ -263,9 +262,8 @@ public function calculate($logout = false) if (!$this->_catalogSession->hasCatalogCompareItemsCount() && !$this->_customerId) { $count = 0; } else { - /** @var Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item_Collection $collection */ $collection = Mage::getResourceModel('catalog/product_compare_item_collection') - ->useProductItem(true); + ->useProductItem(); if (!$logout && $this->_customerSession->isLoggedIn()) { $collection->setCustomerId($this->_customerSession->getCustomerId()); } elseif ($this->_customerId) { diff --git a/app/code/core/Mage/Catalog/Model/Api2/Product/Image/Rest/Admin/V1.php b/app/code/core/Mage/Catalog/Model/Api2/Product/Image/Rest/Admin/V1.php index a65af5756e7..65e6d3cb8d7 100644 --- a/app/code/core/Mage/Catalog/Model/Api2/Product/Image/Rest/Admin/V1.php +++ b/app/code/core/Mage/Catalog/Model/Api2/Product/Image/Rest/Admin/V1.php @@ -153,7 +153,6 @@ protected function _retrieve() * Update product image * * @param array $data - * @return void * @throws Mage_Api2_Exception */ protected function _update(array $data) diff --git a/app/code/core/Mage/Catalog/Model/Category.php b/app/code/core/Mage/Catalog/Model/Category.php index 3fdf7a1f987..9f7f362fd55 100644 --- a/app/code/core/Mage/Catalog/Model/Category.php +++ b/app/code/core/Mage/Catalog/Model/Category.php @@ -175,8 +175,6 @@ class Mage_Catalog_Model_Category extends Mage_Catalog_Model_Abstract /** * Initialize resource mode - * - * @return void */ protected function _construct() { diff --git a/app/code/core/Mage/Catalog/Model/Category/Attribute/Backend/Image.php b/app/code/core/Mage/Catalog/Model/Category/Attribute/Backend/Image.php index bc1c225794b..ca93c8d487d 100644 --- a/app/code/core/Mage/Catalog/Model/Category/Attribute/Backend/Image.php +++ b/app/code/core/Mage/Catalog/Model/Category/Attribute/Backend/Image.php @@ -39,6 +39,7 @@ class Mage_Catalog_Model_Category_Attribute_Backend_Image extends Mage_Eav_Model * Save uploaded file and set its name to category * * @param Varien_Object $object + * @return $this */ public function afterSave($object) { diff --git a/app/code/core/Mage/Catalog/Model/Layer/Filter/Price/Algorithm.php b/app/code/core/Mage/Catalog/Model/Layer/Filter/Price/Algorithm.php index 3d527485f5c..438243ad1a5 100644 --- a/app/code/core/Mage/Catalog/Model/Layer/Filter/Price/Algorithm.php +++ b/app/code/core/Mage/Catalog/Model/Layer/Filter/Price/Algorithm.php @@ -307,7 +307,6 @@ protected function _getQuantileInterval($quantileNumber) * * @param array $oldRoundPrices * @param array $newRoundPrices - * @return void */ protected function _mergeRoundPrices(&$oldRoundPrices, &$newRoundPrices) { diff --git a/app/code/core/Mage/Catalog/Model/Observer.php b/app/code/core/Mage/Catalog/Model/Observer.php index 340abd4b0d5..fdd396bf164 100644 --- a/app/code/core/Mage/Catalog/Model/Observer.php +++ b/app/code/core/Mage/Catalog/Model/Observer.php @@ -182,7 +182,6 @@ public function categorySaveAfter(Varien_Event_Observer $observer) * Checking whether the using static urls in WYSIWYG allowed event * * @param Varien_Event_Observer $observer - * @return void */ public function catalogCheckIsUsingStaticUrlsAllowed(Varien_Event_Observer $observer) { diff --git a/app/code/core/Mage/Catalog/Model/Product.php b/app/code/core/Mage/Catalog/Model/Product.php index 12dca553d72..ad880728ffc 100644 --- a/app/code/core/Mage/Catalog/Model/Product.php +++ b/app/code/core/Mage/Catalog/Model/Product.php @@ -454,7 +454,6 @@ public function getPrice() * Set Price calculation flag * * @param bool $calculate - * @return void */ public function setPriceCalculation($calculate = true) { @@ -1691,7 +1690,6 @@ public function getUrlPath($category = null) * @param string $code Attribute code * @param mixed $value New attribute value * @param int $store Store ID - * @return void */ public function addAttributeUpdate($code, $value, $store) { @@ -1937,7 +1935,6 @@ public function addCustomOption($code, $value, $product = null) * Sets custom options for the product * * @param array $options Array of options - * @return void */ public function setCustomOptions(array $options) { diff --git a/app/code/core/Mage/Catalog/Model/Product/Api.php b/app/code/core/Mage/Catalog/Model/Product/Api.php index 168ddde78dd..bedeeb4bb72 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Api.php +++ b/app/code/core/Mage/Catalog/Model/Product/Api.php @@ -266,7 +266,6 @@ public function update($productId, $productData, $store = null, $identifierType * * @param Mage_Catalog_Model_Product $product * @param array $productData - * @return void * @throws Mage_Core_Model_Store_Exception */ protected function _prepareDataForSave($product, $productData) @@ -407,7 +406,6 @@ public function getAdditionalAttributes($productType, $attributeSetId) $this->_checkProductTypeExists($productType); $this->_checkProductAttributeSet($attributeSetId); - /** @var Mage_Catalog_Model_Product $product */ $productAttributes = Mage::getModel('catalog/product') ->setAttributeSetId($attributeSetId) ->setTypeId($productType) @@ -445,7 +443,6 @@ public function getAdditionalAttributes($productType, $attributeSetId) * * @param int $productType * @throw Mage_Api_Exception - * @return void */ protected function _checkProductTypeExists($productType) { @@ -459,7 +456,6 @@ protected function _checkProductTypeExists($productType) * * @param int $attributeSetId * @throw Mage_Api_Exception - * @return void */ protected function _checkProductAttributeSet($attributeSetId) { diff --git a/app/code/core/Mage/Catalog/Model/Product/Api/V2.php b/app/code/core/Mage/Catalog/Model/Product/Api/V2.php index cc8bf8fb5ff..f21dd645844 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Api/V2.php +++ b/app/code/core/Mage/Catalog/Model/Product/Api/V2.php @@ -242,7 +242,6 @@ public function multiUpdate($productIds, $productData, $store = null, $identifie * * @param Mage_Catalog_Model_Product $product * @param array $productData - * @return void * @throws Mage_Api_Exception * @throws Mage_Core_Model_Store_Exception */ diff --git a/app/code/core/Mage/Catalog/Model/Product/Attribute/Api.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Api.php index 1208f4e6c2b..2ddfe09fb61 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Api.php +++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Api.php @@ -456,7 +456,6 @@ public function removeOption($attribute, $optionId) * Prepare request input data for saving * * @param array $data input data - * @return void */ protected function _prepareDataForSave(&$data) { diff --git a/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Recurring.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Recurring.php index f406b94ba69..0df3ab70964 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Recurring.php +++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Recurring.php @@ -47,6 +47,7 @@ public function beforeSave($product) /** * Unserialize or remove on failure * @param Varien_Object|Mage_Catalog_Model_Product $product + * @return $this */ protected function _unserialize(Varien_Object $product) { diff --git a/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Sku.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Sku.php index fb963df67f3..ac0511c9b34 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Sku.php +++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Sku.php @@ -37,7 +37,7 @@ class Mage_Catalog_Model_Product_Attribute_Backend_Sku extends Mage_Eav_Model_En /** * Maximum SKU string length * - * @var string + * @var int */ const SKU_MAX_LENGTH = 64; diff --git a/app/code/core/Mage/Catalog/Model/Product/Option/Api.php b/app/code/core/Mage/Catalog/Model/Product/Option/Api.php index f3dcc632fc9..991ae769834 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Option/Api.php +++ b/app/code/core/Mage/Catalog/Model/Product/Option/Api.php @@ -100,7 +100,6 @@ public function update($optionId, $data, $store = null) * * @param array $data * @param string $groupType - * @return void */ protected function _prepareAdditionalFields(&$data, $groupType) { @@ -145,7 +144,6 @@ protected function _prepareAdditionalFields(&$data, $groupType) * * @param Mage_Catalog_Model_Product $product * @param array $data - * @return void */ protected function _saveProductCustomOption($product, $data) { diff --git a/app/code/core/Mage/Catalog/Model/Product/Option/Type/Date.php b/app/code/core/Mage/Catalog/Model/Product/Option/Type/Date.php index 99744efe83f..79848acb1fd 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Option/Type/Date.php +++ b/app/code/core/Mage/Catalog/Model/Product/Option/Type/Date.php @@ -296,7 +296,6 @@ public function getYearEnd() * Save internal value of option in infoBuy_request * * @param string $internalValue Datetime value in internal format - * @return void * @throws Mage_Core_Exception */ protected function _setInternalInRequest($internalValue) diff --git a/app/code/core/Mage/Catalog/Model/Product/Option/Type/File.php b/app/code/core/Mage/Catalog/Model/Product/Option/Type/File.php index a088369afdb..e122afc1bb8 100644 --- a/app/code/core/Mage/Catalog/Model/Product/Option/Type/File.php +++ b/app/code/core/Mage/Catalog/Model/Product/Option/Type/File.php @@ -713,9 +713,8 @@ protected function _initFilesystem() /** * Create Writeable directory if it doesn't exist * - * @param string Absolute directory path - * @return void - */ + * @param string $path Absolute directory path + */ protected function _createWriteableDir($path) { $io = new Varien_Io_File(); diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Option.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Option.php index 57ba3eedb73..93c12ace7d7 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Product/Option.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Option.php @@ -203,7 +203,6 @@ protected function _saveValuePrices(Mage_Core_Model_Abstract $object) * Save titles * * @param Mage_Core_Model_Abstract|Mage_Catalog_Model_Product_Option $object - * @return void * @throws Zend_Db_Adapter_Exception */ protected function _saveValueTitles(Mage_Core_Model_Abstract $object) diff --git a/app/code/core/Mage/Catalog/Model/Resource/Url.php b/app/code/core/Mage/Catalog/Model/Resource/Url.php index eb4a07a60cb..42de689d968 100644 --- a/app/code/core/Mage/Catalog/Model/Resource/Url.php +++ b/app/code/core/Mage/Catalog/Model/Resource/Url.php @@ -1342,7 +1342,6 @@ public function findFinalTargetPath($requestPath, $storeId, &$_checkedPaths = ar * * @param string $requestPath * @param int $storeId - * @return void */ public function deleteRewrite($requestPath, $storeId) { @@ -1355,7 +1354,6 @@ public function deleteRewrite($requestPath, $storeId) * @param string $requestPath * @param int $storeId * @param bool $rp whether check rewrite option to be "Redirect = Permanent" - * @return void */ public function deleteRewriteRecord($requestPath, $storeId, $rp = false) { diff --git a/app/code/core/Mage/Catalog/Model/Url.php b/app/code/core/Mage/Catalog/Model/Url.php index bcce41380d7..0ab63085b8d 100644 --- a/app/code/core/Mage/Catalog/Model/Url.php +++ b/app/code/core/Mage/Catalog/Model/Url.php @@ -118,7 +118,6 @@ class Mage_Catalog_Model_Url * in this case category is loaded with empty url_path and we should generate it manually. * * @param Varien_Object|Mage_Catalog_Model_Category $category - * @return void */ protected function _addCategoryUrlPath($category) { diff --git a/app/code/core/Mage/CatalogRule/Model/Rule.php b/app/code/core/Mage/CatalogRule/Model/Rule.php index b0eea793657..60fb059f4d5 100644 --- a/app/code/core/Mage/CatalogRule/Model/Rule.php +++ b/app/code/core/Mage/CatalogRule/Model/Rule.php @@ -254,7 +254,6 @@ public function getMatchingProductIds() * Callback function for product matching * * @param array $args - * @return void */ public function callbackValidateProduct($args) { @@ -290,8 +289,6 @@ protected function _getWebsitesMap() * * @param int|Mage_Catalog_Model_Product $product * @param array|null $websiteIds - * - * @return void */ public function applyToProduct($product, $websiteIds = null) { @@ -309,7 +306,6 @@ public function applyToProduct($product, $websiteIds = null) /** * Apply all price rules, invalidate related cache and refresh price index * - * @return void * @throws Exception */ public function applyAll() diff --git a/app/code/core/Mage/CatalogSearch/Helper/Data.php b/app/code/core/Mage/CatalogSearch/Helper/Data.php index dbc9407e555..4792b239750 100644 --- a/app/code/core/Mage/CatalogSearch/Helper/Data.php +++ b/app/code/core/Mage/CatalogSearch/Helper/Data.php @@ -36,7 +36,7 @@ class Mage_CatalogSearch_Helper_Data extends Mage_Core_Helper_Abstract */ const QUERY_VAR_NAME = 'q'; - /* + /** * Maximum query length */ const MAX_QUERY_LEN = 200; @@ -290,7 +290,6 @@ public function getNoteMessages() * Check query of a warnings * * @param mixed $store - * @return void */ public function checkNotes($store = null) { diff --git a/app/code/core/Mage/Checkout/Block/Cart/Item/Renderer.php b/app/code/core/Mage/Checkout/Block/Cart/Item/Renderer.php index f0d4b91379a..ddce51aa76c 100644 --- a/app/code/core/Mage/Checkout/Block/Cart/Item/Renderer.php +++ b/app/code/core/Mage/Checkout/Block/Cart/Item/Renderer.php @@ -32,9 +32,9 @@ * @author Magento Core Team * * @method bool hasProductName() - * @method $this setProductName(string) + * @method $this setProductName(string $value) * @method bool hasDeleteUrl() - * @method $this setDeleteUrl(string) + * @method $this setDeleteUrl(string $value) * @method string getIdSuffix() */ class Mage_Checkout_Block_Cart_Item_Renderer extends Mage_Core_Block_Template diff --git a/app/code/core/Mage/Checkout/Block/Multishipping/Addresses.php b/app/code/core/Mage/Checkout/Block/Multishipping/Addresses.php index 2fa241402bb..1107a6aaacc 100644 --- a/app/code/core/Mage/Checkout/Block/Multishipping/Addresses.php +++ b/app/code/core/Mage/Checkout/Block/Multishipping/Addresses.php @@ -115,7 +115,7 @@ public function getCustomer() } /** - * @param $item + * @param Varien_Object $item * @return string */ public function getItemUrl($item) @@ -124,7 +124,7 @@ public function getItemUrl($item) } /** - * @param $item + * @param Varien_Object $item * @return string */ public function getItemDeleteUrl($item) diff --git a/app/code/core/Mage/Checkout/Model/Type/Onepage.php b/app/code/core/Mage/Checkout/Model/Type/Onepage.php index 64f321ea6e0..f6c8bb25260 100644 --- a/app/code/core/Mage/Checkout/Model/Type/Onepage.php +++ b/app/code/core/Mage/Checkout/Model/Type/Onepage.php @@ -703,8 +703,6 @@ protected function _prepareGuestQuote() /** * Prepare quote for customer registration and customer order submit - * - * @return void */ protected function _prepareNewCustomerQuote() { @@ -740,8 +738,6 @@ protected function _prepareNewCustomerQuote() /** * Prepare quote for customer order submit - * - * @return void */ protected function _prepareCustomerQuote() { @@ -889,7 +885,6 @@ public function saveOrder() /** * Validate quote state to be able submitted from one page checkout page * - * @return void * @throws Mage_Core_Exception * @deprecated after 1.4 - service model doing quote validation */ diff --git a/app/code/core/Mage/Checkout/controllers/CartController.php b/app/code/core/Mage/Checkout/controllers/CartController.php index feaee5fdaeb..efcadaf0ab4 100644 --- a/app/code/core/Mage/Checkout/controllers/CartController.php +++ b/app/code/core/Mage/Checkout/controllers/CartController.php @@ -200,7 +200,6 @@ public function indexAction() /** * Add product to shopping cart action * - * @return void * @throws Mage_Exception */ public function addAction() @@ -562,8 +561,6 @@ public function estimatePostAction() /** * Estimate update action - * - * @return null */ public function estimateUpdatePostAction() { diff --git a/app/code/core/Mage/Checkout/controllers/OnepageController.php b/app/code/core/Mage/Checkout/controllers/OnepageController.php index 25738fa9c21..30aa632f7ac 100644 --- a/app/code/core/Mage/Checkout/controllers/OnepageController.php +++ b/app/code/core/Mage/Checkout/controllers/OnepageController.php @@ -662,7 +662,7 @@ public function saveOrderAction() /** * Filtering posted data. Converting localized data if needed * - * @param array + * @param array $data * @return array */ protected function _filterPostData($data) diff --git a/app/code/core/Mage/Cms/Block/Block.php b/app/code/core/Mage/Cms/Block/Block.php index c2f835a9209..27c1245bcae 100644 --- a/app/code/core/Mage/Cms/Block/Block.php +++ b/app/code/core/Mage/Cms/Block/Block.php @@ -38,8 +38,6 @@ class Mage_Cms_Block_Block extends Mage_Core_Block_Abstract { /** * Initialize cache - * - * @return null */ protected function _construct() { diff --git a/app/code/core/Mage/Cms/Block/Widget/Block.php b/app/code/core/Mage/Cms/Block/Widget/Block.php index 4227ea4d7cf..a4ede52d0fe 100644 --- a/app/code/core/Mage/Cms/Block/Widget/Block.php +++ b/app/code/core/Mage/Cms/Block/Widget/Block.php @@ -38,8 +38,6 @@ class Mage_Cms_Block_Widget_Block extends Mage_Core_Block_Template implements Ma { /** * Initialize cache - * - * @return null */ protected function _construct() { diff --git a/app/code/core/Mage/Cms/Model/Wysiwyg/Images/Storage.php b/app/code/core/Mage/Cms/Model/Wysiwyg/Images/Storage.php index 7638a9ce578..0918e0e5a7f 100644 --- a/app/code/core/Mage/Cms/Model/Wysiwyg/Images/Storage.php +++ b/app/code/core/Mage/Cms/Model/Wysiwyg/Images/Storage.php @@ -222,7 +222,6 @@ public function createDirectory($name, $path) * Recursively delete directory from storage * * @param string $path Target dir - * @return void */ public function deleteDirectory($path) { diff --git a/app/code/core/Mage/ConfigurableSwatches/Helper/List/Price.php b/app/code/core/Mage/ConfigurableSwatches/Helper/List/Price.php index 530eaf169cf..1889b96c071 100644 --- a/app/code/core/Mage/ConfigurableSwatches/Helper/List/Price.php +++ b/app/code/core/Mage/ConfigurableSwatches/Helper/List/Price.php @@ -41,7 +41,6 @@ class Mage_ConfigurableSwatches_Helper_List_Price extends Mage_Core_Helper_Abstr * * @param array $products * @param int $storeId - * @return void */ public function attachConfigurableProductChildrenPricesMapping(array $products, $storeId = null) { diff --git a/app/code/core/Mage/ConfigurableSwatches/Helper/Mediafallback.php b/app/code/core/Mage/ConfigurableSwatches/Helper/Mediafallback.php index d9505b6f4a4..902924a7678 100644 --- a/app/code/core/Mage/ConfigurableSwatches/Helper/Mediafallback.php +++ b/app/code/core/Mage/ConfigurableSwatches/Helper/Mediafallback.php @@ -39,7 +39,6 @@ class Mage_ConfigurableSwatches_Helper_Mediafallback extends Mage_Core_Helper_Ab * @param array $parentProducts * @deprecated use $this->attachProductChildrenAttributeMapping() instead * @param int $storeId - * @return void */ public function attachConfigurableProductChildrenAttributeMapping(array $parentProducts, $storeId) { @@ -54,7 +53,6 @@ public function attachConfigurableProductChildrenAttributeMapping(array $parentP * @param array $parentProducts * @param int $storeId * @param bool $onlyListAttributes - * @return void */ public function attachProductChildrenAttributeMapping(array $parentProducts, $storeId, $onlyListAttributes = false) { @@ -310,7 +308,6 @@ protected function _resizeProductImage($product, $type, $keepFrame, $image = nul * Groups media gallery images by local images and child images * * @param Mage_Catalog_Model_Product $product - * @return void */ public function groupMediaGalleryImages(Mage_Catalog_Model_Product $product) { @@ -343,7 +340,6 @@ public function groupMediaGalleryImages(Mage_Catalog_Model_Product $product) * * @param array $products * @param int $storeId - * @return void */ public function attachGallerySetToCollection(array $products, $storeId) { @@ -433,7 +429,6 @@ protected function _getChildrenProductsAttributes() * * @param array $products * @param int $storeId - * @return void */ public function attachChildrenProducts(array $products, $storeId) { diff --git a/app/code/core/Mage/ConfigurableSwatches/Helper/Productimg.php b/app/code/core/Mage/ConfigurableSwatches/Helper/Productimg.php index b1dbb32e3c1..ab1a52dd3a1 100644 --- a/app/code/core/Mage/ConfigurableSwatches/Helper/Productimg.php +++ b/app/code/core/Mage/ConfigurableSwatches/Helper/Productimg.php @@ -93,7 +93,6 @@ public function getProductImgByLabel($text, $product, $type = null) * * @param Mage_Catalog_Model_Product $product * @param array|null $preValues - * @return void */ public function indexProductImages($product, $preValues = null) { diff --git a/app/code/core/Mage/ConfigurableSwatches/Helper/Productlist.php b/app/code/core/Mage/ConfigurableSwatches/Helper/Productlist.php index c97e8ce91e6..0b0e9866863 100644 --- a/app/code/core/Mage/ConfigurableSwatches/Helper/Productlist.php +++ b/app/code/core/Mage/ConfigurableSwatches/Helper/Productlist.php @@ -54,7 +54,6 @@ class Mage_ConfigurableSwatches_Helper_Productlist extends Mage_Core_Helper_Abst * Convert a catalog layer block with the right templates * * @param string $blockName - * @return void */ public function convertLayerBlock($blockName) { diff --git a/app/code/core/Mage/Core/Controller/Varien/Router/Standard.php b/app/code/core/Mage/Core/Controller/Varien/Router/Standard.php index 74895205abf..debd92b24df 100644 --- a/app/code/core/Mage/Core/Controller/Varien/Router/Standard.php +++ b/app/code/core/Mage/Core/Controller/Varien/Router/Standard.php @@ -492,7 +492,6 @@ public function rewrite(array $p) * * @param Mage_Core_Controller_Request_Http $request * @param string $path - * @return void */ protected function _checkShouldBeSecure($request, $path = '') { diff --git a/app/code/core/Mage/Core/Model/Domainpolicy.php b/app/code/core/Mage/Core/Model/Domainpolicy.php index 0c40aa0f741..622f2794954 100644 --- a/app/code/core/Mage/Core/Model/Domainpolicy.php +++ b/app/code/core/Mage/Core/Model/Domainpolicy.php @@ -71,7 +71,7 @@ public function __construct($options = array()) /** * Add X-Frame-Options header to response, depends on config settings * - * @var Varien_Event_Observer $observer + * @param Varien_Event_Observer $observer * @return $this */ public function addDomainPolicyHeader(Varien_Event_Observer $observer) diff --git a/app/code/core/Mage/Core/Model/Logger.php b/app/code/core/Mage/Core/Model/Logger.php index 4c1b96324d6..0e2aff133f4 100644 --- a/app/code/core/Mage/Core/Model/Logger.php +++ b/app/code/core/Mage/Core/Model/Logger.php @@ -38,7 +38,6 @@ class Mage_Core_Model_Logger * @param int $level * @param string $file * @param bool $forceLog - * @return void */ public function log($message, $level = null, $file = '', $forceLog = false) { @@ -49,7 +48,6 @@ public function log($message, $level = null, $file = '', $forceLog = false) * Log exception wrapper * * @param Exception $e - * @return void */ public function logException(Exception $e) { diff --git a/app/code/core/Mage/Core/Model/Resource/Email/Queue/Collection.php b/app/code/core/Mage/Core/Model/Resource/Email/Queue/Collection.php index 611768ff5c8..050d301cb5b 100644 --- a/app/code/core/Mage/Core/Model/Resource/Email/Queue/Collection.php +++ b/app/code/core/Mage/Core/Model/Resource/Email/Queue/Collection.php @@ -35,8 +35,6 @@ class Mage_Core_Model_Resource_Email_Queue_Collection extends Mage_Core_Model_Re { /** * Internal constructor - * - * @return null */ protected function _construct() { diff --git a/app/code/core/Mage/Core/Model/Resource/Setup/Query/Modifier.php b/app/code/core/Mage/Core/Model/Resource/Setup/Query/Modifier.php index 5fa2d2b2533..e2a1169686e 100644 --- a/app/code/core/Mage/Core/Model/Resource/Setup/Query/Modifier.php +++ b/app/code/core/Mage/Core/Model/Resource/Setup/Query/Modifier.php @@ -52,7 +52,6 @@ class Mage_Core_Model_Resource_Setup_Query_Modifier * Inits query modifier * * @param Varien_Db_Adapter_Pdo_Mysql|array $args - * @return void */ public function __construct($args) { diff --git a/app/code/core/Mage/Core/Model/Store.php b/app/code/core/Mage/Core/Model/Store.php index 2335bc25be4..f70810a0e13 100644 --- a/app/code/core/Mage/Core/Model/Store.php +++ b/app/code/core/Mage/Core/Model/Store.php @@ -40,8 +40,8 @@ * @method string getLanguageCode() * @method string getLocaleCode() * @method $this setName(string $value) - * @method $thissetRootCategoryPath(string $value) * @method $this setRootCategory(Mage_Catalog_Model_Category $value) + * @method $this setRootCategoryPath(string $value) * @method int getSortOrder() * @method $this setSortOrder(int $value) * @method int getStoreId() diff --git a/app/code/core/Mage/Core/Model/Translate/Inline.php b/app/code/core/Mage/Core/Model/Translate/Inline.php index 83eb5f16557..c5eb9eac959 100644 --- a/app/code/core/Mage/Core/Model/Translate/Inline.php +++ b/app/code/core/Mage/Core/Model/Translate/Inline.php @@ -364,7 +364,6 @@ protected function _tagAttributes() * Prepare tags inline translates for the content * * @param string $content - * @return void */ protected function _prepareTagAttributesForContent(&$content) { diff --git a/app/code/core/Mage/CurrencySymbol/Model/System/Currencysymbol.php b/app/code/core/Mage/CurrencySymbol/Model/System/Currencysymbol.php index 919f55339bd..dbc6ebe90fa 100644 --- a/app/code/core/Mage/CurrencySymbol/Model/System/Currencysymbol.php +++ b/app/code/core/Mage/CurrencySymbol/Model/System/Currencysymbol.php @@ -72,7 +72,7 @@ class Mage_CurrencySymbol_Model_System_Currencysymbol const XML_PATH_CUSTOM_CURRENCY_SYMBOL = 'currency/options/customsymbol'; const XML_PATH_ALLOWED_CURRENCIES = 'currency/options/allow'; - /* + /** * Separator used in config in allowed currencies list */ const ALLOWED_CURRENCIES_CONFIG_SEPARATOR = ','; diff --git a/app/code/core/Mage/Customer/Model/Address/Abstract.php b/app/code/core/Mage/Customer/Model/Address/Abstract.php index 0e636efeba4..50b5714b897 100644 --- a/app/code/core/Mage/Customer/Model/Address/Abstract.php +++ b/app/code/core/Mage/Customer/Model/Address/Abstract.php @@ -451,8 +451,6 @@ public function validate() /** * Perform basic validation - * - * @return void */ protected function _basicCheck() { diff --git a/app/code/core/Mage/Customer/Model/Customer/Attribute/Backend/Billing.php b/app/code/core/Mage/Customer/Model/Customer/Attribute/Backend/Billing.php index 7d7baf7a1aa..821c5289489 100644 --- a/app/code/core/Mage/Customer/Model/Customer/Attribute/Backend/Billing.php +++ b/app/code/core/Mage/Customer/Model/Customer/Attribute/Backend/Billing.php @@ -35,6 +35,7 @@ class Mage_Customer_Model_Customer_Attribute_Backend_Billing extends Mage_Eav_Mo { /** * @param Mage_Customer_Model_Customer $object + * @return $this */ public function beforeSave($object) { @@ -47,6 +48,7 @@ public function beforeSave($object) /** * @param Mage_Customer_Model_Customer $object + * @return $this */ public function afterSave($object) { diff --git a/app/code/core/Mage/Customer/Model/Customer/Attribute/Backend/Shipping.php b/app/code/core/Mage/Customer/Model/Customer/Attribute/Backend/Shipping.php index 193551c93fe..25889bf5031 100644 --- a/app/code/core/Mage/Customer/Model/Customer/Attribute/Backend/Shipping.php +++ b/app/code/core/Mage/Customer/Model/Customer/Attribute/Backend/Shipping.php @@ -35,6 +35,7 @@ class Mage_Customer_Model_Customer_Attribute_Backend_Shipping extends Mage_Eav_M { /** * @param Mage_Customer_Model_Customer $object + * @return $this */ public function beforeSave($object) { @@ -47,6 +48,7 @@ public function beforeSave($object) /** * @param Mage_Customer_Model_Customer $object + * @return $this */ public function afterSave($object) { diff --git a/app/code/core/Mage/Customer/Model/Resource/Setup.php b/app/code/core/Mage/Customer/Model/Resource/Setup.php index f93dd08f4dc..d959e1c9408 100644 --- a/app/code/core/Mage/Customer/Model/Resource/Setup.php +++ b/app/code/core/Mage/Customer/Model/Resource/Setup.php @@ -58,8 +58,6 @@ protected function _prepareValues($attr) /** * Add customer attributes to customer forms - * - * @return void */ public function installCustomerForms() { diff --git a/app/code/core/Mage/Dataflow/Model/Resource/Profile.php b/app/code/core/Mage/Dataflow/Model/Resource/Profile.php index 44e3062d223..a6a629444aa 100644 --- a/app/code/core/Mage/Dataflow/Model/Resource/Profile.php +++ b/app/code/core/Mage/Dataflow/Model/Resource/Profile.php @@ -46,7 +46,7 @@ protected function _construct() /** * Setting up created_at and updarted_at * - * @param Mage_Core_Model_Abstract $object + * @inheritDoc */ protected function _beforeSave(Mage_Core_Model_Abstract $object) { diff --git a/app/code/core/Mage/Directory/Helper/Data.php b/app/code/core/Mage/Directory/Helper/Data.php index 66da13e8001..c6671fb1247 100644 --- a/app/code/core/Mage/Directory/Helper/Data.php +++ b/app/code/core/Mage/Directory/Helper/Data.php @@ -36,12 +36,12 @@ class Mage_Directory_Helper_Data extends Mage_Core_Helper_Abstract */ const OPTIONAL_ZIP_COUNTRIES_CONFIG_PATH = 'general/country/optional_zip_countries'; - /* + /** * Path to config value, which lists countries, for which state is required. */ const XML_PATH_STATES_REQUIRED = 'general/region/state_required'; - /* + /** * Path to config value, which detects whether or not display the state for the country, if it is not required */ const XML_PATH_DISPLAY_ALL_STATES = 'general/region/display_all'; diff --git a/app/code/core/Mage/Directory/Model/Resource/Currency/Collection.php b/app/code/core/Mage/Directory/Model/Resource/Currency/Collection.php index cd705c6fd8c..4d8be149511 100644 --- a/app/code/core/Mage/Directory/Model/Resource/Currency/Collection.php +++ b/app/code/core/Mage/Directory/Model/Resource/Currency/Collection.php @@ -50,8 +50,6 @@ class Mage_Directory_Model_Resource_Currency_Collection extends Mage_Core_Model_ /** * Define resource model and tables - * - * @return void */ protected function _construct() { diff --git a/app/code/core/Mage/Downloadable/Model/Link/Api/Uploader.php b/app/code/core/Mage/Downloadable/Model/Link/Api/Uploader.php index fee165ad4ed..cf3bde647e9 100644 --- a/app/code/core/Mage/Downloadable/Model/Link/Api/Uploader.php +++ b/app/code/core/Mage/Downloadable/Model/Link/Api/Uploader.php @@ -66,7 +66,6 @@ public function __construct($file) * * @throws Exception * @param array $fileInfo - * @return void */ private function _setUploadFile($fileInfo) { diff --git a/app/code/core/Mage/Downloadable/Model/Link/Api/V2.php b/app/code/core/Mage/Downloadable/Model/Link/Api/V2.php index 63cdeb90fb1..d35f1b80f99 100644 --- a/app/code/core/Mage/Downloadable/Model/Link/Api/V2.php +++ b/app/code/core/Mage/Downloadable/Model/Link/Api/V2.php @@ -37,7 +37,6 @@ class Mage_Downloadable_Model_Link_Api_V2 extends Mage_Downloadable_Model_Link_A * Clean the object, leave only property values * * @param object $var - * @return void */ protected function _prepareData(&$var) { diff --git a/app/code/core/Mage/Eav/Model/Convert/Adapter/Entity.php b/app/code/core/Mage/Eav/Model/Convert/Adapter/Entity.php index ccf8090c3c5..61aabdcca04 100644 --- a/app/code/core/Mage/Eav/Model/Convert/Adapter/Entity.php +++ b/app/code/core/Mage/Eav/Model/Convert/Adapter/Entity.php @@ -253,7 +253,6 @@ public function setJoinAttr($joinAttr) * 'joinType' => 'LEFT' * ) * NOTE: Optional key must be have NULL at least - * @return void */ public function setJoinField($joinField) { diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Abstract.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Abstract.php index 1cf589683e1..09d5d3c41b6 100644 --- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Abstract.php +++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Abstract.php @@ -161,8 +161,6 @@ public function loadByCode($entityType, $code) /** * Mark current attribute as passed validation - * - * @return void */ public function setAttributeValidationAsPassed() { diff --git a/app/code/core/Mage/GiftMessage/Model/Api.php b/app/code/core/Mage/GiftMessage/Model/Api.php index 3713cf5fcae..13f4a8b6292 100644 --- a/app/code/core/Mage/GiftMessage/Model/Api.php +++ b/app/code/core/Mage/GiftMessage/Model/Api.php @@ -155,14 +155,14 @@ public function setForQuoteProduct($quoteId, $productsAndMessages, $store = null /** * Set GiftMessage for a QuoteItem by its Id. * - * @param String $quoteItemId + * @param string $quoteItemId * @param array[] $giftMessage - * @param String $store + * @param string $store * @return array[] */ public function setForQuoteItem($quoteItemId, $giftMessage, $store = null) { - /** @var Mage_Sales_Model_Quote_Item $quote */ + /** @var Mage_Sales_Model_Quote_Item $quoteItem */ $quoteItem = Mage::getModel('sales/quote_item')->load($quoteItemId); if (is_null($quoteItem->getId())) { $this->_fault("quote_item_not_exists"); diff --git a/app/code/core/Mage/GoogleAnalytics/Helper/Data.php b/app/code/core/Mage/GoogleAnalytics/Helper/Data.php index dbc4f5f1555..22941001208 100644 --- a/app/code/core/Mage/GoogleAnalytics/Helper/Data.php +++ b/app/code/core/Mage/GoogleAnalytics/Helper/Data.php @@ -42,12 +42,12 @@ class Mage_GoogleAnalytics_Helper_Data extends Mage_Core_Helper_Abstract const XML_PATH_ANONYMIZATION = 'google/analytics/anonymization'; /** - * @var classic google analytics tracking code + * @var string classic google analytics tracking code */ const TYPE_ANALYTICS = 'analytics'; /** - * @var google analytics universal tracking code + * @var string google analytics universal tracking code */ const TYPE_UNIVERSAL = 'universal'; diff --git a/app/code/core/Mage/ImportExport/Block/Adminhtml/Export/Edit.php b/app/code/core/Mage/ImportExport/Block/Adminhtml/Export/Edit.php index c513673916f..27e58f58b73 100644 --- a/app/code/core/Mage/ImportExport/Block/Adminhtml/Export/Edit.php +++ b/app/code/core/Mage/ImportExport/Block/Adminhtml/Export/Edit.php @@ -35,8 +35,6 @@ class Mage_ImportExport_Block_Adminhtml_Export_Edit extends Mage_Adminhtml_Block { /** * Constructor - * - * @return void */ public function __construct() { @@ -49,8 +47,6 @@ public function __construct() /** * Internal constructor - * - * @return void */ protected function _construct() { diff --git a/app/code/core/Mage/ImportExport/Block/Adminhtml/Export/Filter.php b/app/code/core/Mage/ImportExport/Block/Adminhtml/Export/Filter.php index efdc4f5e70a..511f65e96e7 100644 --- a/app/code/core/Mage/ImportExport/Block/Adminhtml/Export/Filter.php +++ b/app/code/core/Mage/ImportExport/Block/Adminhtml/Export/Filter.php @@ -44,8 +44,6 @@ class Mage_ImportExport_Block_Adminhtml_Export_Filter extends Mage_Adminhtml_Blo /** * Set grid parameters. - * - * @return void */ public function __construct() { diff --git a/app/code/core/Mage/ImportExport/Block/Adminhtml/Import/Edit.php b/app/code/core/Mage/ImportExport/Block/Adminhtml/Import/Edit.php index 12189d4b9f9..201cf052790 100644 --- a/app/code/core/Mage/ImportExport/Block/Adminhtml/Import/Edit.php +++ b/app/code/core/Mage/ImportExport/Block/Adminhtml/Import/Edit.php @@ -35,8 +35,6 @@ class Mage_ImportExport_Block_Adminhtml_Import_Edit extends Mage_Adminhtml_Block { /** * Constructor - * - * @return void */ public function __construct() { @@ -51,8 +49,6 @@ public function __construct() /** * Internal constructor - * - * @return void */ protected function _construct() { diff --git a/app/code/core/Mage/ImportExport/Model/Export/Adapter/Abstract.php b/app/code/core/Mage/ImportExport/Model/Export/Adapter/Abstract.php index bd88bd8f450..84a686b7037 100644 --- a/app/code/core/Mage/ImportExport/Model/Export/Adapter/Abstract.php +++ b/app/code/core/Mage/ImportExport/Model/Export/Adapter/Abstract.php @@ -63,7 +63,6 @@ abstract class Mage_ImportExport_Model_Export_Adapter_Abstract * * @param string $destination OPTIONAL Destination file path. * @throws Exception - * @return void */ final public function __construct($destination = null) { diff --git a/app/code/core/Mage/ImportExport/Model/Export/Entity/Abstract.php b/app/code/core/Mage/ImportExport/Model/Export/Entity/Abstract.php index f278cca0e70..9fd04f27a34 100644 --- a/app/code/core/Mage/ImportExport/Model/Export/Entity/Abstract.php +++ b/app/code/core/Mage/ImportExport/Model/Export/Entity/Abstract.php @@ -178,8 +178,6 @@ abstract class Mage_ImportExport_Model_Export_Entity_Abstract /** * Constructor. - * - * @return void */ public function __construct() { diff --git a/app/code/core/Mage/ImportExport/Model/Export/Entity/Customer.php b/app/code/core/Mage/ImportExport/Model/Export/Entity/Customer.php index 2ad1ca6a221..30a4e17db17 100644 --- a/app/code/core/Mage/ImportExport/Model/Export/Entity/Customer.php +++ b/app/code/core/Mage/ImportExport/Model/Export/Entity/Customer.php @@ -77,8 +77,6 @@ class Mage_ImportExport_Model_Export_Entity_Customer extends Mage_ImportExport_M /** * Constructor. - * - * @return void */ public function __construct() { @@ -157,8 +155,6 @@ public function exportFile() /** * Prepare data for export and write its to temporary file through writer. - * - * @return void */ protected function _prepareExport() { diff --git a/app/code/core/Mage/ImportExport/Model/Export/Entity/Product.php b/app/code/core/Mage/ImportExport/Model/Export/Entity/Product.php index 6ac8e3eb6d9..3cc4f5fbaff 100644 --- a/app/code/core/Mage/ImportExport/Model/Export/Entity/Product.php +++ b/app/code/core/Mage/ImportExport/Model/Export/Entity/Product.php @@ -117,8 +117,6 @@ class Mage_ImportExport_Model_Export_Entity_Product extends Mage_ImportExport_Mo /** * Constructor. - * - * @return void */ public function __construct() { @@ -590,7 +588,6 @@ protected function _prepareExport() //Execution time may be very long set_time_limit(0); - /** @var Mage_Catalog_Model_Resource_Product_Collection $collection */ $validAttrCodes = $this->_getExportAttrCodes(); $writer = $this->getWriter(); $defaultStoreId = Mage_Catalog_Model_Abstract::DEFAULT_STORE_ID; diff --git a/app/code/core/Mage/ImportExport/Model/Import.php b/app/code/core/Mage/ImportExport/Model/Import.php index 3afbbb98f04..7db3584e681 100644 --- a/app/code/core/Mage/ImportExport/Model/Import.php +++ b/app/code/core/Mage/ImportExport/Model/Import.php @@ -342,8 +342,6 @@ public function isImportAllowed() /** * Import source file structure to DB. - * - * @return void */ public function expandSource() { diff --git a/app/code/core/Mage/ImportExport/Model/Import/Adapter/Abstract.php b/app/code/core/Mage/ImportExport/Model/Import/Adapter/Abstract.php index 6b36cc8fec2..510290248ca 100644 --- a/app/code/core/Mage/ImportExport/Model/Import/Adapter/Abstract.php +++ b/app/code/core/Mage/ImportExport/Model/Import/Adapter/Abstract.php @@ -73,7 +73,6 @@ abstract class Mage_ImportExport_Model_Import_Adapter_Abstract implements Seekab * * @param string $source Source file path. * @throws Mage_Core_Exception - * @return void */ final public function __construct($source) { @@ -157,7 +156,6 @@ public function key() * Seeks to a position. * * @param int $position The position to seek to. - * @return void */ #[\ReturnTypeWillChange] public function seek($position) diff --git a/app/code/core/Mage/ImportExport/Model/Import/Entity/Abstract.php b/app/code/core/Mage/ImportExport/Model/Import/Entity/Abstract.php index bae315bcbfb..8296a296fe7 100644 --- a/app/code/core/Mage/ImportExport/Model/Import/Entity/Abstract.php +++ b/app/code/core/Mage/ImportExport/Model/Import/Entity/Abstract.php @@ -195,8 +195,6 @@ abstract class Mage_ImportExport_Model_Import_Entity_Abstract /** * Constructor. - * - * @return void */ public function __construct() { diff --git a/app/code/core/Mage/ImportExport/Model/Import/Entity/Customer.php b/app/code/core/Mage/ImportExport/Model/Import/Entity/Customer.php index bdde4bb50be..85ec1c34096 100644 --- a/app/code/core/Mage/ImportExport/Model/Import/Entity/Customer.php +++ b/app/code/core/Mage/ImportExport/Model/Import/Entity/Customer.php @@ -216,8 +216,6 @@ class Mage_ImportExport_Model_Import_Entity_Customer extends Mage_ImportExport_M /** * Constructor. - * - * @return void */ public function __construct() { diff --git a/app/code/core/Mage/ImportExport/Model/Import/Entity/Customer/Address.php b/app/code/core/Mage/ImportExport/Model/Import/Entity/Customer/Address.php index 1f3a1eff267..c5840cec1fa 100644 --- a/app/code/core/Mage/ImportExport/Model/Import/Entity/Customer/Address.php +++ b/app/code/core/Mage/ImportExport/Model/Import/Entity/Customer/Address.php @@ -137,7 +137,6 @@ class Mage_ImportExport_Model_Import_Entity_Customer_Address extends Mage_Import * Constructor. * * @param Mage_ImportExport_Model_Import_Entity_Customer $customer - * @return void */ public function __construct(Mage_ImportExport_Model_Import_Entity_Customer $customer) { diff --git a/app/code/core/Mage/ImportExport/Model/Import/Entity/Product/Type/Abstract.php b/app/code/core/Mage/ImportExport/Model/Import/Entity/Product/Type/Abstract.php index 8b57a9a9e04..765e051d32c 100644 --- a/app/code/core/Mage/ImportExport/Model/Import/Entity/Product/Type/Abstract.php +++ b/app/code/core/Mage/ImportExport/Model/Import/Entity/Product/Type/Abstract.php @@ -162,7 +162,6 @@ protected function _initAttributes() foreach (Mage::getResourceModel('eav/entity_attribute_set_collection') ->setEntityTypeFilter($this->_entityModel->getEntityTypeId()) as $attributeSet) { - /** @var Mage_Eav_Model_Entity_Attribute_Set $attributeSet */ foreach (Mage::getResourceModel('catalog/product_attribute_collection') ->setAttributeSetFilter($attributeSet->getId()) as $attribute) { /** @var Mage_Eav_Model_Entity_Attribute $attribute */ diff --git a/app/code/core/Mage/ImportExport/Model/Import/Proxy/Product.php b/app/code/core/Mage/ImportExport/Model/Import/Proxy/Product.php index e5ba684de19..35fca979c7e 100644 --- a/app/code/core/Mage/ImportExport/Model/Import/Proxy/Product.php +++ b/app/code/core/Mage/ImportExport/Model/Import/Proxy/Product.php @@ -35,8 +35,6 @@ class Mage_ImportExport_Model_Import_Proxy_Product extends Mage_Catalog_Model_Pr { /** * DO NOT Initialize resources. - * - * @return void */ protected function _construct() { diff --git a/app/code/core/Mage/ImportExport/controllers/Adminhtml/ExportController.php b/app/code/core/Mage/ImportExport/controllers/Adminhtml/ExportController.php index 0b89739d991..04e26c11e52 100644 --- a/app/code/core/Mage/ImportExport/controllers/Adminhtml/ExportController.php +++ b/app/code/core/Mage/ImportExport/controllers/Adminhtml/ExportController.php @@ -35,8 +35,6 @@ class Mage_ImportExport_Adminhtml_ExportController extends Mage_Adminhtml_Contro { /** * Custom constructor. - * - * @return void */ protected function _construct() { @@ -103,8 +101,6 @@ public function exportAction() /** * Index action. - * - * @return void */ public function indexAction() { @@ -117,8 +113,6 @@ public function indexAction() /** * Get grid-filter of entity attributes action. - * - * @return void */ public function getFilterAction() { diff --git a/app/code/core/Mage/ImportExport/controllers/Adminhtml/ImportController.php b/app/code/core/Mage/ImportExport/controllers/Adminhtml/ImportController.php index ead258551fc..9fbf9ff2a7e 100644 --- a/app/code/core/Mage/ImportExport/controllers/Adminhtml/ImportController.php +++ b/app/code/core/Mage/ImportExport/controllers/Adminhtml/ImportController.php @@ -35,8 +35,6 @@ class Mage_ImportExport_Adminhtml_ImportController extends Mage_Adminhtml_Contro { /** * Custom constructor. - * - * @return void */ protected function _construct() { @@ -70,8 +68,6 @@ protected function _isAllowed() /** * Index action. - * - * @return void */ public function indexAction() { @@ -88,8 +84,6 @@ public function indexAction() /** * Start import process action. - * - * @return void */ public function startAction() { @@ -122,8 +116,6 @@ public function startAction() /** * Validate uploaded files action. - * - * @return void */ public function validateAction() { diff --git a/app/code/core/Mage/Index/Model/Indexer.php b/app/code/core/Mage/Index/Model/Indexer.php index 53e0cf47692..d2b46a63873 100644 --- a/app/code/core/Mage/Index/Model/Indexer.php +++ b/app/code/core/Mage/Index/Model/Indexer.php @@ -343,7 +343,6 @@ public function processEntityAction(Varien_Object $entity, $entityType, $eventTy * * @param string $method * @param array $args - * @return void */ protected function _runAll($method, $args) { diff --git a/app/code/core/Mage/Index/Model/Process.php b/app/code/core/Mage/Index/Model/Process.php index 957183f8dd1..8dcb5349a3c 100644 --- a/app/code/core/Mage/Index/Model/Process.php +++ b/app/code/core/Mage/Index/Model/Process.php @@ -382,8 +382,8 @@ protected function _processEventsCollection( $skipUnmatched = true ) { // We can't reload the collection because of transaction - /** @var Mage_Index_Model_Event $event */ while ($event = $eventsCollection->fetchItem()) { + /** @var Mage_Index_Model_Event $event */ try { $this->processEvent($event); if (!$skipUnmatched) { diff --git a/app/code/core/Mage/Oauth/Model/Consumer.php b/app/code/core/Mage/Oauth/Model/Consumer.php index e973fc87421..f1d4644bd94 100644 --- a/app/code/core/Mage/Oauth/Model/Consumer.php +++ b/app/code/core/Mage/Oauth/Model/Consumer.php @@ -63,8 +63,6 @@ class Mage_Oauth_Model_Consumer extends Mage_Core_Model_Abstract /** * Initialize resource model - * - * @return void */ protected function _construct() { diff --git a/app/code/core/Mage/Oauth/Model/Nonce.php b/app/code/core/Mage/Oauth/Model/Nonce.php index 5fc3f70c6a3..273a823ac4d 100644 --- a/app/code/core/Mage/Oauth/Model/Nonce.php +++ b/app/code/core/Mage/Oauth/Model/Nonce.php @@ -42,8 +42,6 @@ class Mage_Oauth_Model_Nonce extends Mage_Core_Model_Abstract { /** * Initialize resource model - * - * @return void */ protected function _construct() { diff --git a/app/code/core/Mage/Oauth/Model/Resource/Consumer.php b/app/code/core/Mage/Oauth/Model/Resource/Consumer.php index 5b135ec1aee..72a277767f5 100644 --- a/app/code/core/Mage/Oauth/Model/Resource/Consumer.php +++ b/app/code/core/Mage/Oauth/Model/Resource/Consumer.php @@ -35,8 +35,6 @@ class Mage_Oauth_Model_Resource_Consumer extends Mage_Core_Model_Resource_Db_Abs { /** * Initialize resource model - * - * @return void */ protected function _construct() { diff --git a/app/code/core/Mage/Oauth/Model/Resource/Consumer/Collection.php b/app/code/core/Mage/Oauth/Model/Resource/Consumer/Collection.php index 42bd5abb422..4d2dd5cde62 100644 --- a/app/code/core/Mage/Oauth/Model/Resource/Consumer/Collection.php +++ b/app/code/core/Mage/Oauth/Model/Resource/Consumer/Collection.php @@ -35,8 +35,6 @@ class Mage_Oauth_Model_Resource_Consumer_Collection extends Mage_Core_Model_Reso { /** * Initialize collection model - * - * @return void */ protected function _construct() { diff --git a/app/code/core/Mage/Oauth/Model/Resource/Nonce.php b/app/code/core/Mage/Oauth/Model/Resource/Nonce.php index 941d3a40915..04f6c297337 100644 --- a/app/code/core/Mage/Oauth/Model/Resource/Nonce.php +++ b/app/code/core/Mage/Oauth/Model/Resource/Nonce.php @@ -35,8 +35,6 @@ class Mage_Oauth_Model_Resource_Nonce extends Mage_Core_Model_Resource_Db_Abstra { /** * Initialize resource model - * - * @return void */ protected function _construct() { diff --git a/app/code/core/Mage/Oauth/Model/Resource/Nonce/Collection.php b/app/code/core/Mage/Oauth/Model/Resource/Nonce/Collection.php index b96870f19ea..3ff2db0cf60 100644 --- a/app/code/core/Mage/Oauth/Model/Resource/Nonce/Collection.php +++ b/app/code/core/Mage/Oauth/Model/Resource/Nonce/Collection.php @@ -35,8 +35,6 @@ class Mage_Oauth_Model_Resource_Nonce_Collection extends Mage_Core_Model_Resourc { /** * Initialize collection model - * - * @return void */ protected function _construct() { diff --git a/app/code/core/Mage/Oauth/Model/Resource/Token.php b/app/code/core/Mage/Oauth/Model/Resource/Token.php index 688b82a3522..a421d8ffce5 100644 --- a/app/code/core/Mage/Oauth/Model/Resource/Token.php +++ b/app/code/core/Mage/Oauth/Model/Resource/Token.php @@ -35,8 +35,6 @@ class Mage_Oauth_Model_Resource_Token extends Mage_Core_Model_Resource_Db_Abstra { /** * Initialize resource model - * - * @return void */ protected function _construct() { diff --git a/app/code/core/Mage/Oauth/Model/Resource/Token/Collection.php b/app/code/core/Mage/Oauth/Model/Resource/Token/Collection.php index 93384eca05a..a883cef7f89 100644 --- a/app/code/core/Mage/Oauth/Model/Resource/Token/Collection.php +++ b/app/code/core/Mage/Oauth/Model/Resource/Token/Collection.php @@ -35,8 +35,6 @@ class Mage_Oauth_Model_Resource_Token_Collection extends Mage_Core_Model_Resourc { /** * Initialize collection model - * - * @return void */ protected function _construct() { diff --git a/app/code/core/Mage/Oauth/Model/Token.php b/app/code/core/Mage/Oauth/Model/Token.php index cbae2ab1d37..cea510ebab9 100644 --- a/app/code/core/Mage/Oauth/Model/Token.php +++ b/app/code/core/Mage/Oauth/Model/Token.php @@ -84,8 +84,6 @@ class Mage_Oauth_Model_Token extends Mage_Core_Model_Abstract /** * Initialize resource model - * - * @return void */ protected function _construct() { diff --git a/app/code/core/Mage/Oauth/controllers/AuthorizeController.php b/app/code/core/Mage/Oauth/controllers/AuthorizeController.php index d905ca404e0..c51f408a899 100644 --- a/app/code/core/Mage/Oauth/controllers/AuthorizeController.php +++ b/app/code/core/Mage/Oauth/controllers/AuthorizeController.php @@ -191,8 +191,6 @@ protected function _initRejectPage($simple = false) /** * Index action. - * - * @return void */ public function indexAction() { @@ -203,8 +201,6 @@ public function indexAction() /** * OAuth authorize or allow decline access simple page - * - * @return void */ public function simpleAction() { diff --git a/app/code/core/Mage/Page/Block/Html/Topmenu/Renderer.php b/app/code/core/Mage/Page/Block/Html/Topmenu/Renderer.php index 022efe5efcd..a6c85c7c030 100644 --- a/app/code/core/Mage/Page/Block/Html/Topmenu/Renderer.php +++ b/app/code/core/Mage/Page/Block/Html/Topmenu/Renderer.php @@ -63,8 +63,6 @@ protected function _toHtml() /** * Add cache tags - * - * @return void */ protected function _addCacheTags() { diff --git a/app/code/core/Mage/PageCache/Helper/Data.php b/app/code/core/Mage/PageCache/Helper/Data.php index 384c5c0885e..fa25abedb15 100644 --- a/app/code/core/Mage/PageCache/Helper/Data.php +++ b/app/code/core/Mage/PageCache/Helper/Data.php @@ -94,8 +94,6 @@ public function getCacheControlInstance() /** * Disable caching on external storage side by setting special cookie - * - * @return void */ public function setNoCacheCookie() { diff --git a/app/code/core/Mage/PageCache/Model/Control/Interface.php b/app/code/core/Mage/PageCache/Model/Control/Interface.php index 7b2a2568cf3..9e1b5e0cf77 100644 --- a/app/code/core/Mage/PageCache/Model/Control/Interface.php +++ b/app/code/core/Mage/PageCache/Model/Control/Interface.php @@ -35,8 +35,6 @@ interface Mage_PageCache_Model_Control_Interface { /** * Clean external cache - * - * @return void */ public function clean(); } diff --git a/app/code/core/Mage/PageCache/Model/Control/Zend.php b/app/code/core/Mage/PageCache/Model/Control/Zend.php index 0b02f9f3549..0a88a0eb41f 100644 --- a/app/code/core/Mage/PageCache/Model/Control/Zend.php +++ b/app/code/core/Mage/PageCache/Model/Control/Zend.php @@ -35,8 +35,6 @@ class Mage_PageCache_Model_Control_Zend implements Mage_PageCache_Model_Control_ { /** * Clean zend server page cache - * - * @return void */ public function clean() { diff --git a/app/code/core/Mage/PageCache/controllers/Adminhtml/PageCacheController.php b/app/code/core/Mage/PageCache/controllers/Adminhtml/PageCacheController.php index 3276f4977a3..fd5ff7aad4b 100644 --- a/app/code/core/Mage/PageCache/controllers/Adminhtml/PageCacheController.php +++ b/app/code/core/Mage/PageCache/controllers/Adminhtml/PageCacheController.php @@ -45,8 +45,6 @@ protected function _getSession() /** * Clean external cache action - * - * @return void */ public function cleanAction() { @@ -69,9 +67,7 @@ public function cleanAction() } /** - * Check current user permission on resource and privilege - * - * @return bool + * @inheritDoc */ protected function _isAllowed() { diff --git a/app/code/core/Mage/Paygate/Model/Authorizenet.php b/app/code/core/Mage/Paygate/Model/Authorizenet.php index 7a8efc3425b..540b63e98b0 100644 --- a/app/code/core/Mage/Paygate/Model/Authorizenet.php +++ b/app/code/core/Mage/Paygate/Model/Authorizenet.php @@ -27,12 +27,12 @@ class Mage_Paygate_Model_Authorizenet extends Mage_Payment_Model_Method_Cc { - /* + /** * AIM gateway url */ const CGI_URL = 'https://secure.authorize.net/gateway/transact.dll'; - /* + /** * Transaction Details gateway url */ const CGI_URL_TD = 'https://api.authorize.net/xml/v1/request.api'; @@ -266,7 +266,7 @@ public function canRefund() /** * Check void availability * - * @param Varien_Object $invoicePayment + * @param Varien_Object $payment * @return bool */ public function canVoid(Varien_Object $payment) @@ -280,7 +280,7 @@ public function canVoid(Varien_Object $payment) /** * Set partial authorization last action state into session * - * @param string $message + * @param string $state * @return $this */ public function setPartialAuthorizationLastActionState($state) @@ -408,8 +408,8 @@ public function cancel(Varien_Object $payment) /** * Refund the amount with transaction id * - * @param Mage_Payment_Model_Info $payment - * @param float $amount + * @param Mage_Payment_Model_Info|Varien_Object $payment + * @param float $requestedAmount * @return $this * @throws Mage_Core_Exception */ @@ -679,7 +679,7 @@ protected function _isPreauthorizeCapture($payment) * Send capture request to gateway for capture authorized transactions * * @param Mage_Payment_Model_Info $payment - * @param float $amount + * @param float $requestedAmount * @return $this */ protected function _preauthorizeCapture($payment, $requestedAmount) @@ -1070,7 +1070,7 @@ public function fetchTransactionInfo(Mage_Payment_Model_Info $payment, $transact * Set split_tender_id to quote payment if neeeded * * @param Varien_Object $response - * @param Mage_Sales_Model_Order_Payment $payment + * @param Mage_Sales_Model_Order_Payment $orderPayment * @return bool */ protected function _processPartialAuthorizationResponse($response, $orderPayment) { @@ -1397,7 +1397,7 @@ protected function _registerCard(Varien_Object $response, Mage_Sales_Model_Order /** * Reset assigned data in payment info model * - * @param Mage_Payment_Model_Info + * @param Mage_Payment_Model_Info $payment * @return $this */ private function _clearAssignedData($payment) diff --git a/app/code/core/Mage/Paygate/Model/Authorizenet/Cards.php b/app/code/core/Mage/Paygate/Model/Authorizenet/Cards.php index 3b9c7c80816..de19dc246a3 100644 --- a/app/code/core/Mage/Paygate/Model/Authorizenet/Cards.php +++ b/app/code/core/Mage/Paygate/Model/Authorizenet/Cards.php @@ -67,7 +67,7 @@ public function setPayment(Mage_Payment_Model_Info $payment) * Add based on $cardInfo card to payment and return Id of new item * * @param mixed $cardInfo - * @return string + * @return Varien_Object */ public function registerCard($cardInfo = array()) { @@ -99,7 +99,7 @@ public function updateCard($card) * Retrieve card by ID * * @param string $cardId - * @return Varien_Object|bool + * @return Varien_Object|false */ public function getCard($cardId) { diff --git a/app/code/core/Mage/Payment/Helper/Data.php b/app/code/core/Mage/Payment/Helper/Data.php index 2a80b781f01..57d10bf9706 100644 --- a/app/code/core/Mage/Payment/Helper/Data.php +++ b/app/code/core/Mage/Payment/Helper/Data.php @@ -84,8 +84,8 @@ public function getStoreMethods($store = null, $quote = null) } /** - * @param $a - * @param $b + * @param object $a + * @param object $b * @return int */ protected function _sortMethods($a, $b) diff --git a/app/code/core/Mage/Payment/Model/Observer.php b/app/code/core/Mage/Payment/Model/Observer.php index 2b352df3f3f..d5f31ce5d67 100644 --- a/app/code/core/Mage/Payment/Model/Observer.php +++ b/app/code/core/Mage/Payment/Model/Observer.php @@ -115,7 +115,6 @@ public function prepareProductRecurringProfileOptions($observer) * Sets current instructions for bank transfer account * * @param Varien_Event_Observer $observer - * @return void */ public function beforeOrderPaymentSave(Varien_Event_Observer $observer) { diff --git a/app/code/core/Mage/Paypal/Block/Adminhtml/Settlement/Report/Grid.php b/app/code/core/Mage/Paypal/Block/Adminhtml/Settlement/Report/Grid.php index fc88599c3b6..d1061dbd143 100644 --- a/app/code/core/Mage/Paypal/Block/Adminhtml/Settlement/Report/Grid.php +++ b/app/code/core/Mage/Paypal/Block/Adminhtml/Settlement/Report/Grid.php @@ -52,8 +52,7 @@ public function __construct() } /** - * Prepare collection for grid - * @return Mage_Paypal_Block_Adminhtml_Settlement_Grid + * @inheritDoc */ protected function _prepareCollection() { @@ -66,8 +65,7 @@ protected function _prepareCollection() } /** - * Prepare grid columns - * @return Mage_Paypal_Block_Adminhtml_Settlement_Grid + * @inheritDoc */ protected function _prepareColumns() { diff --git a/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Global.php b/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Global.php index 822d206b523..0cbb774738a 100644 --- a/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Global.php +++ b/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Global.php @@ -81,7 +81,7 @@ public function getElements() * Get element by id * * @param string $elementId - * @return Varien_Data_Form_Element_Abstract + * @return Varien_Data_Form_Element_Abstract|false */ public function getElement($elementId) { @@ -94,7 +94,7 @@ public function getElement($elementId) /** * Return checkbox html with hidden field for correct config values * - * @param string $elementId + * @param Varien_Data_Form_Element_Abstract $element * @return string */ public function getElementHtml(Varien_Data_Form_Element_Abstract $element) diff --git a/app/code/core/Mage/Paypal/Block/Express/Review.php b/app/code/core/Mage/Paypal/Block/Express/Review.php index 6c783e4a52d..03aaa9b1bad 100644 --- a/app/code/core/Mage/Paypal/Block/Express/Review.php +++ b/app/code/core/Mage/Paypal/Block/Express/Review.php @@ -90,7 +90,7 @@ public function getShippingAddress() /** * Get HTML output for specified address * - * @param Mage_Sales_Model_Quote_Address + * @param Mage_Sales_Model_Quote_Address $address * @return string */ public function renderAddress($address) diff --git a/app/code/core/Mage/Paypal/Block/Payment/Info.php b/app/code/core/Mage/Paypal/Block/Payment/Info.php index 262ae408195..3dd22023627 100644 --- a/app/code/core/Mage/Paypal/Block/Payment/Info.php +++ b/app/code/core/Mage/Paypal/Block/Payment/Info.php @@ -47,6 +47,7 @@ public function getCcTypeName() * * @param Varien_Object|array $transport * return Varien_Object + * @return Varien_Object */ protected function _prepareSpecificInformation($transport = null) { diff --git a/app/code/core/Mage/Paypal/Model/Api/Nvp.php b/app/code/core/Mage/Paypal/Model/Api/Nvp.php index 0a3a6e56aed..02b4e981b7c 100644 --- a/app/code/core/Mage/Paypal/Model/Api/Nvp.php +++ b/app/code/core/Mage/Paypal/Model/Api/Nvp.php @@ -1129,8 +1129,8 @@ protected function _extractErrorsFromResponse($response) /** * Catch success calls and collect warnings * - * @param array - * @return bool| success flag + * @param array $response + * @return bool success flag */ protected function _isCallSuccessful($response) { @@ -1371,7 +1371,7 @@ protected function _filterBillFailedLater($value) * Filter for 'BILLINGPERIOD' and 'TRIALBILLINGPERIOD' * * @param string $value - * @return string + * @return string|void */ protected function _filterPeriodUnit($value) { @@ -1399,7 +1399,7 @@ protected function _filterInitialAmountMayFail($value) * Filter for billing agreement status * * @param string $value - * @return string + * @return string|void */ protected function _filterBillingAgreementStatus($value) { @@ -1413,7 +1413,7 @@ protected function _filterBillingAgreementStatus($value) * Convert payment status from NVP format to paypal/info model format * * @param string $value - * @return string|null + * @return string|void */ protected function _filterPaymentStatusFromNvpToInfo($value) { @@ -1438,7 +1438,7 @@ protected function _filterPaymentStatusFromNvpToInfo($value) * Convert payment review action to NVP-compatible value * * @param string $value - * @return string|null + * @return string|void */ protected function _filterPaymentReviewAction($value) { @@ -1454,7 +1454,7 @@ protected function _filterPaymentReviewAction($value) * Convert RP management action to NVP format * * @param string $value - * @return string|null + * @return string|void */ protected function _filterRecurringProfileActionToNvp($value) { @@ -1499,7 +1499,6 @@ protected function _analyzeRecurringProfileStatus($value, Varien_Object $result) /** * Return capture type * - * @param Varien_Object $payment * @return string */ protected function _getCaptureCompleteType() @@ -1529,7 +1528,7 @@ protected function _prepareEachCallRequest($methodName) /** * Check the EC request against unilateral payments mode and remove the SUBJECT if needed * - * @param &array $requestFields + * @param array $requestFields */ protected function _prepareExpressCheckoutCallRequest(&$requestFields) { diff --git a/app/code/core/Mage/Paypal/Model/Cert.php b/app/code/core/Mage/Paypal/Model/Cert.php index 25f9f7c14e2..5da22a17e4e 100644 --- a/app/code/core/Mage/Paypal/Model/Cert.php +++ b/app/code/core/Mage/Paypal/Model/Cert.php @@ -96,8 +96,6 @@ protected function _createCertFile($file) /** * Check and remove outdated certificate file by website - * - * @return void */ protected function _removeOutdatedCertFile() { diff --git a/app/code/core/Mage/Paypal/Model/Config.php b/app/code/core/Mage/Paypal/Model/Config.php index 77fd60432d8..7921fecfeb7 100644 --- a/app/code/core/Mage/Paypal/Model/Config.php +++ b/app/code/core/Mage/Paypal/Model/Config.php @@ -676,7 +676,7 @@ public function isMethodActive($method) * Check whether method available for checkout or not * Logic based on merchant country, methods dependence * - * @param string $method Method code + * @param string|null $methodCode Method code * @return bool */ public function isMethodAvailable($methodCode = null) @@ -1072,6 +1072,7 @@ public function areButtonsDynamic() * @param string $localeCode * @param float $orderTotal * @param string $pal encrypted summary about merchant + * @return string * @see Paypal_Model_Api_Nvp::callGetPalDetails() */ public function getExpressCheckoutShortcutImageUrl($localeCode, $orderTotal = null, $pal = null) @@ -1101,6 +1102,7 @@ public function getExpressCheckoutShortcutImageUrl($localeCode, $orderTotal = nu * @param float $orderTotal * @param string $pal * @param string $staticSize + * @return string */ public function getPaymentMarkImageUrl($localeCode, $orderTotal = null, $pal = null, $staticSize = null) { @@ -1132,7 +1134,8 @@ public function getPaymentMarkImageUrl($localeCode, $orderTotal = null, $pal = n * Get "What Is PayPal" localized URL * Supposed to be used with "mark" as popup window * - * @param Mage_Core_Model_Locale $locale + * @param Mage_Core_Model_Locale|null $locale + * @return string */ public function getPaymentMarkWhatIsPaypalUrl(Mage_Core_Model_Locale $locale = null) { @@ -1158,6 +1161,7 @@ public function getPaymentMarkWhatIsPaypalUrl(Mage_Core_Model_Locale $locale = n * @param string $localeCode * @param bool $isVertical * @param bool $isEcheck + * @return string */ public function getSolutionImageUrl($localeCode, $isVertical = false, $isEcheck = false) { @@ -1171,6 +1175,7 @@ public function getSolutionImageUrl($localeCode, $isVertical = false, $isEcheck * Getter for Payment form logo images * * @param string $localeCode + * @return string */ public function getPaymentFormLogoUrl($localeCode) { @@ -1515,6 +1520,7 @@ public function exportExpressCheckoutStyleSettings(Varien_Object $to) * @param string $localeCode * @param float $orderTotal * @param string $pal + * @return string */ protected function _getDynamicImageUrl($type, $localeCode, $orderTotal, $pal) { diff --git a/app/code/core/Mage/Paypal/Model/Direct.php b/app/code/core/Mage/Paypal/Model/Direct.php index 87497cfb8e3..6bce67eba15 100644 --- a/app/code/core/Mage/Paypal/Model/Direct.php +++ b/app/code/core/Mage/Paypal/Model/Direct.php @@ -82,6 +82,7 @@ public function __construct($params = array()) * Also updates store ID in config object * * @param Mage_Core_Model_Store|int $store + * @return $this */ public function setStore($store) { @@ -135,7 +136,7 @@ public function getAllowedCcTypes() /** * Check whether payment method can be used - * @param Mage_Sales_Model_Quote + * @param Mage_Sales_Model_Quote|null $quote * @return bool */ public function isAvailable($quote = null) @@ -369,8 +370,8 @@ protected function _getFormattedCcExpirationDate($month, $year) /** * Import direct payment results to payment * - * @param Mage_Paypal_Model_Api_Nvp - * @param Mage_Sales_Model_Order_Payment + * @param Mage_Paypal_Model_Api_Nvp $api + * @param Mage_Sales_Model_Order_Payment $payment */ protected function _importResultToPayment($api, $payment) { diff --git a/app/code/core/Mage/Paypal/Model/Express.php b/app/code/core/Mage/Paypal/Model/Express.php index 2fdceda5415..eea3465bf8a 100644 --- a/app/code/core/Mage/Paypal/Model/Express.php +++ b/app/code/core/Mage/Paypal/Model/Express.php @@ -117,6 +117,7 @@ protected function _setApiProcessableErrors() * Also updates store ID in config object * * @param Mage_Core_Model_Store|int $store + * @return $this */ public function setStore($store) { @@ -167,7 +168,7 @@ public function getConfigPaymentAction() /** * Check whether payment method can be used - * @param Mage_Sales_Model_Quote + * @param Mage_Sales_Model_Quote|null $quote * @return bool */ public function isAvailable($quote = null) @@ -587,8 +588,8 @@ protected function _placeOrder(Mage_Sales_Model_Order_Payment $payment, $amount) /** * Import payment info to payment * - * @param Mage_Paypal_Model_Api_Nvp - * @param Mage_Sales_Model_Order_Payment + * @param Mage_Paypal_Model_Api_Nvp $api + * @param Mage_Sales_Model_Order_Payment $payment */ protected function _importToPayment($api, $payment) { diff --git a/app/code/core/Mage/Paypal/Model/Info.php b/app/code/core/Mage/Paypal/Model/Info.php index db8bfd625e3..5f10f5e520f 100644 --- a/app/code/core/Mage/Paypal/Model/Info.php +++ b/app/code/core/Mage/Paypal/Model/Info.php @@ -408,6 +408,7 @@ public static function isReversalDisputable($code) * @param array $keys * @param Mage_Payment_Model_Info $payment * @param bool $labelValuesOnly + * @return array */ protected function _getFullInfo(array $keys, Mage_Payment_Model_Info $payment, $labelValuesOnly) { @@ -441,6 +442,7 @@ protected function _getFullInfo(array $keys, Mage_Payment_Model_Info $payment, $ * Render info item labels * * @param string $key + * @return string */ protected function _getLabel($key) { diff --git a/app/code/core/Mage/Paypal/Model/Ipn.php b/app/code/core/Mage/Paypal/Model/Ipn.php index 0d322a1a34d..45750cb40f0 100644 --- a/app/code/core/Mage/Paypal/Model/Ipn.php +++ b/app/code/core/Mage/Paypal/Model/Ipn.php @@ -725,7 +725,6 @@ protected function _createIpnComment($comment = '', $addToHistory = false) * Map payment information from IPN to payment object * Returns true if there were changes in information * - * @param Mage_Payment_Model_Info $payment * @return bool */ protected function _importPaymentInformation() @@ -817,8 +816,6 @@ protected function _filterPaymentStatus($ipnPaymentStatus) /** * Log debug data to file - * - * @param mixed $debugData */ protected function _debug() { diff --git a/app/code/core/Mage/Paypal/Model/Method/Agreement.php b/app/code/core/Mage/Paypal/Model/Method/Agreement.php index 53c92fcc63d..e4011fa9088 100644 --- a/app/code/core/Mage/Paypal/Model/Method/Agreement.php +++ b/app/code/core/Mage/Paypal/Model/Method/Agreement.php @@ -82,6 +82,7 @@ public function __construct($params = array()) * Also updates store ID in config object * * @param Mage_Core_Model_Store|int $store + * @return $this */ public function setStore($store) { diff --git a/app/code/core/Mage/Paypal/Model/Observer.php b/app/code/core/Mage/Paypal/Model/Observer.php index 8b4031461f8..1af295ffbdd 100644 --- a/app/code/core/Mage/Paypal/Model/Observer.php +++ b/app/code/core/Mage/Paypal/Model/Observer.php @@ -123,7 +123,6 @@ public function setResponseAfterSaveOrder(Varien_Event_Observer $observer) * Load country dependent PayPal solutions system configuration * * @param Varien_Event_Observer $observer - * @return void */ public function loadCountryDependentSolutionsConfig(Varien_Event_Observer $observer) { diff --git a/app/code/core/Mage/Paypal/Model/Payflowlink.php b/app/code/core/Mage/Paypal/Model/Payflowlink.php index 313d8b9400c..e83b8e9a22d 100644 --- a/app/code/core/Mage/Paypal/Model/Payflowlink.php +++ b/app/code/core/Mage/Paypal/Model/Payflowlink.php @@ -133,7 +133,7 @@ public function validate() /** * Check whether payment method can be used * - * @param Mage_Sales_Model_Quote + * @param Mage_Sales_Model_Quote|null $quote * @return bool */ public function isAvailable($quote = null) @@ -569,7 +569,6 @@ protected function _generateSecureSilentPostHash($payment) * @deprecated since 1.6.2.0 * @param Varien_Object $payment * @param string $txnId - * @return void */ protected function _addTransaction($payment, $txnId) { diff --git a/app/code/core/Mage/Paypal/Model/Payflowpro.php b/app/code/core/Mage/Paypal/Model/Payflowpro.php index 7db26cc805b..b14cd62a04a 100644 --- a/app/code/core/Mage/Paypal/Model/Payflowpro.php +++ b/app/code/core/Mage/Paypal/Model/Payflowpro.php @@ -118,7 +118,7 @@ class Mage_Paypal_Model_Payflowpro extends Mage_Payment_Model_Method_Cc /** * Check whether payment method can be used * - * @param Mage_Sales_Model_Quote + * @param Mage_Sales_Model_Quote|null $quote * @return bool */ public function isAvailable($quote = null) @@ -344,7 +344,7 @@ public function fetchTransactionInfo(Mage_Payment_Model_Info $payment, $transact /** * Check whether the transaction is in payment review status * - * @param string $statusCode + * @param string $status * @return bool */ protected static function _isTransactionUnderReview($status) diff --git a/app/code/core/Mage/Paypal/Model/Payment/Transaction.php b/app/code/core/Mage/Paypal/Model/Payment/Transaction.php index 1a0b8a4d265..214e7cd1665 100644 --- a/app/code/core/Mage/Paypal/Model/Payment/Transaction.php +++ b/app/code/core/Mage/Paypal/Model/Payment/Transaction.php @@ -192,7 +192,8 @@ public function unsAdditionalInformation($key = null) /** * Setter/Getter whether transaction is supposed to prevent exceptions on saving * - * @param bool $failsafe + * @param bool|null $setFailsafe + * @return bool|$this */ public function isFailsafe($setFailsafe = null) { diff --git a/app/code/core/Mage/Paypal/Model/Pro.php b/app/code/core/Mage/Paypal/Model/Pro.php index 354da0f5402..9af26a20d1e 100644 --- a/app/code/core/Mage/Paypal/Model/Pro.php +++ b/app/code/core/Mage/Paypal/Model/Pro.php @@ -78,6 +78,7 @@ class Mage_Paypal_Model_Pro * * @param string $code * @param int|null $storeId + * @return $this */ public function setMethod($code, $storeId = null) { @@ -101,6 +102,7 @@ public function setMethod($code, $storeId = null) * * @param Mage_Paypal_Model_Config $instace * @param int $storeId + * @return $this */ public function setConfig(Mage_Paypal_Model_Config $instace, $storeId = null) { @@ -437,8 +439,8 @@ public function updateRecurringProfileStatus(Mage_Payment_Model_Recurring_Profil /** * Import capture results to payment * - * @param Mage_Paypal_Model_Api_Nvp - * @param Mage_Sales_Model_Order_Payment + * @param Mage_Paypal_Model_Api_Nvp $api + * @param Mage_Sales_Model_Order_Payment $payment */ protected function _importCaptureResultToPayment($api, $payment) { @@ -449,8 +451,8 @@ protected function _importCaptureResultToPayment($api, $payment) /** * Import refund results to payment * - * @param Mage_Paypal_Model_Api_Nvp - * @param Mage_Sales_Model_Order_Payment + * @param Mage_Paypal_Model_Api_Nvp $api + * @param Mage_Sales_Model_Order_Payment $payment * @param bool $canRefundMore */ protected function _importRefundResultToPayment($api, $payment, $canRefundMore) diff --git a/app/code/core/Mage/Paypal/Model/Report/Settlement/Row.php b/app/code/core/Mage/Paypal/Model/Report/Settlement/Row.php index 7e0220a3efa..487ff00847b 100644 --- a/app/code/core/Mage/Paypal/Model/Report/Settlement/Row.php +++ b/app/code/core/Mage/Paypal/Model/Report/Settlement/Row.php @@ -97,7 +97,7 @@ protected function _construct() * Return description of Reference ID Type * If no code specified, return full list of codes with their description * - * @param string code + * @param string|null $code * @return string|array */ public function getReferenceType($code = null) @@ -121,7 +121,7 @@ public function getReferenceType($code = null) /** * Get native description for transaction code * - * @param string code + * @param string $code * @return string */ public function getTransactionEvent($code) @@ -136,7 +136,7 @@ public function getTransactionEvent($code) /** * Get full list of codes with their description * - * @return &array + * @return array */ public function &getTransactionEvents() { @@ -148,7 +148,7 @@ public function &getTransactionEvents() * Return description of "Debit or Credit" value * If no code specified, return full list of codes with their description * - * @param string code + * @param string|null $code * @return string|array */ public function getDebitCreditText($code = null) diff --git a/app/code/core/Mage/Paypal/Model/Resource/Payment/Transaction.php b/app/code/core/Mage/Paypal/Model/Resource/Payment/Transaction.php index 1d389674286..e09b14beb1d 100644 --- a/app/code/core/Mage/Paypal/Model/Resource/Payment/Transaction.php +++ b/app/code/core/Mage/Paypal/Model/Resource/Payment/Transaction.php @@ -115,9 +115,9 @@ protected function _beforeSave(Mage_Core_Model_Abstract $transaction) * Load cell/row by specified unique key parts * * @param string $txnId - * @param mixed (array|string|object) $columns + * @param array|string|object $columns * @param bool $isRow - * @return mixed (array|string) + * @return array|string */ private function _lookupByTxnId($txnId, $columns, $isRow = false) { diff --git a/app/code/core/Mage/Paypal/Model/Standard.php b/app/code/core/Mage/Paypal/Model/Standard.php index 7d444275309..a4ff672a81e 100644 --- a/app/code/core/Mage/Paypal/Model/Standard.php +++ b/app/code/core/Mage/Paypal/Model/Standard.php @@ -151,7 +151,7 @@ public function getStandardCheckoutFormFields() /** * Instantiate state and set it to state object * @param string $paymentAction - * @param Varien_Object + * @param Varien_Object $stateObject */ public function initialize($paymentAction, $stateObject) { @@ -179,7 +179,7 @@ public function getConfig() /** * Check whether payment method can be used - * @param Mage_Sales_Model_Quote + * @param Mage_Sales_Model_Quote|null $quote * @return bool */ public function isAvailable($quote = null) diff --git a/app/code/core/Mage/Paypal/controllers/PayflowadvancedController.php b/app/code/core/Mage/Paypal/controllers/PayflowadvancedController.php index a7a86e6cce9..be04c4c84a0 100644 --- a/app/code/core/Mage/Paypal/controllers/PayflowadvancedController.php +++ b/app/code/core/Mage/Paypal/controllers/PayflowadvancedController.php @@ -57,8 +57,6 @@ class Mage_Paypal_PayflowadvancedController extends Mage_Paypal_Controller_Expre /** * When a customer cancel payment from payflow gateway. - * - * @return void */ public function cancelPaymentAction() { @@ -71,8 +69,6 @@ public function cancelPaymentAction() /** * When a customer return to website from payflow gateway. - * - * @return void */ public function returnUrlAction() { @@ -109,8 +105,6 @@ public function returnUrlAction() /** * Submit transaction to Payflow getaway into iframe - * - * @return void */ public function formAction() { @@ -120,8 +114,6 @@ public function formAction() /** * Get response from PayPal by silent post method - * - * @return void */ public function silentPostAction() { diff --git a/app/code/core/Mage/Poll/Model/Resource/Poll.php b/app/code/core/Mage/Poll/Model/Resource/Poll.php index c1ecce0b073..fc6d3b5792a 100644 --- a/app/code/core/Mage/Poll/Model/Resource/Poll.php +++ b/app/code/core/Mage/Poll/Model/Resource/Poll.php @@ -199,6 +199,7 @@ public function loadStoreIds(Mage_Poll_Model_Poll $object) * insert to update "poll to store" relations * * @param Mage_Core_Model_Abstract|Mage_Poll_Model_Poll $object + * @return $this */ public function _afterSave(Mage_Core_Model_Abstract $object) { diff --git a/app/code/core/Mage/Poll/controllers/VoteController.php b/app/code/core/Mage/Poll/controllers/VoteController.php index 7122f4b9990..2227a7db1f0 100644 --- a/app/code/core/Mage/Poll/controllers/VoteController.php +++ b/app/code/core/Mage/Poll/controllers/VoteController.php @@ -42,8 +42,6 @@ class Mage_Poll_VoteController extends Mage_Core_Controller_Front_Action /** * Add Vote to Poll - * - * @return void */ public function addAction() { diff --git a/app/code/core/Mage/Rating/Model/Rating.php b/app/code/core/Mage/Rating/Model/Rating.php index 098fec01721..7c2f6d081b5 100644 --- a/app/code/core/Mage/Rating/Model/Rating.php +++ b/app/code/core/Mage/Rating/Model/Rating.php @@ -72,8 +72,6 @@ class Mage_Rating_Model_Rating extends Mage_Core_Model_Abstract /** * Define resource model - * - * @return void */ protected function _construct() { diff --git a/app/code/core/Mage/Reports/Model/Resource/Event.php b/app/code/core/Mage/Reports/Model/Resource/Event.php index 56357fc4ac0..86db0b715b3 100644 --- a/app/code/core/Mage/Reports/Model/Resource/Event.php +++ b/app/code/core/Mage/Reports/Model/Resource/Event.php @@ -37,8 +37,6 @@ class Mage_Reports_Model_Resource_Event extends Mage_Core_Model_Resource_Db_Abst /** * Initialize main table and identifier field. * Set main entity table name and primary key field name. - * - * @return void */ protected function _construct() { diff --git a/app/code/core/Mage/Rss/Block/Catalog/NotifyStock.php b/app/code/core/Mage/Rss/Block/Catalog/NotifyStock.php index 3c03ae027b5..53ec81f555a 100644 --- a/app/code/core/Mage/Rss/Block/Catalog/NotifyStock.php +++ b/app/code/core/Mage/Rss/Block/Catalog/NotifyStock.php @@ -43,8 +43,6 @@ class Mage_Rss_Block_Catalog_NotifyStock extends Mage_Rss_Block_Abstract /** * Constructor - * - * @return null */ protected function _construct() { @@ -112,7 +110,6 @@ protected function _toHtml() * Adds single product to feed * * @param array $args - * @return void */ public function addNotifyItemXmlCallback($args) { diff --git a/app/code/core/Mage/Rss/Block/Catalog/Review.php b/app/code/core/Mage/Rss/Block/Catalog/Review.php index 7a29e6177ce..5f2a98a555a 100644 --- a/app/code/core/Mage/Rss/Block/Catalog/Review.php +++ b/app/code/core/Mage/Rss/Block/Catalog/Review.php @@ -43,8 +43,6 @@ class Mage_Rss_Block_Catalog_Review extends Mage_Rss_Block_Abstract /** * Initialize cache - * - * @return null */ protected function _construct() { @@ -96,7 +94,6 @@ protected function _toHtml() * Format single RSS element * * @param array $args - * @return null */ public function addReviewItemXmlCallback($args) { diff --git a/app/code/core/Mage/Rss/Model/Observer.php b/app/code/core/Mage/Rss/Model/Observer.php index 14e5c8c0124..de27ceae0c5 100644 --- a/app/code/core/Mage/Rss/Model/Observer.php +++ b/app/code/core/Mage/Rss/Model/Observer.php @@ -61,7 +61,6 @@ public function __construct(array $args = array()) * Clean cache for catalog review rss * * @param Varien_Event_Observer $observer - * @return void */ public function reviewSaveAfter(Varien_Event_Observer $observer) { @@ -72,7 +71,6 @@ public function reviewSaveAfter(Varien_Event_Observer $observer) * Clean cache for notify stock rss * * @param Varien_Event_Observer $observer - * @return void */ public function salesOrderItemSaveAfterNotifyStock(Varien_Event_Observer $observer) { @@ -83,7 +81,6 @@ public function salesOrderItemSaveAfterNotifyStock(Varien_Event_Observer $observ * Clean cache for catalog new orders rss * * @param Varien_Event_Observer $observer - * @return void */ public function salesOrderItemSaveAfterOrderNew(Varien_Event_Observer $observer) { diff --git a/app/code/core/Mage/Sales/Block/Order/Comments.php b/app/code/core/Mage/Sales/Block/Order/Comments.php index 5b46ea76dc7..556fce504ee 100644 --- a/app/code/core/Mage/Sales/Block/Order/Comments.php +++ b/app/code/core/Mage/Sales/Block/Order/Comments.php @@ -42,7 +42,7 @@ class Mage_Sales_Block_Order_Comments extends Mage_Core_Block_Template /** * Sets comments parent model instance * - * @param Mage_Sales_Model_Abstract + * @param Mage_Sales_Model_Abstract $entity * @return $this */ public function setEntity($entity) diff --git a/app/code/core/Mage/Sales/Controller/Abstract.php b/app/code/core/Mage/Sales/Controller/Abstract.php index f8ec555161e..eadf12d7403 100644 --- a/app/code/core/Mage/Sales/Controller/Abstract.php +++ b/app/code/core/Mage/Sales/Controller/Abstract.php @@ -54,8 +54,6 @@ protected function _canViewOrder($order) /** * Init layout, messages and set active block for customer - * - * @return null */ protected function _viewAction() { diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Attribute/Backend/Shipping.php b/app/code/core/Mage/Sales/Model/Entity/Order/Attribute/Backend/Shipping.php index 0accc37654d..bcd1472dc8f 100644 --- a/app/code/core/Mage/Sales/Model/Entity/Order/Attribute/Backend/Shipping.php +++ b/app/code/core/Mage/Sales/Model/Entity/Order/Attribute/Backend/Shipping.php @@ -36,6 +36,7 @@ class Mage_Sales_Model_Entity_Order_Attribute_Backend_Shipping extends Mage_Eav_ { /** * @param Varien_Object $object + * @return $this */ public function beforeSave($object) { @@ -48,6 +49,7 @@ public function beforeSave($object) /** * @param Varien_Object $object + * @return $this * @throws Exception */ public function afterSave($object) diff --git a/app/code/core/Mage/Sales/Model/Observer.php b/app/code/core/Mage/Sales/Model/Observer.php index b0db13a9c55..7bb9d27b7b1 100644 --- a/app/code/core/Mage/Sales/Model/Observer.php +++ b/app/code/core/Mage/Sales/Model/Observer.php @@ -363,7 +363,6 @@ public function setQuoteCanApplyMsrp(Varien_Event_Observer $observer) * Add VAT validation request date and identifier to order comments * * @param Varien_Event_Observer $observer - * @return null */ public function addVatRequestParamsOrderComment(Varien_Event_Observer $observer) { diff --git a/app/code/core/Mage/Sales/Model/Order.php b/app/code/core/Mage/Sales/Model/Order.php index 56230f9eeb5..6d996e231d4 100644 --- a/app/code/core/Mage/Sales/Model/Order.php +++ b/app/code/core/Mage/Sales/Model/Order.php @@ -437,7 +437,7 @@ class Mage_Sales_Model_Order extends Mage_Sales_Model_Abstract */ const REPORT_DATE_TYPE_CREATED = 'created'; const REPORT_DATE_TYPE_UPDATED = 'updated'; - /* + /** * Identifier for history item */ const HISTORY_ENTITY_NAME = 'order'; @@ -503,7 +503,7 @@ class Mage_Sales_Model_Order extends Mage_Sales_Model_Abstract */ protected $_canSendNewEmailFlag = true; - /* + /** * Identifier for history item * * @var string @@ -1164,7 +1164,7 @@ public function addStatusToHistory($status, $comment = '', $isCustomerNotified = return $this; } - /* + /** * Add a comment to order * Different or default status may be specified * diff --git a/app/code/core/Mage/Sales/Model/Order/Creditmemo.php b/app/code/core/Mage/Sales/Model/Order/Creditmemo.php index f6743a80d14..f665872669d 100644 --- a/app/code/core/Mage/Sales/Model/Order/Creditmemo.php +++ b/app/code/core/Mage/Sales/Model/Order/Creditmemo.php @@ -177,7 +177,7 @@ class Mage_Sales_Model_Order_Creditmemo extends Mage_Sales_Model_Abstract const REPORT_DATE_TYPE_ORDER_CREATED = 'order_created'; const REPORT_DATE_TYPE_REFUND_CREATED = 'refund_created'; - /* + /** * Identifier for order history item */ const HISTORY_ENTITY_NAME = 'creditmemo'; diff --git a/app/code/core/Mage/Sales/Model/Order/Invoice.php b/app/code/core/Mage/Sales/Model/Order/Invoice.php index f6e17156ad5..76b135488dd 100644 --- a/app/code/core/Mage/Sales/Model/Order/Invoice.php +++ b/app/code/core/Mage/Sales/Model/Order/Invoice.php @@ -157,7 +157,7 @@ class Mage_Sales_Model_Order_Invoice extends Mage_Sales_Model_Abstract const REPORT_DATE_TYPE_ORDER_CREATED = 'order_created'; const REPORT_DATE_TYPE_INVOICE_CREATED = 'invoice_created'; - /* + /** * Identifier for order history item */ const HISTORY_ENTITY_NAME = 'invoice'; diff --git a/app/code/core/Mage/Sales/Model/Order/Pdf/Abstract.php b/app/code/core/Mage/Sales/Model/Order/Pdf/Abstract.php index e0e509be772..a464ac81250 100644 --- a/app/code/core/Mage/Sales/Model/Order/Pdf/Abstract.php +++ b/app/code/core/Mage/Sales/Model/Order/Pdf/Abstract.php @@ -511,7 +511,6 @@ protected function insertOrder(&$page, $obj, $putOrderId = true) * * @param Zend_Pdf_Page $page * @param string $text - * @return void */ public function insertDocumentNumber(Zend_Pdf_Page $page, $text) { diff --git a/app/code/core/Mage/Sales/Model/Order/Pdf/Creditmemo.php b/app/code/core/Mage/Sales/Model/Order/Pdf/Creditmemo.php index 2a22231638a..d3a405c06ae 100644 --- a/app/code/core/Mage/Sales/Model/Order/Pdf/Creditmemo.php +++ b/app/code/core/Mage/Sales/Model/Order/Pdf/Creditmemo.php @@ -38,7 +38,6 @@ class Mage_Sales_Model_Order_Pdf_Creditmemo extends Mage_Sales_Model_Order_Pdf_A * Draw table header for product items * * @param Zend_Pdf_Page $page - * @return void */ protected function _drawHeader(Zend_Pdf_Page $page) { diff --git a/app/code/core/Mage/Sales/Model/Order/Pdf/Invoice.php b/app/code/core/Mage/Sales/Model/Order/Pdf/Invoice.php index 9a5c47f1507..9015e220c4b 100644 --- a/app/code/core/Mage/Sales/Model/Order/Pdf/Invoice.php +++ b/app/code/core/Mage/Sales/Model/Order/Pdf/Invoice.php @@ -37,7 +37,6 @@ class Mage_Sales_Model_Order_Pdf_Invoice extends Mage_Sales_Model_Order_Pdf_Abst * Draw header for item table * * @param Zend_Pdf_Page $page - * @return void */ protected function _drawHeader(Zend_Pdf_Page $page) { diff --git a/app/code/core/Mage/Sales/Model/Order/Pdf/Shipment.php b/app/code/core/Mage/Sales/Model/Order/Pdf/Shipment.php index ec8c99a52f2..860cf3ff2e2 100644 --- a/app/code/core/Mage/Sales/Model/Order/Pdf/Shipment.php +++ b/app/code/core/Mage/Sales/Model/Order/Pdf/Shipment.php @@ -37,7 +37,6 @@ class Mage_Sales_Model_Order_Pdf_Shipment extends Mage_Sales_Model_Order_Pdf_Abs * Draw table header for product items * * @param Zend_Pdf_Page $page - * @return void */ protected function _drawHeader(Zend_Pdf_Page $page) { diff --git a/app/code/core/Mage/Sales/Model/Order/Shipment.php b/app/code/core/Mage/Sales/Model/Order/Shipment.php index 22057b2e946..079d1e3d107 100644 --- a/app/code/core/Mage/Sales/Model/Order/Shipment.php +++ b/app/code/core/Mage/Sales/Model/Order/Shipment.php @@ -84,7 +84,7 @@ class Mage_Sales_Model_Order_Shipment extends Mage_Sales_Model_Abstract const REPORT_DATE_TYPE_ORDER_CREATED = 'order_created'; const REPORT_DATE_TYPE_SHIPMENT_CREATED = 'shipment_created'; - /* + /** * Identifier for order history item */ const HISTORY_ENTITY_NAME = 'shipment'; @@ -688,7 +688,7 @@ public function setShippingLabel($label) /** * Get shipping label and decode by db adapter * - * @return void + * @return string */ public function getShippingLabel() { diff --git a/app/code/core/Mage/Sales/Model/Quote.php b/app/code/core/Mage/Sales/Model/Quote.php index 3e2ecc88152..cc94733feb9 100644 --- a/app/code/core/Mage/Sales/Model/Quote.php +++ b/app/code/core/Mage/Sales/Model/Quote.php @@ -319,9 +319,7 @@ public function getSharedStoreIds() } /** - * Prepare data before save - * - * @return void + * @inheritDoc * @throws Mage_Core_Exception */ protected function _beforeSave() @@ -375,7 +373,7 @@ protected function _beforeSave() $this->setCustomerId($this->_customer->getId()); } - parent::_beforeSave(); + return parent::_beforeSave(); } /** @@ -1042,7 +1040,7 @@ public function addItem(Mage_Sales_Model_Quote_Item $item) * Advanced func to add product to quote - processing mode can be specified there. * Returns error message if product type instance can't prepare product. * - * @param mixed $product + * @param Mage_Catalog_Model_Product $product * @param null|float|Varien_Object $request * @param null|string $processMode * @return Mage_Sales_Model_Quote_Item|string @@ -1127,7 +1125,7 @@ public function addProductAdvanced(Mage_Catalog_Model_Product $product, $request * * return error message if product type instance can't prepare product * - * @param mixed $product + * @param Mage_Catalog_Model_Product $product * @param null|float|Varien_Object $request * @return Mage_Sales_Model_Quote_Item|string */ diff --git a/app/code/core/Mage/Sales/Model/Quote/Address.php b/app/code/core/Mage/Sales/Model/Quote/Address.php index afe743c0557..dbf5036ff5d 100644 --- a/app/code/core/Mage/Sales/Model/Quote/Address.php +++ b/app/code/core/Mage/Sales/Model/Quote/Address.php @@ -1140,8 +1140,6 @@ public function addTotal($total) /** * Rewrite clone method - * - * @return void */ public function __clone() { diff --git a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Abstract.php b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Abstract.php index 95876a93188..64f3d210eac 100644 --- a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Abstract.php +++ b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Abstract.php @@ -96,7 +96,7 @@ public function getLabel() * Collect totals process. * * @param Mage_Sales_Model_Quote_Address $address - * @return Mage_Sales_Model_Quote_Address_Total_Abstract + * @return $this */ public function collect(Mage_Sales_Model_Quote_Address $address) { diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Attribute/Backend/Billing.php b/app/code/core/Mage/Sales/Model/Resource/Order/Attribute/Backend/Billing.php index 4b3e34446b1..77affa6aac6 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Attribute/Backend/Billing.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Attribute/Backend/Billing.php @@ -38,6 +38,7 @@ class Mage_Sales_Model_Resource_Order_Attribute_Backend_Billing extends Mage_Eav * Perform operation before save * * @param Varien_Object $object + * @return $this */ public function beforeSave($object) { @@ -52,6 +53,7 @@ public function beforeSave($object) * Perform operation after save * * @param Varien_Object $object + * @return $this */ public function afterSave($object) { diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Attribute/Backend/Shipping.php b/app/code/core/Mage/Sales/Model/Resource/Order/Attribute/Backend/Shipping.php index f2b0d8985fc..1178acc1b49 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Attribute/Backend/Shipping.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Attribute/Backend/Shipping.php @@ -38,6 +38,7 @@ class Mage_Sales_Model_Resource_Order_Attribute_Backend_Shipping extends Mage_Ea * Perform operation before save * * @param Varien_Object|Mage_Sales_Model_Order $object + * @return $this */ public function beforeSave($object) { @@ -52,6 +53,7 @@ public function beforeSave($object) * Perform operation after save * * @param Varien_Object|Mage_Sales_Model_Order $object + * @return $this */ public function afterSave($object) { diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Payment/Transaction.php b/app/code/core/Mage/Sales/Model/Resource/Order/Payment/Transaction.php index 13300a8941d..ebbf8fc7842 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Order/Payment/Transaction.php +++ b/app/code/core/Mage/Sales/Model/Resource/Order/Payment/Transaction.php @@ -198,7 +198,7 @@ protected function _beforeSave(Mage_Core_Model_Abstract $transaction) * @param int $orderId * @param int $paymentId * @param string $txnId - * @param mixed (array|string|object) $columns + * @param array|string|object $columns * @param bool $isRow * @param string $txnType * @return array|string diff --git a/app/code/core/Mage/Sales/Model/Resource/Report/Bestsellers.php b/app/code/core/Mage/Sales/Model/Resource/Report/Bestsellers.php index 386adfb5c81..cef429629bd 100644 --- a/app/code/core/Mage/Sales/Model/Resource/Report/Bestsellers.php +++ b/app/code/core/Mage/Sales/Model/Resource/Report/Bestsellers.php @@ -247,7 +247,7 @@ public function aggregate($from = null, $to = null) /** * Aggregate Orders data for default store * - * @param object Varien_Db_Select|null $subSelect + * @param Varien_Db_Select|null $subSelect * @return $this */ protected function _aggregateDefault($subSelect = null) diff --git a/app/code/core/Mage/Sales/controllers/GuestController.php b/app/code/core/Mage/Sales/controllers/GuestController.php index c0c90ae485c..87fc42d9d9c 100644 --- a/app/code/core/Mage/Sales/controllers/GuestController.php +++ b/app/code/core/Mage/Sales/controllers/GuestController.php @@ -60,9 +60,6 @@ protected function _canViewOrder($order) return false; } - /** - * @return void|null - */ protected function _viewAction() { if (!$this->_loadValidOrder()) { diff --git a/app/code/core/Mage/SalesRule/Model/Resource/Rule/Collection.php b/app/code/core/Mage/SalesRule/Model/Resource/Rule/Collection.php index d3ac782c485..14651030419 100644 --- a/app/code/core/Mage/SalesRule/Model/Resource/Rule/Collection.php +++ b/app/code/core/Mage/SalesRule/Model/Resource/Rule/Collection.php @@ -70,7 +70,7 @@ protected function _construct() * @param int $customerGroupId * @param string $couponCode * @param string|null $now - * @use $this->addWebsiteGroupDateFilter() + * @uses Mage_SalesRule_Model_Resource_Rule_Collection::addWebsiteGroupDateFilter() * * @return $this */ @@ -137,7 +137,7 @@ public function setValidationFilter($websiteId, $customerGroupId, $couponCode = * @param int $websiteId * @param int $customerGroupId * @param string|null $now - * @use $this->addWebsiteFilter() + * @uses Mage_SalesRule_Model_Resource_Rule_Collection::addWebsiteFilter() * * @return $this */ diff --git a/app/code/core/Mage/SalesRule/Model/Validator.php b/app/code/core/Mage/SalesRule/Model/Validator.php index f8c6514c546..e2293aadc4e 100644 --- a/app/code/core/Mage/SalesRule/Model/Validator.php +++ b/app/code/core/Mage/SalesRule/Model/Validator.php @@ -861,7 +861,6 @@ public function mergeIds($a1, $a2, $asString = true) * * @param int $ruleId * @param int $itemId - * @return void */ public function setCartFixedRuleUsedForAddress($ruleId, $itemId) { diff --git a/app/code/core/Mage/Shipping/Model/Carrier/Abstract.php b/app/code/core/Mage/Shipping/Model/Carrier/Abstract.php index 1bc1bcb41fc..a39670448ef 100644 --- a/app/code/core/Mage/Shipping/Model/Carrier/Abstract.php +++ b/app/code/core/Mage/Shipping/Model/Carrier/Abstract.php @@ -345,7 +345,6 @@ public function getSortOrder() /** * @param Mage_Shipping_Model_Rate_Request $request - * @return null */ protected function _updateFreeMethodQuote($request) { diff --git a/app/code/core/Mage/Shipping/Model/Carrier/Freeshipping.php b/app/code/core/Mage/Shipping/Model/Carrier/Freeshipping.php index c6b62a5e76e..13e335f3de9 100644 --- a/app/code/core/Mage/Shipping/Model/Carrier/Freeshipping.php +++ b/app/code/core/Mage/Shipping/Model/Carrier/Freeshipping.php @@ -90,7 +90,6 @@ public function collectRates(Mage_Shipping_Model_Rate_Request $request) * Allows free shipping when all product items have free shipping (promotions etc.) * * @param Mage_Shipping_Model_Rate_Request $request - * @return void */ protected function _updateFreeMethodQuote($request) { diff --git a/app/code/core/Mage/Shipping/Model/Carrier/Tablerate.php b/app/code/core/Mage/Shipping/Model/Carrier/Tablerate.php index 524532b9e4d..4ed7a9ed292 100644 --- a/app/code/core/Mage/Shipping/Model/Carrier/Tablerate.php +++ b/app/code/core/Mage/Shipping/Model/Carrier/Tablerate.php @@ -58,7 +58,7 @@ class Mage_Shipping_Model_Carrier_Tablerate extends Mage_Shipping_Model_Carrier_ */ protected $_conditionNames = array(); - /* + /** * Constructor */ public function __construct() diff --git a/app/code/core/Mage/Shipping/Model/Rate/Result.php b/app/code/core/Mage/Shipping/Model/Rate/Result.php index 2902ea2a9f0..28bb4f4a772 100644 --- a/app/code/core/Mage/Shipping/Model/Rate/Result.php +++ b/app/code/core/Mage/Shipping/Model/Rate/Result.php @@ -56,7 +56,6 @@ public function reset() * Set Error * * @param bool $error - * @return void */ public function setError($error) { diff --git a/app/code/core/Mage/Shipping/Model/Resource/Carrier/Tablerate.php b/app/code/core/Mage/Shipping/Model/Resource/Carrier/Tablerate.php index 101977fce89..ea7071022a5 100644 --- a/app/code/core/Mage/Shipping/Model/Resource/Carrier/Tablerate.php +++ b/app/code/core/Mage/Shipping/Model/Resource/Carrier/Tablerate.php @@ -99,8 +99,6 @@ class Mage_Shipping_Model_Resource_Carrier_Tablerate extends Mage_Core_Model_Res /** * Define main table and id field name - * - * @return void */ protected function _construct() { diff --git a/app/code/core/Mage/Shipping/Model/Shipping.php b/app/code/core/Mage/Shipping/Model/Shipping.php index af55f510ae2..9672d133707 100644 --- a/app/code/core/Mage/Shipping/Model/Shipping.php +++ b/app/code/core/Mage/Shipping/Model/Shipping.php @@ -75,7 +75,6 @@ public function getResult() * Set shipping orig data * * @param array $data - * @return null */ public function setOrigData($data) { diff --git a/app/code/core/Mage/Tag/controllers/IndexController.php b/app/code/core/Mage/Tag/controllers/IndexController.php index 65c7f02575a..5df86722d6b 100644 --- a/app/code/core/Mage/Tag/controllers/IndexController.php +++ b/app/code/core/Mage/Tag/controllers/IndexController.php @@ -126,7 +126,6 @@ protected function _cleanTags(array $tagNamesArr) * Fill Message Box by success and notice messages about results of user actions. * * @param array $counter - * @return void */ protected function _fillMessageBox($counter) { diff --git a/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Shipping.php b/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Shipping.php index ec88c632ae3..3f46c06e9ad 100644 --- a/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Shipping.php +++ b/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Shipping.php @@ -267,7 +267,6 @@ protected function _needSubtractShippingTax($address) * Calculate shipping price without store tax * * @param Mage_Sales_Model_Quote_Address $address - * @return void * @deprecated after 1.4.0.0 */ protected function _processShippingAmount($address) diff --git a/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Tax.php b/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Tax.php index 90a1ce619dc..6c2ef6c864b 100644 --- a/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Tax.php +++ b/app/code/core/Mage/Tax/Model/Sales/Total/Quote/Tax.php @@ -221,9 +221,7 @@ public function collect(Mage_Sales_Model_Quote_Address $address) } /** - * Process hidden taxes for items and shippings (in accordance with hidden tax type) - * - * @return void + * Process hidden taxes for items and shipping (in accordance with hidden tax type) */ protected function _processHiddenTaxes() { @@ -1515,7 +1513,7 @@ protected function _deltaRound($price, $rate, $direction, $type = 'regular') /** * Recalculate parent item amounts base on children data * - * @param Mage_Sales_Model_Quote_Item_Abstract $item + * @param Mage_Sales_Model_Quote_Item_Abstract $item * @return $this */ protected function _recalculateParent(Mage_Sales_Model_Quote_Item_Abstract $item) diff --git a/app/code/core/Mage/Tax/Model/System/Config/Source/Tax/Region.php b/app/code/core/Mage/Tax/Model/System/Config/Source/Tax/Region.php index ef0e2a7cf05..16270dd0188 100644 --- a/app/code/core/Mage/Tax/Model/System/Config/Source/Tax/Region.php +++ b/app/code/core/Mage/Tax/Model/System/Config/Source/Tax/Region.php @@ -37,7 +37,6 @@ class Mage_Tax_Model_System_Config_Source_Tax_Region */ public function __construct($arguments = array()) { - /** @var Mage_Directory_Model_Region _optionsModel */ $this->_optionsModel = !empty($arguments['region_model']) ? $arguments['region_model'] : Mage::getModel('directory/region'); } diff --git a/app/code/core/Mage/Usa/Block/Adminhtml/Dhl/Unitofmeasure.php b/app/code/core/Mage/Usa/Block/Adminhtml/Dhl/Unitofmeasure.php index e9961bc2a09..678aa1783c7 100644 --- a/app/code/core/Mage/Usa/Block/Adminhtml/Dhl/Unitofmeasure.php +++ b/app/code/core/Mage/Usa/Block/Adminhtml/Dhl/Unitofmeasure.php @@ -36,8 +36,6 @@ class Mage_Usa_Block_Adminhtml_Dhl_Unitofmeasure extends Mage_Adminhtml_Block_Sy /** * Define params and variables - * - * @return void */ public function _construct() { diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Abstract/Backend/Abstract.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Abstract/Backend/Abstract.php index ce011d8c0b9..9fb8ceceb19 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Abstract/Backend/Abstract.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Abstract/Backend/Abstract.php @@ -50,15 +50,11 @@ abstract class Mage_Usa_Model_Shipping_Carrier_Abstract_Backend_Abstract extends /** * Set source model to get allowed values - * - * @return void */ abstract protected function _setSourceModelData(); /** * Set field name to display in error block - * - * @return void */ abstract protected function _setNameErrorField(); diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl.php index ab43bb35712..a8f4aca0551 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl.php @@ -411,7 +411,6 @@ protected function _getQuotes() * Set free method request * * @param $freeMethod - * @return void */ protected function _setFreeMethodRequest($freeMethod) { @@ -562,7 +561,6 @@ protected function _doRequest() * * @param $shipment * @param $shipKey - * @return void */ protected function _createShipmentXml($shipment, $shipKey) { @@ -930,7 +928,6 @@ public function getCode($type, $code = '') * Parse xml and add rates to instance property * * @param mixed $shipXml - * @return void */ protected function _addRate($shipXml) { diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/International.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/International.php index 226c014a721..a9256f3d10a 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/International.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/International.php @@ -237,8 +237,7 @@ public function collectRates(Mage_Shipping_Model_Rate_Request $request) /** * Set Free Method Request * - * @param string $freeMethod - * @return void + * @param string $freeMethod */ protected function _setFreeMethodRequest($freeMethod) { @@ -657,7 +656,6 @@ protected function _getAllItems() * Make pieces * * @param SimpleXMLElement $nodeBkgDetails - * @return void */ protected function _makePieces(SimpleXMLElement $nodeBkgDetails) { @@ -762,7 +760,6 @@ protected function _getDimension($dimension, $configWeightUnit = false) * Add dimension to piece * * @param SimpleXMLElement $nodePiece - * @return void */ protected function _addDimension($nodePiece) { @@ -1442,7 +1439,6 @@ protected function _doRequest() * @param SimpleXMLElement $xml * @param Mage_Shipping_Model_Rate_Request $rawRequest * @param string $originRegion - * @return void */ protected function _shipmentDetails($xml, $rawRequest, $originRegion = '') { @@ -1564,7 +1560,6 @@ public function getTracking($trackings) * Send request for tracking * * @param array $trackings - * @return void */ protected function _getXMLTracking($trackings) { @@ -1638,7 +1633,6 @@ protected function _getXMLTracking($trackings) * * @param array $trackings * @param string $response - * @return void */ protected function _parseXmlTrackingResponse($trackings, $response) { diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex.php index 5f141bcda49..d5aebb83406 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex.php @@ -591,7 +591,6 @@ protected function _getRateAmountOriginBased($rate) * Set free method request * * @param $freeMethod - * @return void */ protected function _setFreeMethodRequest($freeMethod) { @@ -990,8 +989,6 @@ public function getTracking($trackings) /** * Set tracking request - * - * @return void */ protected function setTrackingReqeust() { @@ -1007,7 +1004,6 @@ protected function setTrackingReqeust() * Send request for tracking * * @param array $tracking - * @return void */ protected function _getXMLTracking($tracking) { @@ -1172,7 +1168,6 @@ protected function _parseTrackingResponse($trackingValue, $response) * @deprecated after 1.6.0.0 see _parseTrackingResponse() * @param array $trackingvalue * @param string $response - * @return void */ protected function _parseXmlTrackingResponse($trackingvalue, $response) { diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Backend/Freemethod.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Backend/Freemethod.php index 7c835987fa6..f6b183e0df8 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Backend/Freemethod.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Backend/Freemethod.php @@ -37,8 +37,6 @@ class Mage_Usa_Model_Shipping_Carrier_Ups_Backend_Freemethod { /** * Set source model to get allowed values - * - * @return void */ protected function _setSourceModelData() { @@ -47,8 +45,6 @@ protected function _setSourceModelData() /** * Set field name to display in error block - * - * @return void */ protected function _setNameErrorField() { diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Backend/OriginShipment.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Backend/OriginShipment.php index 52ea2c3912a..c9ea38b482d 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Backend/OriginShipment.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Backend/OriginShipment.php @@ -37,8 +37,6 @@ class Mage_Usa_Model_Shipping_Carrier_Ups_Backend_OriginShipment { /** * Set source model to get allowed values - * - * @return void */ protected function _setSourceModelData() { @@ -47,8 +45,6 @@ protected function _setSourceModelData() /** * Set field name to display in error block - * - * @return void */ protected function _setNameErrorField() { diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Backend/Type.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Backend/Type.php index ab2d8134c00..24c0a4ae43a 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Backend/Type.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Backend/Type.php @@ -36,8 +36,6 @@ class Mage_Usa_Model_Shipping_Carrier_Ups_Backend_Type extends Mage_Usa_Model_Sh { /** * Set source model to get allowed values - * - * @return void */ protected function _setSourceModelData() { @@ -46,8 +44,6 @@ protected function _setSourceModelData() /** * Set field name to display in error block - * - * @return void */ protected function _setNameErrorField() { diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Usps.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Usps.php index cbf2c37de68..0bfcae0fc9d 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Usps.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Usps.php @@ -300,7 +300,6 @@ protected function _getQuotes() * Set free method request * * @param $freeMethod - * @return void */ protected function _setFreeMethodRequest($freeMethod) { diff --git a/app/code/core/Mage/Weee/Model/Total/Quote/Weee.php b/app/code/core/Mage/Weee/Model/Total/Quote/Weee.php index 00df4358bf8..d8094b99729 100644 --- a/app/code/core/Mage/Weee/Model/Total/Quote/Weee.php +++ b/app/code/core/Mage/Weee/Model/Total/Quote/Weee.php @@ -355,7 +355,6 @@ protected function _recalculateParent(Mage_Sales_Model_Quote_Item_Abstract $item * Reset information about FPT for shopping cart item * * @param Mage_Sales_Model_Quote_Item_Abstract $item - * @return void */ protected function _resetItemData($item) { diff --git a/app/code/core/Mage/Wishlist/Block/Customer/Wishlist.php b/app/code/core/Mage/Wishlist/Block/Customer/Wishlist.php index 14f8cf42b5a..fea8bfd0de9 100644 --- a/app/code/core/Mage/Wishlist/Block/Customer/Wishlist.php +++ b/app/code/core/Mage/Wishlist/Block/Customer/Wishlist.php @@ -34,7 +34,7 @@ */ class Mage_Wishlist_Block_Customer_Wishlist extends Mage_Wishlist_Block_Abstract { - /* + /** * List of product options rendering configurations by product type */ protected $_optionsCfg = array(); diff --git a/app/code/core/Mage/Wishlist/Block/Customer/Wishlist/Item/Options.php b/app/code/core/Mage/Wishlist/Block/Customer/Wishlist/Item/Options.php index 7e50e567f36..6b7b5f774b1 100644 --- a/app/code/core/Mage/Wishlist/Block/Customer/Wishlist/Item/Options.php +++ b/app/code/core/Mage/Wishlist/Block/Customer/Wishlist/Item/Options.php @@ -36,7 +36,7 @@ */ class Mage_Wishlist_Block_Customer_Wishlist_Item_Options extends Mage_Wishlist_Block_Abstract { - /* + /** * List of product options rendering configurations by product type * * @var array diff --git a/app/code/core/Mage/Wishlist/Model/Resource/Item/Collection.php b/app/code/core/Mage/Wishlist/Model/Resource/Item/Collection.php index e6d6ea79803..bb5eeaea282 100644 --- a/app/code/core/Mage/Wishlist/Model/Resource/Item/Collection.php +++ b/app/code/core/Mage/Wishlist/Model/Resource/Item/Collection.php @@ -110,8 +110,6 @@ class Mage_Wishlist_Model_Resource_Item_Collection extends Mage_Core_Model_Resou /** * Initialize resource model for collection - * - * @return void */ public function _construct() { diff --git a/app/code/core/Mage/Wishlist/Model/Resource/Item/Option/Collection.php b/app/code/core/Mage/Wishlist/Model/Resource/Item/Option/Collection.php index 8b9dd6e8cc3..008b3711355 100644 --- a/app/code/core/Mage/Wishlist/Model/Resource/Item/Option/Collection.php +++ b/app/code/core/Mage/Wishlist/Model/Resource/Item/Option/Collection.php @@ -50,8 +50,6 @@ class Mage_Wishlist_Model_Resource_Item_Option_Collection extends Mage_Core_Mode /** * Define resource model for collection - * - * @return void */ protected function _construct() { From c97c68e0021788db56dfd441df31a1b7430e0a56 Mon Sep 17 00:00:00 2001 From: Sven Reichel Date: Sat, 6 Aug 2022 06:19:01 +0200 Subject: [PATCH 2/6] Hu? Updated phstan baseline --- .github/phpstan-baseline.neon | 706 ++-------------------------------- 1 file changed, 30 insertions(+), 676 deletions(-) diff --git a/.github/phpstan-baseline.neon b/.github/phpstan-baseline.neon index 7d13eadf752..67765cea832 100644 --- a/.github/phpstan-baseline.neon +++ b/.github/phpstan-baseline.neon @@ -5,11 +5,6 @@ parameters: count: 1 path: ../app/code/core/Mage/Admin/Model/Config.php - - - message: "#^PHPDoc tag @var above assignment does not specify variable name\\.$#" - count: 1 - path: ../app/code/core/Mage/Admin/Model/Redirectpolicy.php - - message: "#^Cannot call method getClassName\\(\\) on SimpleXMLElement\\|false\\.$#" count: 1 @@ -150,11 +145,6 @@ parameters: count: 2 path: ../app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Alerts.php - - - message: "#^Method Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Attributes\\:\\:_prepareForm\\(\\) should return null but return statement is missing\\.$#" - count: 1 - path: ../app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Attributes.php - - message: "#^Call to an undefined method Varien_Data_Collection\\:\\:addFieldToFilter\\(\\)\\.$#" count: 2 @@ -215,11 +205,6 @@ parameters: count: 1 path: ../app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Simple.php - - - message: "#^Method Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Super_Config_Simple\\:\\:_prepareForm\\(\\) should return null but return statement is missing\\.$#" - count: 1 - path: ../app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Simple.php - - message: "#^Call to an undefined method Varien_Data_Collection\\:\\:addFieldToFilter\\(\\)\\.$#" count: 2 @@ -335,11 +320,6 @@ parameters: count: 1 path: ../app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Cart.php - - - message: "#^PHPDoc tag @param has invalid value \\(Mage_Wishlist_Item_Option\\)\\: Unexpected token \"\\\\n \\* \", expected variable at offset 100$#" - count: 1 - path: ../app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Grid/Renderer/Item.php - - message: "#^Method Mage_Adminhtml_Block_Widget_Grid\\:\\:setDefaultSort\\(\\) invoked with 2 parameters, 1 required\\.$#" count: 1 @@ -390,11 +370,6 @@ parameters: count: 1 path: ../app/code/core/Mage/Adminhtml/Block/Customer/Online/Grid.php - - - message: "#^PHPDoc tag @param has invalid value \\(Mage_Core_Model_Abstract\\)\\: Unexpected token \"\\\\n \\* \", expected variable at offset 73$#" - count: 1 - path: ../app/code/core/Mage/Adminhtml/Block/Customer/Online/Grid.php - - message: "#^Access to an undefined property Mage_Adminhtml_Block_Dashboard_Bar\\:\\:\\$_currency\\.$#" count: 1 @@ -465,11 +440,6 @@ parameters: count: 1 path: ../app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Grid/Renderer/Action.php - - - message: "#^PHPDoc tag @var above a method has no effect\\.$#" - count: 1 - path: ../app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Grid/Renderer/Action.php - - message: "#^Cannot call method addValueFilter\\(\\) on Mage_Core_Model_Resource_Db_Collection_Abstract\\|false\\.$#" count: 1 @@ -580,46 +550,16 @@ parameters: count: 1 path: ../app/code/core/Mage/Adminhtml/Block/Report/Customer/Accounts/Grid.php - - - message: "#^Method Mage_Adminhtml_Block_Report_Customer_Accounts_Grid\\:\\:_prepareCollection\\(\\) should return \\$this\\(Mage_Adminhtml_Block_Report_Customer_Accounts_Grid\\) but return statement is missing\\.$#" - count: 1 - path: ../app/code/core/Mage/Adminhtml/Block/Report/Customer/Accounts/Grid.php - - message: "#^Call to an undefined method Varien_Data_Collection\\:\\:initReport\\(\\)\\.$#" count: 1 path: ../app/code/core/Mage/Adminhtml/Block/Report/Customer/Orders/Grid.php - - - message: "#^Method Mage_Adminhtml_Block_Report_Customer_Orders_Grid\\:\\:_prepareCollection\\(\\) should return \\$this\\(Mage_Adminhtml_Block_Report_Customer_Orders_Grid\\) but return statement is missing\\.$#" - count: 1 - path: ../app/code/core/Mage/Adminhtml/Block/Report/Customer/Orders/Grid.php - - message: "#^Call to an undefined method Varien_Data_Collection\\:\\:initReport\\(\\)\\.$#" count: 1 path: ../app/code/core/Mage/Adminhtml/Block/Report/Customer/Totals/Grid.php - - - message: "#^Method Mage_Adminhtml_Block_Report_Customer_Totals_Grid\\:\\:_prepareCollection\\(\\) should return \\$this\\(Mage_Adminhtml_Block_Report_Customer_Totals_Grid\\) but return statement is missing\\.$#" - count: 1 - path: ../app/code/core/Mage/Adminhtml/Block/Report/Customer/Totals/Grid.php - - - - message: "#^PHPDoc tag @param has invalid value \\(bool Default field visibility\\)\\: Unexpected token \"Default\", expected variable at offset 88$#" - count: 1 - path: ../app/code/core/Mage/Adminhtml/Block/Report/Filter/Form.php - - - - message: "#^PHPDoc tag @param has invalid value \\(bool Field visibility\\)\\: Unexpected token \"Field\", expected variable at offset 88$#" - count: 1 - path: ../app/code/core/Mage/Adminhtml/Block/Report/Filter/Form.php - - - - message: "#^PHPDoc tag @param has invalid value \\(string Field id\\)\\: Unexpected token \"Field\", expected variable at offset 60$#" - count: 2 - path: ../app/code/core/Mage/Adminhtml/Block/Report/Filter/Form.php - - message: "#^Access to an undefined property Mage_Adminhtml_Block_Report_Grid\\:\\:\\$_filterValues\\.$#" count: 1 @@ -645,26 +585,11 @@ parameters: count: 1 path: ../app/code/core/Mage/Adminhtml/Block/Report/Grid.php - - - message: "#^Method Mage_Adminhtml_Block_Report_Grid\\:\\:_prepareCollection\\(\\) should return \\$this\\(Mage_Adminhtml_Block_Report_Grid\\) but return statement is missing\\.$#" - count: 1 - path: ../app/code/core/Mage/Adminhtml/Block/Report/Grid.php - - - - message: "#^Method Mage_Adminhtml_Block_Report_Grid\\:\\:getCsv\\(\\) has invalid return type unknown\\.$#" - count: 1 - path: ../app/code/core/Mage/Adminhtml/Block/Report/Grid.php - - message: "#^Method Mage_Adminhtml_Block_Report_Grid\\:\\:getExcel\\(\\) has invalid return type unknown\\.$#" count: 1 path: ../app/code/core/Mage/Adminhtml/Block/Report/Grid.php - - - message: "#^PHPDoc tag @param references unknown parameter\\: \\$currencyCode$#" - count: 1 - path: ../app/code/core/Mage/Adminhtml/Block/Report/Grid.php - - message: "#^Access to an undefined property Mage_Adminhtml_Block_Report_Grid_Abstract\\:\\:\\$_columnGroupBy\\.$#" count: 1 @@ -695,11 +620,6 @@ parameters: count: 1 path: ../app/code/core/Mage/Adminhtml/Block/Report/Grid/Shopcart.php - - - message: "#^PHPDoc tag @param references unknown parameter\\: \\$currencyCode$#" - count: 1 - path: ../app/code/core/Mage/Adminhtml/Block/Report/Grid/Shopcart.php - - message: "#^Call to an undefined method Mage_Eav_Model_Entity_Abstract\\:\\:setStore\\(\\)\\.$#" count: 1 @@ -715,11 +635,6 @@ parameters: count: 1 path: ../app/code/core/Mage/Adminhtml/Block/Report/Product/Ordered/Grid.php - - - message: "#^Method Mage_Adminhtml_Block_Report_Product_Ordered_Grid\\:\\:_prepareCollection\\(\\) should return \\$this\\(Mage_Adminhtml_Block_Report_Product_Ordered_Grid\\) but return statement is missing\\.$#" - count: 1 - path: ../app/code/core/Mage/Adminhtml/Block/Report/Product/Ordered/Grid.php - - message: "#^Call to an undefined method Varien_Data_Collection\\:\\:initReport\\(\\)\\.$#" count: 1 @@ -735,11 +650,6 @@ parameters: count: 1 path: ../app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Customer/Grid.php - - - message: "#^Method Mage_Adminhtml_Block_Review_Grid\\:\\:_prepareMassaction\\(\\) should return \\$this\\(Mage_Adminhtml_Block_Review_Grid\\) but return statement is missing\\.$#" - count: 1 - path: ../app/code/core/Mage/Adminhtml/Block/Review/Grid.php - - message: "#^Method Mage_Adminhtml_Block_Review_Grid_Renderer_Type\\:\\:render\\(\\) should return string but return statement is missing\\.$#" count: 1 @@ -965,16 +875,6 @@ parameters: count: 1 path: ../app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Giftmessage.php - - - message: "#^PHPDoc tag @param references unknown parameter\\: \\$name$#" - count: 1 - path: ../app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Giftmessage.php - - - - message: "#^Method Mage_Adminhtml_Block_Sales_Order_View_Items\\:\\:getItemsCollection\\(\\) has invalid return type unknown\\.$#" - count: 1 - path: ../app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Items.php - - message: "#^Call to an undefined method Mage_Core_Helper_Abstract\\:\\:getBasePriceInclTax\\(\\)\\.$#" count: 1 @@ -1010,11 +910,6 @@ parameters: count: 1 path: ../app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Items/Renderer/Default.php - - - message: "#^PHPDoc tag @param references unknown parameter\\: \\$name$#" - count: 1 - path: ../app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Items/Renderer/Default.php - - message: "#^Call to an undefined method Mage_Core_Model_Resource_Db_Collection_Abstract\\:\\:setOrderFilter\\(\\)\\.$#" count: 1 @@ -1065,11 +960,6 @@ parameters: count: 1 path: ../app/code/core/Mage/Adminhtml/Block/Sales/Transactions/Grid.php - - - message: "#^PHPDoc tag @param references unknown parameter\\: \\$websiteId$#" - count: 1 - path: ../app/code/core/Mage/Adminhtml/Block/Shipping/Carrier/Tablerate/Grid.php - - message: "#^Cannot call method addIdFilter\\(\\) on Mage_Core_Model_Resource_Db_Collection_Abstract\\|false\\.$#" count: 1 @@ -1095,16 +985,6 @@ parameters: count: 2 path: ../app/code/core/Mage/Adminhtml/Block/System/Config/Form.php - - - message: "#^PHPDoc tag @param has invalid value \\(Varien_Object\\)\\: Unexpected token \"\\\\n \", expected variable at offset 78$#" - count: 1 - path: ../app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Array/Abstract.php - - - - message: "#^Property Mage_Adminhtml_Block_System_Config_Form_Field_Array_Abstract\\:\\:\\$_addButtonLabel has unknown class unknown_type as its type\\.$#" - count: 1 - path: ../app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Array/Abstract.php - - message: "#^Call to an undefined method object\\:\\:descend\\(\\)\\.$#" count: 1 @@ -1340,11 +1220,6 @@ parameters: count: 1 path: ../app/code/core/Mage/Adminhtml/Block/Widget.php - - - message: "#^PHPDoc tag @param references unknown parameter\\: \\$placement$#" - count: 2 - path: ../app/code/core/Mage/Adminhtml/Block/Widget/Container.php - - message: "#^Call to an undefined method Mage_Core_Helper_Abstract\\:\\:decodeFilter\\(\\)\\.$#" count: 1 @@ -1365,46 +1240,6 @@ parameters: count: 3 path: ../app/code/core/Mage/Adminhtml/Block/Widget/Grid.php - - - message: "#^Method Mage_Adminhtml_Block_Widget_Grid\\:\\:_prepareMassactionColumn\\(\\) has invalid return type unknown\\.$#" - count: 1 - path: ../app/code/core/Mage/Adminhtml/Block/Widget/Grid.php - - - - message: "#^Method Mage_Adminhtml_Block_Widget_Grid\\:\\:getSubTotalColumns\\(\\) has invalid return type unknown\\.$#" - count: 1 - path: ../app/code/core/Mage/Adminhtml/Block/Widget/Grid.php - - - - message: "#^PHPDoc tag @param has invalid value \\(Mage_Catalog_Model_Product\\|Varien_Object\\)\\: Unexpected token \"\\\\n \\* \", expected variable at offset 109$#" - count: 1 - path: ../app/code/core/Mage/Adminhtml/Block/Widget/Grid.php - - - - message: "#^PHPDoc tag @param references unknown parameter\\: \\$item$#" - count: 2 - path: ../app/code/core/Mage/Adminhtml/Block/Widget/Grid.php - - - - message: "#^PHPDoc tag @param references unknown parameter\\: \\$visible$#" - count: 2 - path: ../app/code/core/Mage/Adminhtml/Block/Widget/Grid.php - - - - message: "#^PHPDoc tag @var above a method has no effect\\.$#" - count: 1 - path: ../app/code/core/Mage/Adminhtml/Block/Widget/Grid.php - - - - message: "#^Property Mage_Adminhtml_Block_Widget_Grid\\:\\:\\$_emptyText has unknown class sting as its type\\.$#" - count: 1 - path: ../app/code/core/Mage/Adminhtml/Block/Widget/Grid.php - - - - message: "#^Property Mage_Adminhtml_Block_Widget_Grid\\:\\:\\$_emptyTextCss has unknown class sting as its type\\.$#" - count: 1 - path: ../app/code/core/Mage/Adminhtml/Block/Widget/Grid.php - - message: "#^Parameter \\$action of method Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Action\\:\\:_toOptionHtml\\(\\) has invalid type unknown_type\\.$#" count: 1 @@ -1430,16 +1265,6 @@ parameters: count: 1 path: ../app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction/Item.php - - - message: "#^Method Mage_Adminhtml_Block_Widget_Grid_Serializer\\:\\:getColumnInputNames\\(\\) has invalid return type unknown\\.$#" - count: 1 - path: ../app/code/core/Mage/Adminhtml/Block/Widget/Grid/Serializer.php - - - - message: "#^PHPDoc tag @param references unknown parameter\\: \\$name$#" - count: 1 - path: ../app/code/core/Mage/Adminhtml/Block/Widget/Grid/Serializer.php - - message: "#^Call to an undefined method Mage_Adminhtml_Block_Widget_Tab_Interface\\:\\:getSkipGenerateContent\\(\\)\\.$#" count: 1 @@ -1490,6 +1315,11 @@ parameters: count: 1 path: ../app/code/core/Mage/Adminhtml/Helper/Dashboard/Abstract.php + - + message: "#^Method Mage_Adminhtml_Helper_Data\\:\\:prepareFilterString\\(\\) has invalid return type data\\.$#" + count: 1 + path: ../app/code/core/Mage/Adminhtml/Helper/Data.php + - message: "#^Method Mage_Adminhtml_Model_Config\\:\\:getSection\\(\\) should return Varien_Simplexml_Element but return statement is missing\\.$#" count: 1 @@ -1525,16 +1355,6 @@ parameters: count: 1 path: ../app/code/core/Mage/Adminhtml/Model/Sales/Order/Create.php - - - message: "#^PHPDoc tag @param references unknown parameter\\: \\$options$#" - count: 1 - path: ../app/code/core/Mage/Adminhtml/Model/Sales/Order/Create.php - - - - message: "#^PHPDoc tag @param references unknown parameter\\: \\$product$#" - count: 1 - path: ../app/code/core/Mage/Adminhtml/Model/Sales/Order/Create.php - - message: "#^Variable \\$billingAddress might not be defined\\.$#" count: 2 @@ -1600,21 +1420,6 @@ parameters: count: 1 path: ../app/code/core/Mage/Adminhtml/Model/System/Config/Source/Country.php - - - message: "#^PHPDoc tag @param has invalid value \\(int groupId\\)\\: Unexpected token \"groupId\", expected variable at offset 62$#" - count: 1 - path: ../app/code/core/Mage/Adminhtml/Model/System/Store.php - - - - message: "#^PHPDoc tag @param has invalid value \\(int websiteId\\)\\: Unexpected token \"websiteId\", expected variable at offset 64$#" - count: 1 - path: ../app/code/core/Mage/Adminhtml/Model/System/Store.php - - - - message: "#^Variable \\$options might not be defined\\.$#" - count: 1 - path: ../app/code/core/Mage/Adminhtml/Model/System/Store.php - - message: "#^Variable \\$values might not be defined\\.$#" count: 1 @@ -1641,27 +1446,32 @@ parameters: path: ../app/code/core/Mage/Adminhtml/controllers/Catalog/ProductController.php - - message: "#^Method Mage_Adminhtml_Catalog_ProductController\\:\\:_filterStockData\\(\\) should return null but return statement is missing\\.$#" + message: "#^Method Mage_Adminhtml_Controller_Action\\:\\:_setForcedFormKeyActions\\(\\) invoked with 2 parameters, 1 required\\.$#" count: 1 - path: ../app/code/core/Mage/Adminhtml/controllers/Catalog/ProductController.php + path: ../app/code/core/Mage/Adminhtml/controllers/Catalog/SearchController.php - - message: "#^Method Mage_Adminhtml_Controller_Action\\:\\:_setForcedFormKeyActions\\(\\) invoked with 2 parameters, 1 required\\.$#" + message: "#^Call to method _saveSessionCurrentPath\\(\\) on an unknown class Mage_Adminhtml_Cms_Page_Wysiwyg_ImagesController\\.$#" count: 1 - path: ../app/code/core/Mage/Adminhtml/controllers/Catalog/SearchController.php + path: ../app/code/core/Mage/Adminhtml/controllers/Cms/Wysiwyg/ImagesController.php - - message: "#^PHPDoc tag @param has invalid value \\(array\\)\\: Unexpected token \"\\\\n \\* \", expected variable at offset 96$#" + message: "#^Call to method loadLayout\\(\\) on an unknown class Mage_Adminhtml_Cms_Page_Wysiwyg_ImagesController\\.$#" count: 1 - path: ../app/code/core/Mage/Adminhtml/controllers/Cms/PageController.php + path: ../app/code/core/Mage/Adminhtml/controllers/Cms/Wysiwyg/ImagesController.php - - message: "#^Method Mage_Adminhtml_CustomerController\\:\\:cartAction\\(\\) should return string but return statement is missing\\.$#" + message: "#^Method Mage_Adminhtml_Cms_Wysiwyg_ImagesController\\:\\:_initAction\\(\\) has invalid return type Mage_Adminhtml_Cms_Page_Wysiwyg_ImagesController\\.$#" count: 1 - path: ../app/code/core/Mage/Adminhtml/controllers/CustomerController.php + path: ../app/code/core/Mage/Adminhtml/controllers/Cms/Wysiwyg/ImagesController.php + + - + message: "#^Method Mage_Adminhtml_Cms_Wysiwyg_ImagesController\\:\\:_saveSessionCurrentPath\\(\\) has invalid return type Mage_Adminhtml_Cms_Page_Wysiwyg_ImagesController\\.$#" + count: 1 + path: ../app/code/core/Mage/Adminhtml/controllers/Cms/Wysiwyg/ImagesController.php - - message: "#^PHPDoc tag @param has invalid value \\(array\\)\\: Unexpected token \"\\\\n \\* \", expected variable at offset 96$#" + message: "#^Method Mage_Adminhtml_CustomerController\\:\\:cartAction\\(\\) should return string but return statement is missing\\.$#" count: 1 path: ../app/code/core/Mage/Adminhtml/controllers/CustomerController.php @@ -1671,14 +1481,14 @@ parameters: path: ../app/code/core/Mage/Adminhtml/controllers/IndexController.php - - message: "#^Variable \\$id in isset\\(\\) always exists and is not nullable\\.$#" + message: "#^Method Mage_Adminhtml_JsonController\\:\\:countryRegionAction\\(\\) should return string but return statement is missing\\.$#" count: 1 - path: ../app/code/core/Mage/Adminhtml/controllers/Permissions/BlockController.php + path: ../app/code/core/Mage/Adminhtml/controllers/JsonController.php - - message: "#^PHPDoc tag @var for variable \\$block contains unknown class Mage_Adminhtml_Block_Permissions_Variables\\.$#" + message: "#^Variable \\$id in isset\\(\\) always exists and is not nullable\\.$#" count: 1 - path: ../app/code/core/Mage/Adminhtml/controllers/Permissions/VariableController.php + path: ../app/code/core/Mage/Adminhtml/controllers/Permissions/BlockController.php - message: "#^Variable \\$id in isset\\(\\) always exists and is not nullable\\.$#" @@ -1755,21 +1565,6 @@ parameters: count: 1 path: ../app/code/core/Mage/Adminhtml/controllers/Sales/Order/ShipmentController.php - - - message: "#^Method Mage_Adminhtml_Sales_Order_ShipmentController\\:\\:massPrintShippingLabelAction\\(\\) should return null but return statement is missing\\.$#" - count: 1 - path: ../app/code/core/Mage/Adminhtml/controllers/Sales/Order/ShipmentController.php - - - - message: "#^Method Mage_Adminhtml_Sales_Order_ShipmentController\\:\\:saveAction\\(\\) should return null but return statement is missing\\.$#" - count: 1 - path: ../app/code/core/Mage/Adminhtml/controllers/Sales/Order/ShipmentController.php - - - - message: "#^Result of method Mage_Sales_Model_Order_Shipment\\:\\:getShippingLabel\\(\\) \\(void\\) is used\\.$#" - count: 1 - path: ../app/code/core/Mage/Adminhtml/controllers/Sales/Order/ShipmentController.php - - message: "#^Method Mage_Adminhtml_Controller_Action\\:\\:_setForcedFormKeyActions\\(\\) invoked with 2 parameters, 1 required\\.$#" count: 1 @@ -1970,11 +1765,6 @@ parameters: count: 1 path: ../app/code/core/Mage/Api/Model/Wsdl/Config/Element.php - - - message: "#^Method Mage_Api2_Block_Adminhtml_Attribute_Grid\\:\\:_prepareCollection\\(\\) should return \\$this\\(Mage_Api2_Block_Adminhtml_Attribute_Grid\\) but return statement is missing\\.$#" - count: 1 - path: ../app/code/core/Mage/Api2/Block/Adminhtml/Attribute/Grid.php - - message: "#^Call to an undefined method Varien_Data_Collection\\:\\:addFieldToFilter\\(\\)\\.$#" count: 2 @@ -1995,11 +1785,6 @@ parameters: count: 2 path: ../app/code/core/Mage/Api2/Model/Acl/Global/Rule/Tree.php - - - message: "#^Variable \\$routes in PHPDoc tag @var does not match any variable in the foreach loop\\: \\$route$#" - count: 1 - path: ../app/code/core/Mage/Api2/Model/Config.php - - message: "#^Call to an undefined method Mage_Api2_Model_Config\\:\\:getMainRoute\\(\\)\\.$#" count: 1 @@ -2070,11 +1855,6 @@ parameters: count: 1 path: ../app/code/core/Mage/Api2/Model/Route/ApiType.php - - - message: "#^PHPDoc tag @param has invalid value \\(array params\\)\\: Unexpected token \"params\", expected variable at offset 63$#" - count: 1 - path: ../app/code/core/Mage/Authorizenet/Helper/Data.php - - message: "#^Call to an undefined method Mage_Payment_Model_Info\\:\\:authorize\\(\\)\\.$#" count: 1 @@ -2100,26 +1880,6 @@ parameters: count: 1 path: ../app/code/core/Mage/Authorizenet/Model/Directpost.php - - - message: "#^PHPDoc tag @param for parameter \\$payment with type string is incompatible with native type Varien_Object\\.$#" - count: 1 - path: ../app/code/core/Mage/Authorizenet/Model/Directpost.php - - - - message: "#^PHPDoc tag @param has invalid value \\(Varien_Object\\)\\: Unexpected token \"\\\\n \", expected variable at offset 126$#" - count: 1 - path: ../app/code/core/Mage/Authorizenet/Model/Directpost.php - - - - message: "#^PHPDoc tag @param references unknown parameter\\: \\$entity$#" - count: 1 - path: ../app/code/core/Mage/Authorizenet/Model/Directpost.php - - - - message: "#^PHPDoc tag @param references unknown parameter\\: \\$invoicePayment$#" - count: 1 - path: ../app/code/core/Mage/Authorizenet/Model/Directpost.php - - message: "#^Call to an undefined method Mage_Payment_Model_Method_Abstract\\:\\:generateRequestFromOrder\\(\\)\\.$#" count: 1 @@ -2130,16 +1890,6 @@ parameters: count: 1 path: ../app/code/core/Mage/Authorizenet/controllers/Directpost/PaymentController.php - - - message: "#^PHPDoc tag @param has invalid value \\(string fileName\\)\\: Unexpected token \"fileName\", expected variable at offset 61$#" - count: 1 - path: ../app/code/core/Mage/Backup/Model/Backup.php - - - - message: "#^PHPDoc tag @param has invalid value \\(string filePath\\)\\: Unexpected token \"filePath\", expected variable at offset 91$#" - count: 1 - path: ../app/code/core/Mage/Backup/Model/Backup.php - - message: "#^Variable \\$filePath might not be defined\\.$#" count: 4 @@ -2465,11 +2215,6 @@ parameters: count: 1 path: ../app/code/core/Mage/Captcha/controllers/RefreshController.php - - - message: "#^Method Mage_Captcha_RefreshController\\:\\:indexAction\\(\\) should return null but return statement is missing\\.$#" - count: 1 - path: ../app/code/core/Mage/Captcha/controllers/RefreshController.php - - message: "#^Call to an undefined method Mage_Core_Block_Abstract\\:\\:addCrumb\\(\\)\\.$#" count: 2 @@ -2680,16 +2425,6 @@ parameters: count: 3 path: ../app/code/core/Mage/Catalog/Helper/Product.php - - - message: "#^Method Mage_Catalog_Model_Resource_Product_Compare_Item_Collection\\:\\:useProductItem\\(\\) invoked with 1 parameter, 0 required\\.$#" - count: 2 - path: ../app/code/core/Mage/Catalog/Helper/Product/Compare.php - - - - message: "#^PHPDoc tag @var above assignment does not specify variable name\\.$#" - count: 1 - path: ../app/code/core/Mage/Catalog/Helper/Product/Compare.php - - message: "#^Call to an undefined method Mage_Catalog_Model_Product_Type_Abstract\\:\\:getSelectedAttributesInfo\\(\\)\\.$#" count: 1 @@ -2905,11 +2640,6 @@ parameters: count: 1 path: ../app/code/core/Mage/Catalog/Model/Product/Action.php - - - message: "#^Variable \\$product in PHPDoc tag @var does not match assigned variable \\$productAttributes\\.$#" - count: 1 - path: ../app/code/core/Mage/Catalog/Model/Product/Api.php - - message: "#^Cannot access property \\$additional_attributes on array\\.$#" count: 5 @@ -2960,11 +2690,6 @@ parameters: count: 1 path: ../app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Recurring.php - - - message: "#^PHPDoc tag @var for constant Mage_Catalog_Model_Product_Attribute_Backend_Sku\\:\\:SKU_MAX_LENGTH with type string is incompatible with value 64\\.$#" - count: 1 - path: ../app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Sku.php - - message: "#^Cannot call method getBackend\\(\\) on bool\\|Mage_Catalog_Model_Resource_Eav_Mysql4_Attribute\\.$#" count: 11 @@ -3040,11 +2765,6 @@ parameters: count: 1 path: ../app/code/core/Mage/Catalog/Model/Product/Option/Type/File.php - - - message: "#^PHPDoc tag @param has invalid value \\(string Absolute directory path\\)\\: Unexpected token \"Absolute\", expected variable at offset 86$#" - count: 1 - path: ../app/code/core/Mage/Catalog/Model/Product/Option/Type/File.php - - message: "#^Variable \\$value in isset\\(\\) always exists and is not nullable\\.$#" count: 1 @@ -3317,7 +3037,7 @@ parameters: - message: "#^Binary operation \"\\*\" between string and 0\\.3 results in an error\\.$#" - count: 1 + count: 2 path: ../app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Price.php - @@ -3482,7 +3202,7 @@ parameters: - message: "#^Binary operation \"\\*\" between string and 0\\.3 results in an error\\.$#" - count: 1 + count: 2 path: ../app/code/core/Mage/CatalogInventory/Model/Resource/Indexer/Stock.php - @@ -3675,16 +3395,6 @@ parameters: count: 1 path: ../app/code/core/Mage/Checkout/Block/Cart/Item/Renderer.php - - - message: "#^PHPDoc tag @method has invalid value \\(\\$this setDeleteUrl\\(string\\)\\)\\: Unexpected token \"\\)\", expected variable at offset 297$#" - count: 1 - path: ../app/code/core/Mage/Checkout/Block/Cart/Item/Renderer.php - - - - message: "#^PHPDoc tag @method has invalid value \\(\\$this setProductName\\(string\\)\\)\\: Unexpected token \"\\)\", expected variable at offset 228$#" - count: 1 - path: ../app/code/core/Mage/Checkout/Block/Cart/Item/Renderer.php - - message: "#^Call to an undefined method Mage_Catalog_Model_Product_Type_Abstract\\:\\:getSelectedAttributesInfo\\(\\)\\.$#" count: 1 @@ -3825,31 +3535,11 @@ parameters: count: 2 path: ../app/code/core/Mage/Checkout/Model/Type/Onepage.php - - - message: "#^Method Mage_Checkout_CartController\\:\\:estimateUpdatePostAction\\(\\) should return null but return statement is missing\\.$#" - count: 1 - path: ../app/code/core/Mage/Checkout/controllers/CartController.php - - - - message: "#^PHPDoc tag @param has invalid value \\(array\\)\\: Unexpected token \"\\\\n \\* \", expected variable at offset 96$#" - count: 1 - path: ../app/code/core/Mage/Checkout/controllers/OnepageController.php - - - - message: "#^Method Mage_Cms_Block_Block\\:\\:_construct\\(\\) should return null but return statement is missing\\.$#" - count: 1 - path: ../app/code/core/Mage/Cms/Block/Block.php - - message: "#^Call to an undefined method Mage_Core_Block_Abstract\\:\\:addBodyClass\\(\\)\\.$#" count: 1 path: ../app/code/core/Mage/Cms/Block/Page.php - - - message: "#^Method Mage_Cms_Block_Widget_Block\\:\\:_construct\\(\\) should return null but return statement is missing\\.$#" - count: 1 - path: ../app/code/core/Mage/Cms/Block/Widget/Block.php - - message: "#^Call to an undefined method Mage_Core_Helper_Abstract\\:\\:isEnabled\\(\\)\\.$#" count: 1 @@ -4030,11 +3720,6 @@ parameters: count: 1 path: ../app/code/core/Mage/Core/Model/Design/Package.php - - - message: "#^PHPDoc tag @var above a method has no effect\\.$#" - count: 1 - path: ../app/code/core/Mage/Core/Model/Domainpolicy.php - - message: "#^Cannot call method addOnlyForSendingFilter\\(\\) on Mage_Core_Model_Resource_Db_Collection_Abstract\\|false\\.$#" count: 1 @@ -4120,11 +3805,6 @@ parameters: count: 1 path: ../app/code/core/Mage/Core/Model/Resource/Email/Queue.php - - - message: "#^Method Mage_Core_Model_Resource_Email_Queue_Collection\\:\\:_construct\\(\\) should return null but return statement is missing\\.$#" - count: 1 - path: ../app/code/core/Mage/Core/Model/Resource/Email/Queue/Collection.php - - message: "#^PHPDoc tag @param for parameter \\$callbacks with type array\\|string is not subtype of native type array\\.$#" count: 1 @@ -4150,11 +3830,6 @@ parameters: count: 2 path: ../app/code/core/Mage/Core/Model/Session/Abstract/Zend.php - - - message: "#^PHPDoc tag @method has invalid value \\(\\$thissetRootCategoryPath\\(string \\$value\\)\\)\\: Unexpected token \"\\$thissetRootCategoryPath\", expected type at offset 569$#" - count: 1 - path: ../app/code/core/Mage/Core/Model/Store.php - - message: "#^Variable \\$store might not be defined\\.$#" count: 8 @@ -4995,11 +4670,6 @@ parameters: count: 2 path: ../app/code/core/Mage/GiftMessage/Block/Message/Inline.php - - - message: "#^Variable \\$quote in PHPDoc tag @var does not match assigned variable \\$quoteItem\\.$#" - count: 1 - path: ../app/code/core/Mage/GiftMessage/Model/Api.php - - message: "#^Method Mage_GiftMessage_Model_Entity_Attribute_Backend_Boolean_Config\\:\\:afterLoad\\(\\) should return \\$this\\(Mage_GiftMessage_Model_Entity_Attribute_Backend_Boolean_Config\\) but return statement is missing\\.$#" count: 1 @@ -5030,16 +4700,6 @@ parameters: count: 3 path: ../app/code/core/Mage/GoogleAnalytics/Block/Ga.php - - - message: "#^PHPDoc tag @var for constant Mage_GoogleAnalytics_Helper_Data\\:\\:TYPE_ANALYTICS with type classic is incompatible with value 'analytics'\\.$#" - count: 1 - path: ../app/code/core/Mage/GoogleAnalytics/Helper/Data.php - - - - message: "#^PHPDoc tag @var for constant Mage_GoogleAnalytics_Helper_Data\\:\\:TYPE_UNIVERSAL with type google is incompatible with value 'universal'\\.$#" - count: 1 - path: ../app/code/core/Mage/GoogleAnalytics/Helper/Data.php - - message: "#^Method Mage_Eav_Model_Entity_Attribute_Source_Interface\\:\\:getAllOptions\\(\\) invoked with 1 parameter, 0 required\\.$#" count: 4 @@ -5075,11 +4735,6 @@ parameters: count: 1 path: ../app/code/core/Mage/ImportExport/Model/Export/Entity/Product.php - - - message: "#^Variable \\$collection in PHPDoc tag @var does not match assigned variable \\$validAttrCodes\\.$#" - count: 1 - path: ../app/code/core/Mage/ImportExport/Model/Export/Entity/Product.php - - message: "#^Variable \\$collection might not be defined\\.$#" count: 1 @@ -5220,11 +4875,6 @@ parameters: count: 2 path: ../app/code/core/Mage/ImportExport/Model/Import/Entity/Product.php - - - message: "#^Variable \\$attributeSet in PHPDoc tag @var does not match any variable in the foreach loop\\: \\$attribute$#" - count: 1 - path: ../app/code/core/Mage/ImportExport/Model/Import/Entity/Product/Type/Abstract.php - - message: "#^Call to an undefined method Mage_Core_Model_Resource_Helper_Abstract\\:\\:getNextAutoincrement\\(\\)\\.$#" count: 1 @@ -5280,21 +4930,6 @@ parameters: count: 1 path: ../app/code/core/Mage/Index/Model/Lock/Storage/Db.php - - - message: "#^Cannot call method addProcessId\\(\\) on Varien_Object\\|true\\.$#" - count: 2 - path: ../app/code/core/Mage/Index/Model/Process.php - - - - message: "#^Cannot call method save\\(\\) on Varien_Object\\|true\\.$#" - count: 1 - path: ../app/code/core/Mage/Index/Model/Process.php - - - - message: "#^Variable \\$event in PHPDoc tag @var does not exist\\.$#" - count: 1 - path: ../app/code/core/Mage/Index/Model/Process.php - - message: "#^Call to an undefined method Mage_Core_Model_Resource_Helper_Abstract\\:\\:insertData\\(\\)\\.$#" count: 1 @@ -5430,6 +5065,11 @@ parameters: count: 2 path: ../app/code/core/Mage/Newsletter/Model/Resource/Queue.php + - + message: "#^Call to method Zend_Db_Select\\:\\:where\\(\\) with incorrect case\\: Where$#" + count: 1 + path: ../app/code/core/Mage/Newsletter/Model/Resource/Subscriber.php + - message: "#^Call to an undefined method Mage_Customer_Model_Entity_Attribute\\:\\:getAttributeId\\(\\)\\.$#" count: 3 @@ -5505,36 +5145,6 @@ parameters: count: 2 path: ../app/code/core/Mage/Paygate/Model/Authorizenet.php - - - message: "#^Cannot call method setRequestedAmount\\(\\) on string\\.$#" - count: 1 - path: ../app/code/core/Mage/Paygate/Model/Authorizenet.php - - - - message: "#^PHPDoc tag @param has invalid value \\(Mage_Payment_Model_Info\\)\\: Unexpected token \"\\\\n \\* \", expected variable at offset 97$#" - count: 1 - path: ../app/code/core/Mage/Paygate/Model/Authorizenet.php - - - - message: "#^PHPDoc tag @param references unknown parameter\\: \\$amount$#" - count: 2 - path: ../app/code/core/Mage/Paygate/Model/Authorizenet.php - - - - message: "#^PHPDoc tag @param references unknown parameter\\: \\$invoicePayment$#" - count: 1 - path: ../app/code/core/Mage/Paygate/Model/Authorizenet.php - - - - message: "#^PHPDoc tag @param references unknown parameter\\: \\$message$#" - count: 1 - path: ../app/code/core/Mage/Paygate/Model/Authorizenet.php - - - - message: "#^PHPDoc tag @param references unknown parameter\\: \\$payment$#" - count: 1 - path: ../app/code/core/Mage/Paygate/Model/Authorizenet.php - - message: "#^Variable \\$defaultExceptionMessage might not be defined\\.$#" count: 2 @@ -5610,26 +5220,11 @@ parameters: count: 2 path: ../app/code/core/Mage/Paypal/Block/Adminhtml/Settlement/Details/Form.php - - - message: "#^Method Mage_Paypal_Block_Adminhtml_Settlement_Report_Grid\\:\\:_prepareCollection\\(\\) has invalid return type Mage_Paypal_Block_Adminhtml_Settlement_Grid\\.$#" - count: 1 - path: ../app/code/core/Mage/Paypal/Block/Adminhtml/Settlement/Report/Grid.php - - - - message: "#^Method Mage_Paypal_Block_Adminhtml_Settlement_Report_Grid\\:\\:_prepareColumns\\(\\) has invalid return type Mage_Paypal_Block_Adminhtml_Settlement_Grid\\.$#" - count: 1 - path: ../app/code/core/Mage/Paypal/Block/Adminhtml/Settlement/Report/Grid.php - - message: "#^Call to an undefined method Mage_Core_Helper_Abstract\\:\\:getScript\\(\\)\\.$#" count: 1 path: ../app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Field/Country.php - - - message: "#^PHPDoc tag @param references unknown parameter\\: \\$elementId$#" - count: 1 - path: ../app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Fieldset/Global.php - - message: "#^Call to an undefined method Mage_Core_Helper_Abstract\\:\\:getScript\\(\\)\\.$#" count: 1 @@ -5665,11 +5260,6 @@ parameters: count: 1 path: ../app/code/core/Mage/Paypal/Block/Express/Review.php - - - message: "#^PHPDoc tag @param has invalid value \\(Mage_Sales_Model_Quote_Address\\)\\: Unexpected token \"\\\\n \\* \", expected variable at offset 100$#" - count: 1 - path: ../app/code/core/Mage/Paypal/Block/Express/Review.php - - message: "#^Access to an undefined property Mage_Paypal_Model_Config\\:\\:\\$visible_on_cart\\.$#" count: 1 @@ -5770,51 +5360,6 @@ parameters: count: 1 path: ../app/code/core/Mage/Paypal/Model/Api/Nvp.php - - - message: "#^Method Mage_Paypal_Model_Api_Nvp\\:\\:_filterBillingAgreementStatus\\(\\) should return string but return statement is missing\\.$#" - count: 1 - path: ../app/code/core/Mage/Paypal/Model/Api/Nvp.php - - - - message: "#^Method Mage_Paypal_Model_Api_Nvp\\:\\:_filterPaymentReviewAction\\(\\) should return string\\|null but return statement is missing\\.$#" - count: 1 - path: ../app/code/core/Mage/Paypal/Model/Api/Nvp.php - - - - message: "#^Method Mage_Paypal_Model_Api_Nvp\\:\\:_filterPaymentStatusFromNvpToInfo\\(\\) should return string\\|null but return statement is missing\\.$#" - count: 1 - path: ../app/code/core/Mage/Paypal/Model/Api/Nvp.php - - - - message: "#^Method Mage_Paypal_Model_Api_Nvp\\:\\:_filterPeriodUnit\\(\\) should return string but return statement is missing\\.$#" - count: 1 - path: ../app/code/core/Mage/Paypal/Model/Api/Nvp.php - - - - message: "#^Method Mage_Paypal_Model_Api_Nvp\\:\\:_filterRecurringProfileActionToNvp\\(\\) should return string\\|null but return statement is missing\\.$#" - count: 1 - path: ../app/code/core/Mage/Paypal/Model/Api/Nvp.php - - - - message: "#^Method Mage_Paypal_Model_Api_Nvp\\:\\:_isCallSuccessful\\(\\) has invalid return type success\\.$#" - count: 1 - path: ../app/code/core/Mage/Paypal/Model/Api/Nvp.php - - - - message: "#^PHPDoc tag @param has invalid value \\(&array \\$requestFields\\)\\: Unexpected token \"&\", expected type at offset 119$#" - count: 1 - path: ../app/code/core/Mage/Paypal/Model/Api/Nvp.php - - - - message: "#^PHPDoc tag @param has invalid value \\(array\\)\\: Unexpected token \"\\\\n \\* \", expected variable at offset 78$#" - count: 1 - path: ../app/code/core/Mage/Paypal/Model/Api/Nvp.php - - - - message: "#^PHPDoc tag @param references unknown parameter\\: \\$payment$#" - count: 1 - path: ../app/code/core/Mage/Paypal/Model/Api/Nvp.php - - message: "#^Call to an undefined method Varien_Object\\:\\:isNominal\\(\\)\\.$#" count: 1 @@ -5900,11 +5445,6 @@ parameters: count: 1 path: ../app/code/core/Mage/Paypal/Model/Config.php - - - message: "#^PHPDoc tag @param references unknown parameter\\: \\$method$#" - count: 1 - path: ../app/code/core/Mage/Paypal/Model/Config.php - - message: "#^Access to an undefined property Mage_Paypal_Model_Config\\:\\:\\$cctypes\\.$#" count: 1 @@ -5920,21 +5460,6 @@ parameters: count: 1 path: ../app/code/core/Mage/Paypal/Model/Direct.php - - - message: "#^PHPDoc tag @param has invalid value \\(Mage_Paypal_Model_Api_Nvp\\)\\: Unexpected token \"\\\\n \\* \", expected variable at offset 98$#" - count: 1 - path: ../app/code/core/Mage/Paypal/Model/Direct.php - - - - message: "#^PHPDoc tag @param has invalid value \\(Mage_Sales_Model_Order_Payment\\)\\: Unexpected token \"\\\\n \", expected variable at offset 143$#" - count: 1 - path: ../app/code/core/Mage/Paypal/Model/Direct.php - - - - message: "#^PHPDoc tag @param has invalid value \\(Mage_Sales_Model_Quote\\)\\: Unexpected token \"\\\\n \\* \", expected variable at offset 88$#" - count: 1 - path: ../app/code/core/Mage/Paypal/Model/Direct.php - - message: "#^Access to an undefined property Mage_Paypal_Model_Config\\:\\:\\$lineItemsEnabled\\.$#" count: 1 @@ -5950,21 +5475,6 @@ parameters: count: 2 path: ../app/code/core/Mage/Paypal/Model/Express.php - - - message: "#^PHPDoc tag @param has invalid value \\(Mage_Paypal_Model_Api_Nvp\\)\\: Unexpected token \"\\\\n \\* \", expected variable at offset 88$#" - count: 1 - path: ../app/code/core/Mage/Paypal/Model/Express.php - - - - message: "#^PHPDoc tag @param has invalid value \\(Mage_Sales_Model_Order_Payment\\)\\: Unexpected token \"\\\\n \", expected variable at offset 133$#" - count: 1 - path: ../app/code/core/Mage/Paypal/Model/Express.php - - - - message: "#^PHPDoc tag @param has invalid value \\(Mage_Sales_Model_Quote\\)\\: Unexpected token \"\\\\n \\* \", expected variable at offset 88$#" - count: 1 - path: ../app/code/core/Mage/Paypal/Model/Express.php - - message: "#^Access to an undefined property Mage_Paypal_Model_Config\\:\\:\\$allow_ba_signup\\.$#" count: 1 @@ -6045,16 +5555,6 @@ parameters: count: 1 path: ../app/code/core/Mage/Paypal/Model/Ipn.php - - - message: "#^PHPDoc tag @param references unknown parameter\\: \\$debugData$#" - count: 1 - path: ../app/code/core/Mage/Paypal/Model/Ipn.php - - - - message: "#^PHPDoc tag @param references unknown parameter\\: \\$payment$#" - count: 1 - path: ../app/code/core/Mage/Paypal/Model/Ipn.php - - message: "#^Access to an undefined property Mage_Paypal_Model_Config\\:\\:\\$lineItemsEnabled\\.$#" count: 1 @@ -6160,11 +5660,6 @@ parameters: count: 1 path: ../app/code/core/Mage/Paypal/Model/Payflowlink.php - - - message: "#^PHPDoc tag @param has invalid value \\(Mage_Sales_Model_Quote\\)\\: Unexpected token \"\\\\n \\* \", expected variable at offset 95$#" - count: 1 - path: ../app/code/core/Mage/Paypal/Model/Payflowlink.php - - message: "#^Variable \\$order in empty\\(\\) always exists and is not falsy\\.$#" count: 1 @@ -6195,16 +5690,6 @@ parameters: count: 1 path: ../app/code/core/Mage/Paypal/Model/Payflowpro.php - - - message: "#^PHPDoc tag @param has invalid value \\(Mage_Sales_Model_Quote\\)\\: Unexpected token \"\\\\n \\* \", expected variable at offset 95$#" - count: 1 - path: ../app/code/core/Mage/Paypal/Model/Payflowpro.php - - - - message: "#^PHPDoc tag @param references unknown parameter\\: \\$statusCode$#" - count: 1 - path: ../app/code/core/Mage/Paypal/Model/Payflowpro.php - - message: "#^Variable \\$order in empty\\(\\) always exists and is not falsy\\.$#" count: 1 @@ -6215,66 +5700,16 @@ parameters: count: 1 path: ../app/code/core/Mage/Paypal/Model/Payment/Transaction.php - - - message: "#^PHPDoc tag @param references unknown parameter\\: \\$failsafe$#" - count: 1 - path: ../app/code/core/Mage/Paypal/Model/Payment/Transaction.php - - message: "#^Method Mage_Paypal_Model_Pro\\:\\:capture\\(\\) should return false\\|null but return statement is missing\\.$#" count: 1 path: ../app/code/core/Mage/Paypal/Model/Pro.php - - - message: "#^PHPDoc tag @param has invalid value \\(Mage_Paypal_Model_Api_Nvp\\)\\: Unexpected token \"\\\\n \\* \", expected variable at offset 90$#" - count: 1 - path: ../app/code/core/Mage/Paypal/Model/Pro.php - - - - message: "#^PHPDoc tag @param has invalid value \\(Mage_Paypal_Model_Api_Nvp\\)\\: Unexpected token \"\\\\n \\* \", expected variable at offset 91$#" - count: 1 - path: ../app/code/core/Mage/Paypal/Model/Pro.php - - - - message: "#^PHPDoc tag @param has invalid value \\(Mage_Sales_Model_Order_Payment\\)\\: Unexpected token \"\\\\n \", expected variable at offset 136$#" - count: 1 - path: ../app/code/core/Mage/Paypal/Model/Pro.php - - - - message: "#^PHPDoc tag @param has invalid value \\(Mage_Sales_Model_Order_Payment\\)\\: Unexpected token \"\\\\n \\* \", expected variable at offset 135$#" - count: 1 - path: ../app/code/core/Mage/Paypal/Model/Pro.php - - - - message: "#^PHPDoc tag @param has invalid value \\(string code\\)\\: Unexpected token \"code\", expected variable at offset 157$#" - count: 1 - path: ../app/code/core/Mage/Paypal/Model/Report/Settlement/Row.php - - - - message: "#^PHPDoc tag @param has invalid value \\(string code\\)\\: Unexpected token \"code\", expected variable at offset 163$#" - count: 1 - path: ../app/code/core/Mage/Paypal/Model/Report/Settlement/Row.php - - - - message: "#^PHPDoc tag @param has invalid value \\(string code\\)\\: Unexpected token \"code\", expected variable at offset 83$#" - count: 1 - path: ../app/code/core/Mage/Paypal/Model/Report/Settlement/Row.php - - - - message: "#^PHPDoc tag @return has invalid value \\(&array\\)\\: Unexpected token \"&\", expected type at offset 79$#" - count: 1 - path: ../app/code/core/Mage/Paypal/Model/Report/Settlement/Row.php - - message: "#^Call to an undefined method Mage_Core_Model_Abstract\\:\\:isFailsafe\\(\\)\\.$#" count: 1 path: ../app/code/core/Mage/Paypal/Model/Resource/Payment/Transaction.php - - - message: "#^PHPDoc tag @param has invalid value \\(mixed \\(array\\|string\\|object\\) \\$columns\\)\\: Unexpected token \"\\(\", expected variable at offset 110$#" - count: 1 - path: ../app/code/core/Mage/Paypal/Model/Resource/Payment/Transaction.php - - message: "#^Call to method Varien_Db_Adapter_Pdo_Mysql\\:\\:rollback\\(\\) with incorrect case\\: rollBack$#" count: 1 @@ -6295,16 +5730,6 @@ parameters: count: 1 path: ../app/code/core/Mage/Paypal/Model/Standard.php - - - message: "#^PHPDoc tag @param has invalid value \\(Mage_Sales_Model_Quote\\)\\: Unexpected token \"\\\\n \\* \", expected variable at offset 88$#" - count: 1 - path: ../app/code/core/Mage/Paypal/Model/Standard.php - - - - message: "#^PHPDoc tag @param has invalid value \\(Varien_Object\\)\\: Unexpected token \"\\\\n \", expected variable at offset 119$#" - count: 1 - path: ../app/code/core/Mage/Paypal/Model/Standard.php - - message: "#^Method Mage_Paypal_Model_System_Config_Backend_MerchantCountry\\:\\:_afterLoad\\(\\) should return \\$this\\(Mage_Paypal_Model_System_Config_Backend_MerchantCountry\\) but return statement is missing\\.$#" count: 1 @@ -6530,21 +5955,6 @@ parameters: count: 1 path: ../app/code/core/Mage/Rss/Block/Catalog/New.php - - - message: "#^Method Mage_Rss_Block_Catalog_NotifyStock\\:\\:_construct\\(\\) should return null but return statement is missing\\.$#" - count: 1 - path: ../app/code/core/Mage/Rss/Block/Catalog/NotifyStock.php - - - - message: "#^Method Mage_Rss_Block_Catalog_Review\\:\\:_construct\\(\\) should return null but return statement is missing\\.$#" - count: 1 - path: ../app/code/core/Mage/Rss/Block/Catalog/Review.php - - - - message: "#^Method Mage_Rss_Block_Catalog_Review\\:\\:addReviewItemXmlCallback\\(\\) should return null but return statement is missing\\.$#" - count: 1 - path: ../app/code/core/Mage/Rss/Block/Catalog/Review.php - - message: "#^Call to an undefined method Mage_Core_Helper_Abstract\\:\\:init\\(\\)\\.$#" count: 1 @@ -6695,11 +6105,6 @@ parameters: count: 1 path: ../app/code/core/Mage/Sales/Block/Order/Comments.php - - - message: "#^PHPDoc tag @param has invalid value \\(Mage_Sales_Model_Abstract\\)\\: Unexpected token \"\\\\n \\* \", expected variable at offset 93$#" - count: 1 - path: ../app/code/core/Mage/Sales/Block/Order/Comments.php - - message: "#^Call to an undefined method Mage_Core_Helper_Abstract\\:\\:getInfoBlock\\(\\)\\.$#" count: 1 @@ -6750,11 +6155,6 @@ parameters: count: 1 path: ../app/code/core/Mage/Sales/Block/Order/View.php - - - message: "#^Method Mage_Sales_Controller_Abstract\\:\\:_viewAction\\(\\) should return null but return statement is missing\\.$#" - count: 1 - path: ../app/code/core/Mage/Sales/Controller/Abstract.php - - message: "#^Cannot call method addCrumb\\(\\) on Mage_Core_Block_Abstract\\|false\\.$#" count: 2 @@ -6790,11 +6190,6 @@ parameters: count: 1 path: ../app/code/core/Mage/Sales/Model/Observer.php - - - message: "#^Method Mage_Sales_Model_Observer\\:\\:addVatRequestParamsOrderComment\\(\\) should return null but return statement is missing\\.$#" - count: 1 - path: ../app/code/core/Mage/Sales/Model/Observer.php - - message: "#^Variable \\$oldArea might not be defined\\.$#" count: 1 @@ -6890,11 +6285,6 @@ parameters: count: 1 path: ../app/code/core/Mage/Sales/Model/Quote.php - - - message: "#^PHPDoc tag @param for parameter \\$product with type mixed is not subtype of native type Mage_Catalog_Model_Product\\.$#" - count: 2 - path: ../app/code/core/Mage/Sales/Model/Quote.php - - message: "#^Variable \\$item might not be defined\\.$#" count: 1 @@ -6970,11 +6360,6 @@ parameters: count: 1 path: ../app/code/core/Mage/Sales/Model/Resource/Order/Payment/Transaction.php - - - message: "#^PHPDoc tag @param has invalid value \\(mixed \\(array\\|string\\|object\\) \\$columns\\)\\: Unexpected token \"\\(\", expected variable at offset 166$#" - count: 1 - path: ../app/code/core/Mage/Sales/Model/Resource/Order/Payment/Transaction.php - - message: "#^Call to an undefined method Mage_Core_Model_Resource_Helper_Abstract\\:\\:getBestsellersReportUpdateRatingPos\\(\\)\\.$#" count: 1 @@ -6990,11 +6375,6 @@ parameters: count: 2 path: ../app/code/core/Mage/Sales/Model/Resource/Report/Bestsellers.php - - - message: "#^PHPDoc tag @param has invalid value \\(object Varien_Db_Select\\|null \\$subSelect\\)\\: Unexpected token \"Varien_Db_Select\", expected variable at offset 79$#" - count: 1 - path: ../app/code/core/Mage/Sales/Model/Resource/Report/Bestsellers.php - - message: "#^Call to an undefined method Mage_Core_Model_Resource_Helper_Abstract\\:\\:getQueryUsingAnalyticFunction\\(\\)\\.$#" count: 1 @@ -7125,16 +6505,6 @@ parameters: count: 1 path: ../app/code/core/Mage/SalesRule/Model/Resource/Rule.php - - - message: "#^PHPDoc tag @use has invalid value \\(\\$this\\-\\>addWebsiteFilter\\(\\)\\)\\: Unexpected token \"\\$this\", expected type at offset 264$#" - count: 1 - path: ../app/code/core/Mage/SalesRule/Model/Resource/Rule/Collection.php - - - - message: "#^PHPDoc tag @use has invalid value \\(\\$this\\-\\>addWebsiteGroupDateFilter\\(\\)\\)\\: Unexpected token \"\\$this\", expected type at offset 330$#" - count: 1 - path: ../app/code/core/Mage/SalesRule/Model/Resource/Rule/Collection.php - - message: "#^Call to an undefined method Mage_Core_Helper_Abstract\\:\\:getApplied\\(\\)\\.$#" count: 1 @@ -7185,11 +6555,6 @@ parameters: count: 1 path: ../app/code/core/Mage/Shipping/Model/Carrier/Abstract.php - - - message: "#^Method Mage_Shipping_Model_Carrier_Abstract\\:\\:_updateFreeMethodQuote\\(\\) should return null but return statement is missing\\.$#" - count: 1 - path: ../app/code/core/Mage/Shipping/Model/Carrier/Abstract.php - - message: "#^Variable \\$rate in empty\\(\\) is never defined\\.$#" count: 1 @@ -7235,11 +6600,6 @@ parameters: count: 1 path: ../app/code/core/Mage/Shipping/Model/Shipping.php - - - message: "#^Method Mage_Shipping_Model_Shipping\\:\\:setOrigData\\(\\) should return null but return statement is missing\\.$#" - count: 1 - path: ../app/code/core/Mage/Shipping/Model/Shipping.php - - message: "#^Variable \\$sumResults in empty\\(\\) always exists and is not falsy\\.$#" count: 1 @@ -7455,11 +6815,6 @@ parameters: count: 1 path: ../app/code/core/Mage/Tax/Model/Sales/Total/Quote/Tax.php - - - message: "#^PHPDoc tag @var above assignment does not specify variable name\\.$#" - count: 1 - path: ../app/code/core/Mage/Tax/Model/System/Config/Source/Tax/Region.php - - message: "#^Call to an undefined method Mage_Core_Helper_Abstract\\:\\:jsonEncode\\(\\)\\.$#" count: 1 @@ -7594,4 +6949,3 @@ parameters: message: "#^Variable \\$emails in empty\\(\\) always exists and is not falsy\\.$#" count: 1 path: ../app/code/core/Mage/Wishlist/controllers/IndexController.php - From 979dc2ba576334a81549ca497969cee34dc0f97c Mon Sep 17 00:00:00 2001 From: Sven Reichel Date: Tue, 9 Aug 2022 01:41:42 +0200 Subject: [PATCH 3/6] Updated phstan baseline (see errors incoming) --- .github/phpstan-baseline.neon | 39 ++--------------------------------- 1 file changed, 2 insertions(+), 37 deletions(-) diff --git a/.github/phpstan-baseline.neon b/.github/phpstan-baseline.neon index 648d969ed32..deb8965ed7f 100644 --- a/.github/phpstan-baseline.neon +++ b/.github/phpstan-baseline.neon @@ -1310,11 +1310,6 @@ parameters: count: 1 path: ../app/code/core/Mage/Adminhtml/Helper/Dashboard/Abstract.php - - - message: "#^Method Mage_Adminhtml_Helper_Data\\:\\:prepareFilterString\\(\\) has invalid return type data\\.$#" - count: 1 - path: ../app/code/core/Mage/Adminhtml/Helper/Data.php - - message: "#^Method Mage_Adminhtml_Model_Config\\:\\:getSection\\(\\) should return Varien_Simplexml_Element but return statement is missing\\.$#" count: 1 @@ -1445,26 +1440,6 @@ parameters: count: 1 path: ../app/code/core/Mage/Adminhtml/controllers/Catalog/SearchController.php - - - message: "#^Call to method _saveSessionCurrentPath\\(\\) on an unknown class Mage_Adminhtml_Cms_Page_Wysiwyg_ImagesController\\.$#" - count: 1 - path: ../app/code/core/Mage/Adminhtml/controllers/Cms/Wysiwyg/ImagesController.php - - - - message: "#^Call to method loadLayout\\(\\) on an unknown class Mage_Adminhtml_Cms_Page_Wysiwyg_ImagesController\\.$#" - count: 1 - path: ../app/code/core/Mage/Adminhtml/controllers/Cms/Wysiwyg/ImagesController.php - - - - message: "#^Method Mage_Adminhtml_Cms_Wysiwyg_ImagesController\\:\\:_initAction\\(\\) has invalid return type Mage_Adminhtml_Cms_Page_Wysiwyg_ImagesController\\.$#" - count: 1 - path: ../app/code/core/Mage/Adminhtml/controllers/Cms/Wysiwyg/ImagesController.php - - - - message: "#^Method Mage_Adminhtml_Cms_Wysiwyg_ImagesController\\:\\:_saveSessionCurrentPath\\(\\) has invalid return type Mage_Adminhtml_Cms_Page_Wysiwyg_ImagesController\\.$#" - count: 1 - path: ../app/code/core/Mage/Adminhtml/controllers/Cms/Wysiwyg/ImagesController.php - - message: "#^Method Mage_Adminhtml_CustomerController\\:\\:cartAction\\(\\) should return string but return statement is missing\\.$#" count: 1 @@ -1475,11 +1450,6 @@ parameters: count: 1 path: ../app/code/core/Mage/Adminhtml/controllers/IndexController.php - - - message: "#^Method Mage_Adminhtml_JsonController\\:\\:countryRegionAction\\(\\) should return string but return statement is missing\\.$#" - count: 1 - path: ../app/code/core/Mage/Adminhtml/controllers/JsonController.php - - message: "#^Variable \\$id in isset\\(\\) always exists and is not nullable\\.$#" count: 1 @@ -3032,7 +3002,7 @@ parameters: - message: "#^Binary operation \"\\*\" between string and 0\\.3 results in an error\\.$#" - count: 2 + count: 1 path: ../app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Price.php - @@ -3197,7 +3167,7 @@ parameters: - message: "#^Binary operation \"\\*\" between string and 0\\.3 results in an error\\.$#" - count: 2 + count: 1 path: ../app/code/core/Mage/CatalogInventory/Model/Resource/Indexer/Stock.php - @@ -5055,11 +5025,6 @@ parameters: count: 2 path: ../app/code/core/Mage/Newsletter/Model/Resource/Queue.php - - - message: "#^Call to method Zend_Db_Select\\:\\:where\\(\\) with incorrect case\\: Where$#" - count: 1 - path: ../app/code/core/Mage/Newsletter/Model/Resource/Subscriber.php - - message: "#^Call to an undefined method Mage_Customer_Model_Entity_Attribute\\:\\:getAttributeId\\(\\)\\.$#" count: 3 From 55947b53fac39c7b63b8aa70538e735e1ff24df4 Mon Sep 17 00:00:00 2001 From: Sven Reichel Date: Tue, 9 Aug 2022 02:09:42 +0200 Subject: [PATCH 4/6] Set some exclude paths --- .github/phpstan.neon | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/phpstan.neon b/.github/phpstan.neon index c6dd2eaed7d..b19a6f62a51 100644 --- a/.github/phpstan.neon +++ b/.github/phpstan.neon @@ -19,7 +19,6 @@ parameters: - %currentWorkingDirectory%/app/code/core/Mage/CatalogInventory - %currentWorkingDirectory%/app/code/core/Mage/CatalogRule - %currentWorkingDirectory%/app/code/core/Mage/CatalogSearch -# - %currentWorkingDirectory%/app/code/core/Mage/Centinel - %currentWorkingDirectory%/app/code/core/Mage/Checkout - %currentWorkingDirectory%/app/code/core/Mage/Cms - %currentWorkingDirectory%/app/code/core/Mage/ConfigurableSwatches @@ -47,7 +46,6 @@ parameters: - %currentWorkingDirectory%/app/code/core/Mage/Paygate - %currentWorkingDirectory%/app/code/core/Mage/Payment - %currentWorkingDirectory%/app/code/core/Mage/Paypal -# - %currentWorkingDirectory%/app/code/core/Mage/PaypalUk - %currentWorkingDirectory%/app/code/core/Mage/Persistent - %currentWorkingDirectory%/app/code/core/Mage/Poll - %currentWorkingDirectory%/app/code/core/Mage/ProductAlert @@ -64,11 +62,15 @@ parameters: - %currentWorkingDirectory%/app/code/core/Mage/Tag - %currentWorkingDirectory%/app/code/core/Mage/Tax - %currentWorkingDirectory%/app/code/core/Mage/Uploader -# - %currentWorkingDirectory%/app/code/core/Mage/Usa - %currentWorkingDirectory%/app/code/core/Mage/Widget -# - %currentWorkingDirectory%/app/code/core/Mage/Weee - %currentWorkingDirectory%/app/code/core/Mage/Wishlist excludePaths: + #todo DOCblocks + - %currentWorkingDirectory%/app/code/core/Mage/Centinel + - %currentWorkingDirectory%/app/code/core/Mage/PaypalUk + - %currentWorkingDirectory%/app/code/core/Mage/Usa + - %currentWorkingDirectory%/app/code/core/Mage/Weee + #incompatible interfaces - */app/code/core/Mage/Admin/Model/Acl/Assert/Ip.php - */app/code/core/Mage/Admin/Model/Acl/Assert/Time.php From 30b4be797c0facc11f02e452f776338eca10f77d Mon Sep 17 00:00:00 2001 From: Sven Reichel Date: Tue, 9 Aug 2022 05:58:05 +0200 Subject: [PATCH 5/6] Updated phpstan.neon --- .github/phpstan.neon | 61 ++------------------------------------------ 1 file changed, 2 insertions(+), 59 deletions(-) diff --git a/.github/phpstan.neon b/.github/phpstan.neon index b19a6f62a51..c31ae1e5fda 100644 --- a/.github/phpstan.neon +++ b/.github/phpstan.neon @@ -5,65 +5,7 @@ parameters: magentoRootPath: %currentWorkingDirectory% paths: #lets start small with just few modules - - %currentWorkingDirectory%/app/code/core/Mage/Admin - - %currentWorkingDirectory%/app/code/core/Mage/Adminhtml - - %currentWorkingDirectory%/app/code/core/Mage/AdminNotification - - %currentWorkingDirectory%/app/code/core/Mage/Api - - %currentWorkingDirectory%/app/code/core/Mage/Api2 - - %currentWorkingDirectory%/app/code/core/Mage/Authorizenet - - %currentWorkingDirectory%/app/code/core/Mage/Backup - - %currentWorkingDirectory%/app/code/core/Mage/Bundle - - %currentWorkingDirectory%/app/code/core/Mage/Captcha - - %currentWorkingDirectory%/app/code/core/Mage/Catalog - - %currentWorkingDirectory%/app/code/core/Mage/CatalogIndex - - %currentWorkingDirectory%/app/code/core/Mage/CatalogInventory - - %currentWorkingDirectory%/app/code/core/Mage/CatalogRule - - %currentWorkingDirectory%/app/code/core/Mage/CatalogSearch - - %currentWorkingDirectory%/app/code/core/Mage/Checkout - - %currentWorkingDirectory%/app/code/core/Mage/Cms - - %currentWorkingDirectory%/app/code/core/Mage/ConfigurableSwatches - - %currentWorkingDirectory%/app/code/core/Mage/Contacts - - %currentWorkingDirectory%/app/code/core/Mage/Core - - %currentWorkingDirectory%/app/code/core/Mage/Cron - - %currentWorkingDirectory%/app/code/core/Mage/CurrencySymbol - - %currentWorkingDirectory%/app/code/core/Mage/Customer - - %currentWorkingDirectory%/app/code/core/Mage/Dataflow - - %currentWorkingDirectory%/app/code/core/Mage/Directory - - %currentWorkingDirectory%/app/code/core/Mage/Downloadable - - %currentWorkingDirectory%/app/code/core/Mage/Eav - - %currentWorkingDirectory%/app/code/core/Mage/GiftMessage - - %currentWorkingDirectory%/app/code/core/Mage/GoogleAnalytics - - %currentWorkingDirectory%/app/code/core/Mage/GoogleCheckout - - %currentWorkingDirectory%/app/code/core/Mage/ImportExport - - %currentWorkingDirectory%/app/code/core/Mage/Index - - %currentWorkingDirectory%/app/code/core/Mage/Install - - %currentWorkingDirectory%/app/code/core/Mage/Log - - %currentWorkingDirectory%/app/code/core/Mage/Media - - %currentWorkingDirectory%/app/code/core/Mage/Newsletter - - %currentWorkingDirectory%/app/code/core/Mage/Oauth - - %currentWorkingDirectory%/app/code/core/Mage/Page - - %currentWorkingDirectory%/app/code/core/Mage/PageCache - - %currentWorkingDirectory%/app/code/core/Mage/Paygate - - %currentWorkingDirectory%/app/code/core/Mage/Payment - - %currentWorkingDirectory%/app/code/core/Mage/Paypal - - %currentWorkingDirectory%/app/code/core/Mage/Persistent - - %currentWorkingDirectory%/app/code/core/Mage/Poll - - %currentWorkingDirectory%/app/code/core/Mage/ProductAlert - - %currentWorkingDirectory%/app/code/core/Mage/Rating - - %currentWorkingDirectory%/app/code/core/Mage/Reports - - %currentWorkingDirectory%/app/code/core/Mage/Review - - %currentWorkingDirectory%/app/code/core/Mage/Rss - - %currentWorkingDirectory%/app/code/core/Mage/Rule - - %currentWorkingDirectory%/app/code/core/Mage/Sales - - %currentWorkingDirectory%/app/code/core/Mage/SalesRule - - %currentWorkingDirectory%/app/code/core/Mage/Sendfriend - - %currentWorkingDirectory%/app/code/core/Mage/Shipping - - %currentWorkingDirectory%/app/code/core/Mage/Sitemap - - %currentWorkingDirectory%/app/code/core/Mage/Tag - - %currentWorkingDirectory%/app/code/core/Mage/Tax - - %currentWorkingDirectory%/app/code/core/Mage/Uploader - - %currentWorkingDirectory%/app/code/core/Mage/Widget - - %currentWorkingDirectory%/app/code/core/Mage/Wishlist + - %currentWorkingDirectory%/app/code/core/Mage excludePaths: #todo DOCblocks - %currentWorkingDirectory%/app/code/core/Mage/Centinel @@ -78,6 +20,7 @@ parameters: - */app/code/core/Mage/Api/Model/Acl/Assert/Time.php - */app/code/core/Mage/Adminhtml/Block/Widget/Grid/Block.php - */app/code/core/Mage/Core/Model/Mysql4/Design/Theme/Collection.php + # deprecated _getHelper() - */app/code/core/Mage/Adminhtml/Controller/Rss/Abstract.php - */app/code/core/Mage/Adminhtml/controllers/Rss/OrderController.php From 78a4ee4f0ff3fe8bf1c326b7bb5a74465aad682b Mon Sep 17 00:00:00 2001 From: Sven Reichel Date: Tue, 9 Aug 2022 06:01:28 +0200 Subject: [PATCH 6/6] Updated phpstan.neon (removed comment) --- .github/phpstan.neon | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/phpstan.neon b/.github/phpstan.neon index c31ae1e5fda..00369b21ec6 100644 --- a/.github/phpstan.neon +++ b/.github/phpstan.neon @@ -4,7 +4,6 @@ includes: parameters: magentoRootPath: %currentWorkingDirectory% paths: - #lets start small with just few modules - %currentWorkingDirectory%/app/code/core/Mage excludePaths: #todo DOCblocks