From 612dda7ec3823516d34135b6876c7f81eb1cbfb6 Mon Sep 17 00:00:00 2001 From: Dan Wallis Date: Tue, 7 Mar 2023 14:00:46 +0000 Subject: [PATCH 1/2] Remove forbidden @author tag --- app/code/Magento/Reports/Block/Adminhtml/Sales/Refunded.php | 1 - .../Magento/Reports/Block/Adminhtml/Sales/Refunded/Grid.php | 1 - app/code/Magento/Reports/Block/Adminhtml/Sales/Sales.php | 1 - app/code/Magento/Reports/Block/Adminhtml/Sales/Shipping.php | 1 - .../Magento/Reports/Block/Adminhtml/Sales/Shipping/Grid.php | 1 - app/code/Magento/Reports/Block/Adminhtml/Sales/Tax.php | 1 - app/code/Magento/Reports/Block/Adminhtml/Sales/Tax/Grid.php | 1 - .../Magento/Reports/Block/Adminhtml/Shopcart/Abandoned.php | 2 -- .../Reports/Block/Adminhtml/Shopcart/Abandoned/Grid.php | 1 - app/code/Magento/Reports/Block/Adminhtml/Shopcart/Customer.php | 2 -- .../Magento/Reports/Block/Adminhtml/Shopcart/Customer/Grid.php | 1 - app/code/Magento/Reports/Block/Adminhtml/Shopcart/Product.php | 2 -- .../Magento/Reports/Block/Adminhtml/Shopcart/Product/Grid.php | 1 - app/code/Magento/Reports/Block/Adminhtml/Wishlist.php | 1 - app/code/Magento/Reports/Block/Adminhtml/Wishlist/Grid.php | 2 -- app/code/Magento/Reports/Block/Product/AbstractProduct.php | 2 -- app/code/Magento/Reports/Block/Product/Compared.php | 1 - app/code/Magento/Reports/Block/Product/Viewed.php | 1 - app/code/Magento/Reports/Block/Product/Widget/Viewed/Item.php | 1 - app/code/Magento/Reports/Controller/Adminhtml/Index.php | 2 -- .../Reports/Controller/Adminhtml/Report/AbstractReport.php | 2 -- .../Magento/Reports/Controller/Adminhtml/Report/Customer.php | 3 --- .../Magento/Reports/Controller/Adminhtml/Report/Product.php | 2 -- .../Magento/Reports/Controller/Adminhtml/Report/Review.php | 2 -- app/code/Magento/Reports/Controller/Adminhtml/Report/Sales.php | 2 -- .../Magento/Reports/Controller/Adminhtml/Report/Shopcart.php | 2 -- app/code/Magento/Reports/Model/Event.php | 1 - app/code/Magento/Reports/Model/Flag.php | 1 - app/code/Magento/Reports/Model/Product/Index/Compared.php | 1 - app/code/Magento/Reports/Model/Product/Index/Viewed.php | 1 - .../Reports/Model/ResourceModel/Accounts/Collection.php | 2 -- .../Model/ResourceModel/Accounts/Collection/Initial.php | 2 -- .../Reports/Model/ResourceModel/Customer/Orders/Collection.php | 2 -- .../Model/ResourceModel/Customer/Orders/Collection/Initial.php | 2 -- .../Reports/Model/ResourceModel/Customer/Totals/Collection.php | 2 -- 35 files changed, 53 deletions(-) diff --git a/app/code/Magento/Reports/Block/Adminhtml/Sales/Refunded.php b/app/code/Magento/Reports/Block/Adminhtml/Sales/Refunded.php index 994b29e6eb0dd..47d312248cd82 100644 --- a/app/code/Magento/Reports/Block/Adminhtml/Sales/Refunded.php +++ b/app/code/Magento/Reports/Block/Adminhtml/Sales/Refunded.php @@ -9,7 +9,6 @@ * Adminhtml refunded report page content block * * @api - * @author Magento Core Team * @since 100.0.2 */ class Refunded extends \Magento\Backend\Block\Widget\Grid\Container diff --git a/app/code/Magento/Reports/Block/Adminhtml/Sales/Refunded/Grid.php b/app/code/Magento/Reports/Block/Adminhtml/Sales/Refunded/Grid.php index 6d3f26b63ab08..3fbaa66040654 100644 --- a/app/code/Magento/Reports/Block/Adminhtml/Sales/Refunded/Grid.php +++ b/app/code/Magento/Reports/Block/Adminhtml/Sales/Refunded/Grid.php @@ -9,7 +9,6 @@ /** * Adminhtml refunded report grid block * - * @author Magento Core Team * @SuppressWarnings(PHPMD.DepthOfInheritance) */ class Grid extends \Magento\Reports\Block\Adminhtml\Grid\AbstractGrid diff --git a/app/code/Magento/Reports/Block/Adminhtml/Sales/Sales.php b/app/code/Magento/Reports/Block/Adminhtml/Sales/Sales.php index 64375ace3e94d..9b8071ab9a530 100644 --- a/app/code/Magento/Reports/Block/Adminhtml/Sales/Sales.php +++ b/app/code/Magento/Reports/Block/Adminhtml/Sales/Sales.php @@ -9,7 +9,6 @@ * Adminhtml sales report page content block * * @api - * @author Magento Core Team * @since 100.0.2 */ class Sales extends \Magento\Backend\Block\Widget\Grid\Container diff --git a/app/code/Magento/Reports/Block/Adminhtml/Sales/Shipping.php b/app/code/Magento/Reports/Block/Adminhtml/Sales/Shipping.php index e4dbdc2737745..bb55f7f2be89f 100644 --- a/app/code/Magento/Reports/Block/Adminhtml/Sales/Shipping.php +++ b/app/code/Magento/Reports/Block/Adminhtml/Sales/Shipping.php @@ -9,7 +9,6 @@ * Adminhtml shipping report page content block * * @api - * @author Magento Core Team * @since 100.0.2 */ class Shipping extends \Magento\Backend\Block\Widget\Grid\Container diff --git a/app/code/Magento/Reports/Block/Adminhtml/Sales/Shipping/Grid.php b/app/code/Magento/Reports/Block/Adminhtml/Sales/Shipping/Grid.php index b354f4944b12e..b18bb687e1c69 100644 --- a/app/code/Magento/Reports/Block/Adminhtml/Sales/Shipping/Grid.php +++ b/app/code/Magento/Reports/Block/Adminhtml/Sales/Shipping/Grid.php @@ -9,7 +9,6 @@ /** * Adminhtml shipping report grid block * - * @author Magento Core Team * @SuppressWarnings(PHPMD.DepthOfInheritance) */ class Grid extends \Magento\Reports\Block\Adminhtml\Grid\AbstractGrid diff --git a/app/code/Magento/Reports/Block/Adminhtml/Sales/Tax.php b/app/code/Magento/Reports/Block/Adminhtml/Sales/Tax.php index fa9e63745a87d..b957ed659ad06 100644 --- a/app/code/Magento/Reports/Block/Adminhtml/Sales/Tax.php +++ b/app/code/Magento/Reports/Block/Adminhtml/Sales/Tax.php @@ -9,7 +9,6 @@ * Adminhtml tax report page content block * * @api - * @author Magento Core Team * @since 100.0.2 */ class Tax extends \Magento\Backend\Block\Widget\Grid\Container diff --git a/app/code/Magento/Reports/Block/Adminhtml/Sales/Tax/Grid.php b/app/code/Magento/Reports/Block/Adminhtml/Sales/Tax/Grid.php index e209ea04a6059..d583095ad60bd 100644 --- a/app/code/Magento/Reports/Block/Adminhtml/Sales/Tax/Grid.php +++ b/app/code/Magento/Reports/Block/Adminhtml/Sales/Tax/Grid.php @@ -9,7 +9,6 @@ /** * Adminhtml tax report grid block * - * @author Magento Core Team * @SuppressWarnings(PHPMD.DepthOfInheritance) */ class Grid extends \Magento\Reports\Block\Adminhtml\Grid\AbstractGrid diff --git a/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Abandoned.php b/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Abandoned.php index ddbc8671e0164..61004633245a9 100644 --- a/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Abandoned.php +++ b/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Abandoned.php @@ -7,8 +7,6 @@ /** * Adminhtml abandoned shopping cart report page content block - * - * @author Magento Core Team */ class Abandoned extends \Magento\Backend\Block\Widget\Grid\Container { diff --git a/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Abandoned/Grid.php b/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Abandoned/Grid.php index 2fb1ab26ac074..bcfe9fb82042c 100644 --- a/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Abandoned/Grid.php +++ b/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Abandoned/Grid.php @@ -14,7 +14,6 @@ * * @method \Magento\Reports\Model\ResourceModel\Quote\Collection getCollection() * - * @author Magento Core Team * @SuppressWarnings(PHPMD.DepthOfInheritance) */ class Grid extends \Magento\Reports\Block\Adminhtml\Grid\Shopcart diff --git a/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Customer.php b/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Customer.php index 71402c031b047..fde625c55e40a 100644 --- a/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Customer.php +++ b/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Customer.php @@ -7,8 +7,6 @@ /** * Adminhtml Shopping cart customers report page content block - * - * @author Magento Core Team */ class Customer extends \Magento\Backend\Block\Widget\Grid\Container { diff --git a/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Customer/Grid.php b/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Customer/Grid.php index 8e5197dd6bbdc..7f69b48bfb648 100644 --- a/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Customer/Grid.php +++ b/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Customer/Grid.php @@ -8,7 +8,6 @@ /** * Adminhtml items in carts report grid block * - * @author Magento Core Team * @SuppressWarnings(PHPMD.DepthOfInheritance) */ class Grid extends \Magento\Reports\Block\Adminhtml\Grid\Shopcart diff --git a/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Product.php b/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Product.php index 5be0033e2ad3f..1668f955f0267 100644 --- a/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Product.php +++ b/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Product.php @@ -7,8 +7,6 @@ /** * Adminhtml Shopping cart products report page content block - * - * @author Magento Core Team */ class Product extends \Magento\Backend\Block\Widget\Grid\Container { diff --git a/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Product/Grid.php b/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Product/Grid.php index 1bb49cbd63374..4cdaad11e0f46 100644 --- a/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Product/Grid.php +++ b/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Product/Grid.php @@ -8,7 +8,6 @@ /** * Adminhtml products in carts report grid block * - * @author Magento Core Team * @SuppressWarnings(PHPMD.DepthOfInheritance) */ class Grid extends \Magento\Reports\Block\Adminhtml\Grid\Shopcart diff --git a/app/code/Magento/Reports/Block/Adminhtml/Wishlist.php b/app/code/Magento/Reports/Block/Adminhtml/Wishlist.php index 257eb481e1923..b528ddfedbbde 100644 --- a/app/code/Magento/Reports/Block/Adminhtml/Wishlist.php +++ b/app/code/Magento/Reports/Block/Adminhtml/Wishlist.php @@ -10,7 +10,6 @@ * Adminhtml wishlist report page content block * * @deprecated 100.3.3 - * @author Magento Core Team */ class Wishlist extends \Magento\Backend\Block\Template { diff --git a/app/code/Magento/Reports/Block/Adminhtml/Wishlist/Grid.php b/app/code/Magento/Reports/Block/Adminhtml/Wishlist/Grid.php index d77d6a1e2bedc..d062675469584 100644 --- a/app/code/Magento/Reports/Block/Adminhtml/Wishlist/Grid.php +++ b/app/code/Magento/Reports/Block/Adminhtml/Wishlist/Grid.php @@ -7,8 +7,6 @@ /** * Adminhtml wishlist report grid block - * - * @author Magento Core Team */ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended { diff --git a/app/code/Magento/Reports/Block/Product/AbstractProduct.php b/app/code/Magento/Reports/Block/Product/AbstractProduct.php index a9249dcfa578b..dfee048a73e0a 100644 --- a/app/code/Magento/Reports/Block/Product/AbstractProduct.php +++ b/app/code/Magento/Reports/Block/Product/AbstractProduct.php @@ -7,8 +7,6 @@ /** * Reports Recently Products Abstract Block - * - * @author Magento Core Team */ abstract class AbstractProduct extends \Magento\Catalog\Block\Product\AbstractProduct { diff --git a/app/code/Magento/Reports/Block/Product/Compared.php b/app/code/Magento/Reports/Block/Product/Compared.php index 4bc4fc52314c9..b9c14514b597a 100644 --- a/app/code/Magento/Reports/Block/Product/Compared.php +++ b/app/code/Magento/Reports/Block/Product/Compared.php @@ -9,7 +9,6 @@ /** * Reports Recently Compared Products Block * - * @author Magento Core Team * @deprecated 100.2.0 */ class Compared extends \Magento\Reports\Block\Product\AbstractProduct diff --git a/app/code/Magento/Reports/Block/Product/Viewed.php b/app/code/Magento/Reports/Block/Product/Viewed.php index 09d59e475905b..487bc376b5fa7 100644 --- a/app/code/Magento/Reports/Block/Product/Viewed.php +++ b/app/code/Magento/Reports/Block/Product/Viewed.php @@ -11,7 +11,6 @@ /** * Reports Recently Viewed Products Block * - * @author Magento Core Team * @deprecated 100.2.0 */ class Viewed extends AbstractProduct implements IdentityInterface diff --git a/app/code/Magento/Reports/Block/Product/Widget/Viewed/Item.php b/app/code/Magento/Reports/Block/Product/Widget/Viewed/Item.php index 1e3eb12331bde..f07ff95337509 100644 --- a/app/code/Magento/Reports/Block/Product/Widget/Viewed/Item.php +++ b/app/code/Magento/Reports/Block/Product/Widget/Viewed/Item.php @@ -9,7 +9,6 @@ * Reports Recently Viewed Products Widget * * @deprecated 100.3.3 - * @author Magento Core Team */ class Item extends \Magento\Catalog\Block\Product\AbstractProduct implements \Magento\Widget\Block\BlockInterface { diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Index.php b/app/code/Magento/Reports/Controller/Adminhtml/Index.php index 11c3f3dee87f1..a0803aa9ef55a 100644 --- a/app/code/Magento/Reports/Controller/Adminhtml/Index.php +++ b/app/code/Magento/Reports/Controller/Adminhtml/Index.php @@ -6,8 +6,6 @@ /** * sales admin controller - * - * @author Magento Core Team */ namespace Magento\Reports\Controller\Adminhtml; diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/AbstractReport.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/AbstractReport.php index 6f36a59992376..3194d32400f97 100644 --- a/app/code/Magento/Reports/Controller/Adminhtml/Report/AbstractReport.php +++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/AbstractReport.php @@ -6,8 +6,6 @@ /** * Admin abstract reports controller - * - * @author Magento Core Team */ namespace Magento\Reports\Controller\Adminhtml\Report; diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer.php index e3db101b96114..a79015e003252 100644 --- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer.php +++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer.php @@ -5,10 +5,7 @@ */ /** - * * Customer reports admin controller - * - * @author Magento Core Team */ namespace Magento\Reports\Controller\Adminhtml\Report; diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Product.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Product.php index 28be3714ed845..4c686ae674874 100644 --- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Product.php +++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Product.php @@ -6,8 +6,6 @@ /** * Product reports admin controller - * - * @author Magento Core Team */ namespace Magento\Reports\Controller\Adminhtml\Report; diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Review.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Review.php index e42fbc1c754f6..c8b5eb47da87b 100644 --- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Review.php +++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Review.php @@ -6,8 +6,6 @@ /** * Review reports admin controller - * - * @author Magento Core Team */ namespace Magento\Reports\Controller\Adminhtml\Report; diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales.php index c77ff5c26b04e..338b465e4f93b 100644 --- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales.php +++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales.php @@ -6,8 +6,6 @@ /** * Sales report admin controller - * - * @author Magento Core Team */ namespace Magento\Reports\Controller\Adminhtml\Report; diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart.php index 6b2ae9b9793fd..90b0ef1b5edcf 100644 --- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart.php +++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart.php @@ -6,8 +6,6 @@ /** * Shopping Cart reports admin controller - * - * @author Magento Core Team */ declare(strict_types=1); diff --git a/app/code/Magento/Reports/Model/Event.php b/app/code/Magento/Reports/Model/Event.php index 8715472ae1cbc..b79655f988a53 100644 --- a/app/code/Magento/Reports/Model/Event.php +++ b/app/code/Magento/Reports/Model/Event.php @@ -21,7 +21,6 @@ * @method int getStoreId() * @method \Magento\Reports\Model\Event setStoreId(int $value) * - * @author Magento Core Team * @api * @since 100.0.2 */ diff --git a/app/code/Magento/Reports/Model/Flag.php b/app/code/Magento/Reports/Model/Flag.php index 1f87848fe1da5..3c9f444ebb495 100644 --- a/app/code/Magento/Reports/Model/Flag.php +++ b/app/code/Magento/Reports/Model/Flag.php @@ -8,7 +8,6 @@ /** * Report Flag Model * - * @author Magento Core Team * @api * @since 100.0.2 */ diff --git a/app/code/Magento/Reports/Model/Product/Index/Compared.php b/app/code/Magento/Reports/Model/Product/Index/Compared.php index b1efb67ba88c9..a157a8eff9ec7 100644 --- a/app/code/Magento/Reports/Model/Product/Index/Compared.php +++ b/app/code/Magento/Reports/Model/Product/Index/Compared.php @@ -16,7 +16,6 @@ * @method string getAddedAt() * @method \Magento\Reports\Model\Product\Index\Compared setAddedAt(string $value) * - * @author Magento Core Team * @api * @since 100.0.2 */ diff --git a/app/code/Magento/Reports/Model/Product/Index/Viewed.php b/app/code/Magento/Reports/Model/Product/Index/Viewed.php index 8b03ced3af2cf..081fc7c7b93bf 100644 --- a/app/code/Magento/Reports/Model/Product/Index/Viewed.php +++ b/app/code/Magento/Reports/Model/Product/Index/Viewed.php @@ -16,7 +16,6 @@ * @method string getAddedAt() * @method \Magento\Reports\Model\Product\Index\Viewed setAddedAt(string $value) * - * @author Magento Core Team * @api * @since 100.0.2 */ diff --git a/app/code/Magento/Reports/Model/ResourceModel/Accounts/Collection.php b/app/code/Magento/Reports/Model/ResourceModel/Accounts/Collection.php index 195524f44bd4c..c9809b72585de 100644 --- a/app/code/Magento/Reports/Model/ResourceModel/Accounts/Collection.php +++ b/app/code/Magento/Reports/Model/ResourceModel/Accounts/Collection.php @@ -6,8 +6,6 @@ /** * New Accounts Report collection - * - * @author Magento Core Team */ namespace Magento\Reports\Model\ResourceModel\Accounts; diff --git a/app/code/Magento/Reports/Model/ResourceModel/Accounts/Collection/Initial.php b/app/code/Magento/Reports/Model/ResourceModel/Accounts/Collection/Initial.php index 1760f509fdc5d..3c0e850cda5d7 100644 --- a/app/code/Magento/Reports/Model/ResourceModel/Accounts/Collection/Initial.php +++ b/app/code/Magento/Reports/Model/ResourceModel/Accounts/Collection/Initial.php @@ -6,8 +6,6 @@ /** * Customers by totals Report collection - * - * @author Magento Core Team */ namespace Magento\Reports\Model\ResourceModel\Accounts\Collection; diff --git a/app/code/Magento/Reports/Model/ResourceModel/Customer/Orders/Collection.php b/app/code/Magento/Reports/Model/ResourceModel/Customer/Orders/Collection.php index 1fab53f8edbc2..805079cbc8835 100644 --- a/app/code/Magento/Reports/Model/ResourceModel/Customer/Orders/Collection.php +++ b/app/code/Magento/Reports/Model/ResourceModel/Customer/Orders/Collection.php @@ -6,8 +6,6 @@ /** * Customers by orders Report collection - * - * @author Magento Core Team */ namespace Magento\Reports\Model\ResourceModel\Customer\Orders; diff --git a/app/code/Magento/Reports/Model/ResourceModel/Customer/Orders/Collection/Initial.php b/app/code/Magento/Reports/Model/ResourceModel/Customer/Orders/Collection/Initial.php index 01bf7b94c02ea..7c4428045e51e 100644 --- a/app/code/Magento/Reports/Model/ResourceModel/Customer/Orders/Collection/Initial.php +++ b/app/code/Magento/Reports/Model/ResourceModel/Customer/Orders/Collection/Initial.php @@ -6,8 +6,6 @@ /** * Customers by orders Report collection - * - * @author Magento Core Team */ namespace Magento\Reports\Model\ResourceModel\Customer\Orders\Collection; diff --git a/app/code/Magento/Reports/Model/ResourceModel/Customer/Totals/Collection.php b/app/code/Magento/Reports/Model/ResourceModel/Customer/Totals/Collection.php index 84cd085944605..649d1c8ee2475 100644 --- a/app/code/Magento/Reports/Model/ResourceModel/Customer/Totals/Collection.php +++ b/app/code/Magento/Reports/Model/ResourceModel/Customer/Totals/Collection.php @@ -6,8 +6,6 @@ /** * Customers by totals Report collection - * - * @author Magento Core Team */ namespace Magento\Reports\Model\ResourceModel\Customer\Totals; From 865f770f1ebd3e4ffddac3b16518bffd450a04f2 Mon Sep 17 00:00:00 2001 From: engcom-Echo Date: Thu, 20 Jun 2024 07:17:25 +0530 Subject: [PATCH 2/2] Fixed static test failures --- .../Reports/Block/Adminhtml/Sales/Refunded.php | 2 +- .../Reports/Block/Adminhtml/Sales/Sales.php | 2 +- .../Reports/Block/Adminhtml/Sales/Shipping.php | 2 +- .../Reports/Block/Adminhtml/Sales/Tax.php | 2 +- .../Block/Adminhtml/Shopcart/Abandoned.php | 2 ++ .../Block/Adminhtml/Shopcart/Customer.php | 2 ++ .../Block/Adminhtml/Shopcart/Customer/Grid.php | 8 ++++++++ .../Block/Adminhtml/Shopcart/Product.php | 2 ++ .../Reports/Block/Adminhtml/Wishlist.php | 1 + .../Reports/Block/Adminhtml/Wishlist/Grid.php | 8 ++++++++ .../Reports/Block/Product/AbstractProduct.php | 3 +++ .../Magento/Reports/Block/Product/Compared.php | 6 +++--- .../Magento/Reports/Block/Product/Viewed.php | 3 ++- .../Block/Product/Widget/Viewed/Item.php | 1 + .../Reports/Controller/Adminhtml/Index.php | 3 ++- .../Controller/Adminhtml/Report/Customer.php | 2 ++ .../Controller/Adminhtml/Report/Product.php | 1 + .../Controller/Adminhtml/Report/Review.php | 2 ++ .../Controller/Adminhtml/Report/Sales.php | 2 ++ .../Controller/Adminhtml/Report/Shopcart.php | 2 +- app/code/Magento/Reports/Model/Event.php | 12 ++++++------ app/code/Magento/Reports/Model/Flag.php | 18 +++++++++--------- .../Reports/Model/Product/Index/Compared.php | 1 + .../Reports/Model/Product/Index/Viewed.php | 1 + 24 files changed, 63 insertions(+), 25 deletions(-) diff --git a/app/code/Magento/Reports/Block/Adminhtml/Sales/Refunded.php b/app/code/Magento/Reports/Block/Adminhtml/Sales/Refunded.php index 47d312248cd82..088a3ff98e0ae 100644 --- a/app/code/Magento/Reports/Block/Adminhtml/Sales/Refunded.php +++ b/app/code/Magento/Reports/Block/Adminhtml/Sales/Refunded.php @@ -21,7 +21,7 @@ class Refunded extends \Magento\Backend\Block\Widget\Grid\Container protected $_template = 'Magento_Reports::report/grid/container.phtml'; /** - * {@inheritdoc} + * @inheritdoc */ protected function _construct() { diff --git a/app/code/Magento/Reports/Block/Adminhtml/Sales/Sales.php b/app/code/Magento/Reports/Block/Adminhtml/Sales/Sales.php index 9b8071ab9a530..32fce6221f74b 100644 --- a/app/code/Magento/Reports/Block/Adminhtml/Sales/Sales.php +++ b/app/code/Magento/Reports/Block/Adminhtml/Sales/Sales.php @@ -21,7 +21,7 @@ class Sales extends \Magento\Backend\Block\Widget\Grid\Container protected $_template = 'Magento_Reports::report/grid/container.phtml'; /** - * {@inheritdoc} + * @inheritdoc */ protected function _construct() { diff --git a/app/code/Magento/Reports/Block/Adminhtml/Sales/Shipping.php b/app/code/Magento/Reports/Block/Adminhtml/Sales/Shipping.php index bb55f7f2be89f..77be8b910c964 100644 --- a/app/code/Magento/Reports/Block/Adminhtml/Sales/Shipping.php +++ b/app/code/Magento/Reports/Block/Adminhtml/Sales/Shipping.php @@ -21,7 +21,7 @@ class Shipping extends \Magento\Backend\Block\Widget\Grid\Container protected $_template = 'Magento_Reports::report/grid/container.phtml'; /** - * {@inheritdoc} + * @inheritdoc */ protected function _construct() { diff --git a/app/code/Magento/Reports/Block/Adminhtml/Sales/Tax.php b/app/code/Magento/Reports/Block/Adminhtml/Sales/Tax.php index b957ed659ad06..3745ed791face 100644 --- a/app/code/Magento/Reports/Block/Adminhtml/Sales/Tax.php +++ b/app/code/Magento/Reports/Block/Adminhtml/Sales/Tax.php @@ -21,7 +21,7 @@ class Tax extends \Magento\Backend\Block\Widget\Grid\Container protected $_template = 'Magento_Reports::report/grid/container.phtml'; /** - * {@inheritdoc} + * @inheritdoc */ protected function _construct() { diff --git a/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Abandoned.php b/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Abandoned.php index 61004633245a9..a956ea834af48 100644 --- a/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Abandoned.php +++ b/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Abandoned.php @@ -11,6 +11,8 @@ class Abandoned extends \Magento\Backend\Block\Widget\Grid\Container { /** + * Initialize + * * @return void */ protected function _construct() diff --git a/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Customer.php b/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Customer.php index fde625c55e40a..5fd4e42e924f7 100644 --- a/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Customer.php +++ b/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Customer.php @@ -11,6 +11,8 @@ class Customer extends \Magento\Backend\Block\Widget\Grid\Container { /** + * Initialize + * * @return void */ protected function _construct() diff --git a/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Customer/Grid.php b/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Customer/Grid.php index 7f69b48bfb648..72d4561ebfd1a 100644 --- a/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Customer/Grid.php +++ b/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Customer/Grid.php @@ -34,6 +34,8 @@ public function __construct( } /** + * Initialize + * * @return void */ protected function _construct() @@ -43,6 +45,8 @@ protected function _construct() } /** + * Prepare collection + * * @return \Magento\Backend\Block\Widget\Grid */ protected function _prepareCollection() @@ -59,6 +63,8 @@ protected function _prepareCollection() } /** + * After load collection + * * @return \Magento\Backend\Block\Widget\Grid|void */ protected function _afterLoadCollection() @@ -67,6 +73,8 @@ protected function _afterLoadCollection() } /** + * Prepare columns + * * @return \Magento\Backend\Block\Widget\Grid\Extended */ protected function _prepareColumns() diff --git a/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Product.php b/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Product.php index 1668f955f0267..d84b8e1fb303d 100644 --- a/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Product.php +++ b/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Product.php @@ -11,6 +11,8 @@ class Product extends \Magento\Backend\Block\Widget\Grid\Container { /** + * Initialize + * * @return void */ protected function _construct() diff --git a/app/code/Magento/Reports/Block/Adminhtml/Wishlist.php b/app/code/Magento/Reports/Block/Adminhtml/Wishlist.php index b528ddfedbbde..3e0e6c1309ebd 100644 --- a/app/code/Magento/Reports/Block/Adminhtml/Wishlist.php +++ b/app/code/Magento/Reports/Block/Adminhtml/Wishlist.php @@ -10,6 +10,7 @@ * Adminhtml wishlist report page content block * * @deprecated 100.3.3 + * @see Nothing */ class Wishlist extends \Magento\Backend\Block\Template { diff --git a/app/code/Magento/Reports/Block/Adminhtml/Wishlist/Grid.php b/app/code/Magento/Reports/Block/Adminhtml/Wishlist/Grid.php index d062675469584..2f6bc430d3ccd 100644 --- a/app/code/Magento/Reports/Block/Adminhtml/Wishlist/Grid.php +++ b/app/code/Magento/Reports/Block/Adminhtml/Wishlist/Grid.php @@ -16,6 +16,8 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended protected $_productsFactory; /** + * Initialize + * * @param \Magento\Backend\Block\Template\Context $context * @param \Magento\Backend\Helper\Data $backendHelper * @param \Magento\Reports\Model\ResourceModel\Wishlist\Product\CollectionFactory $productsFactory @@ -32,6 +34,8 @@ public function __construct( } /** + * Initialize + * * @return void */ protected function _construct() @@ -43,6 +47,8 @@ protected function _construct() } /** + * Prepare collection + * * @return $this */ protected function _prepareCollection() @@ -61,6 +67,8 @@ protected function _prepareCollection() } /** + * Prepare Columns + * * @return \Magento\Backend\Block\Widget\Grid\Extended */ protected function _prepareColumns() diff --git a/app/code/Magento/Reports/Block/Product/AbstractProduct.php b/app/code/Magento/Reports/Block/Product/AbstractProduct.php index dfee048a73e0a..a01089b33ad8f 100644 --- a/app/code/Magento/Reports/Block/Product/AbstractProduct.php +++ b/app/code/Magento/Reports/Block/Product/AbstractProduct.php @@ -35,6 +35,8 @@ abstract class AbstractProduct extends \Magento\Catalog\Block\Product\AbstractPr protected $_indexFactory; /** + * Initialize + * * @param \Magento\Catalog\Block\Product\Context $context * @param \Magento\Catalog\Model\Product\Visibility $productVisibility * @param \Magento\Reports\Model\Product\Index\Factory $indexFactory @@ -80,6 +82,7 @@ protected function _getProductsToSkip() /** * Public method for retrieve Product Index model + * * @throws \Magento\Framework\Exception\LocalizedException * @return \Magento\Reports\Model\Product\Index\AbstractIndex */ diff --git a/app/code/Magento/Reports/Block/Product/Compared.php b/app/code/Magento/Reports/Block/Product/Compared.php index b9c14514b597a..ca43e015732c3 100644 --- a/app/code/Magento/Reports/Block/Product/Compared.php +++ b/app/code/Magento/Reports/Block/Product/Compared.php @@ -10,13 +10,14 @@ * Reports Recently Compared Products Block * * @deprecated 100.2.0 + * @see nothing */ class Compared extends \Magento\Reports\Block\Product\AbstractProduct { /** * Config path for compared products count */ - const XML_PATH_RECENTLY_COMPARED_COUNT = 'catalog/recently_products/compared_count'; + public const XML_PATH_RECENTLY_COMPARED_COUNT = 'catalog/recently_products/compared_count'; /** * Compared Product Index type @@ -42,8 +43,7 @@ public function getPageSize() } /** - * Prepare to html - * Check has compared products + * Prepare to html Check has compared products * * @return string */ diff --git a/app/code/Magento/Reports/Block/Product/Viewed.php b/app/code/Magento/Reports/Block/Product/Viewed.php index 487bc376b5fa7..0a3248d242675 100644 --- a/app/code/Magento/Reports/Block/Product/Viewed.php +++ b/app/code/Magento/Reports/Block/Product/Viewed.php @@ -12,13 +12,14 @@ * Reports Recently Viewed Products Block * * @deprecated 100.2.0 + * @see nothing */ class Viewed extends AbstractProduct implements IdentityInterface { /** * Config path to recently viewed product count */ - const XML_PATH_RECENTLY_VIEWED_COUNT = 'catalog/recently_products/viewed_count'; + public const XML_PATH_RECENTLY_VIEWED_COUNT = 'catalog/recently_products/viewed_count'; /** * Viewed Product Index type diff --git a/app/code/Magento/Reports/Block/Product/Widget/Viewed/Item.php b/app/code/Magento/Reports/Block/Product/Widget/Viewed/Item.php index f07ff95337509..7e163bb231594 100644 --- a/app/code/Magento/Reports/Block/Product/Widget/Viewed/Item.php +++ b/app/code/Magento/Reports/Block/Product/Widget/Viewed/Item.php @@ -9,6 +9,7 @@ * Reports Recently Viewed Products Widget * * @deprecated 100.3.3 + * @see nothing */ class Item extends \Magento\Catalog\Block\Product\AbstractProduct implements \Magento\Widget\Block\BlockInterface { diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Index.php b/app/code/Magento/Reports/Controller/Adminhtml/Index.php index a0803aa9ef55a..5cc0411e04c03 100644 --- a/app/code/Magento/Reports/Controller/Adminhtml/Index.php +++ b/app/code/Magento/Reports/Controller/Adminhtml/Index.php @@ -10,6 +10,7 @@ namespace Magento\Reports\Controller\Adminhtml; /** + * phpcs:disable Magento2.Classes.AbstractApi * @api * @since 100.0.2 */ @@ -20,7 +21,7 @@ abstract class Index extends \Magento\Backend\App\Action * * @see _isAllowed() */ - const ADMIN_RESOURCE = 'Magento_Reports::report'; + public const ADMIN_RESOURCE = 'Magento_Reports::report'; /** * @var \Magento\Framework\App\Response\Http\FileFactory diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer.php index a79015e003252..9d93039fe60ff 100644 --- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer.php +++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer.php @@ -10,6 +10,7 @@ namespace Magento\Reports\Controller\Adminhtml\Report; /** + * phpcs:disable Magento2.Classes.AbstractApi * @api * @since 100.0.2 */ @@ -57,6 +58,7 @@ public function _initAction() */ protected function _isAllowed() { + // phpcs:disable switch ($this->getRequest()->getActionName()) { case 'accounts': return $this->_authorization->isAllowed('Magento_Reports::accounts'); diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Product.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Product.php index 4c686ae674874..f7d6726f51ba9 100644 --- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Product.php +++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Product.php @@ -10,6 +10,7 @@ namespace Magento\Reports\Controller\Adminhtml\Report; /** + * phpcs:disable Magento2.Classes.AbstractApi * @api * @since 100.0.2 */ diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Review.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Review.php index c8b5eb47da87b..58a227385c2fd 100644 --- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Review.php +++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Review.php @@ -10,6 +10,7 @@ namespace Magento\Reports\Controller\Adminhtml\Report; /** + * phpcs:disable Magento2.Classes.AbstractApi * @api * @since 100.0.2 */ @@ -52,6 +53,7 @@ public function _initAction() */ protected function _isAllowed() { + // phpcs:disable switch ($this->getRequest()->getActionName()) { case 'customer': return $this->_authorization->isAllowed('Magento_Reports::review_customer'); diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales.php index 338b465e4f93b..ff108223439ea 100644 --- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales.php +++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales.php @@ -11,6 +11,7 @@ /** * @SuppressWarnings(PHPMD.NumberOfChildren) + * phpcs:disable Magento2.Classes.AbstractApi * @api * @since 100.0.2 */ @@ -35,6 +36,7 @@ public function _initAction() */ protected function _isAllowed() { + // phpcs:disable switch ($this->getRequest()->getActionName()) { case 'sales': return $this->_authorization->isAllowed('Magento_Reports::salesroot_sales'); diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart.php index 90b0ef1b5edcf..397aeba1051d5 100644 --- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart.php +++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart.php @@ -23,7 +23,7 @@ abstract class Shopcart extends \Magento\Backend\App\Action /** * Authorization of a shop cart report */ - const ADMIN_RESOURCE = 'Magento_Reports::shopcart'; + public const ADMIN_RESOURCE = 'Magento_Reports::shopcart'; /** * @var \Magento\Framework\App\Response\Http\FileFactory */ diff --git a/app/code/Magento/Reports/Model/Event.php b/app/code/Magento/Reports/Model/Event.php index b79655f988a53..2e7165e7aca0e 100644 --- a/app/code/Magento/Reports/Model/Event.php +++ b/app/code/Magento/Reports/Model/Event.php @@ -26,17 +26,17 @@ */ class Event extends \Magento\Framework\Model\AbstractModel { - const EVENT_PRODUCT_VIEW = 1; + public const EVENT_PRODUCT_VIEW = 1; - const EVENT_PRODUCT_SEND = 2; + public const EVENT_PRODUCT_SEND = 2; - const EVENT_PRODUCT_COMPARE = 3; + public const EVENT_PRODUCT_COMPARE = 3; - const EVENT_PRODUCT_TO_CART = 4; + public const EVENT_PRODUCT_TO_CART = 4; - const EVENT_PRODUCT_TO_WISHLIST = 5; + public const EVENT_PRODUCT_TO_WISHLIST = 5; - const EVENT_WISHLIST_SHARE = 6; + public const EVENT_WISHLIST_SHARE = 6; /** * @var \Magento\Framework\Stdlib\DateTime\DateTimeFactory diff --git a/app/code/Magento/Reports/Model/Flag.php b/app/code/Magento/Reports/Model/Flag.php index 3c9f444ebb495..af81cf49566e6 100644 --- a/app/code/Magento/Reports/Model/Flag.php +++ b/app/code/Magento/Reports/Model/Flag.php @@ -13,26 +13,26 @@ */ class Flag extends \Magento\Framework\Flag { - const REPORT_ORDER_FLAG_CODE = 'report_order_aggregated'; + public const REPORT_ORDER_FLAG_CODE = 'report_order_aggregated'; - const REPORT_TAX_FLAG_CODE = 'report_tax_aggregated'; + public const REPORT_TAX_FLAG_CODE = 'report_tax_aggregated'; - const REPORT_SHIPPING_FLAG_CODE = 'report_shipping_aggregated'; + public const REPORT_SHIPPING_FLAG_CODE = 'report_shipping_aggregated'; - const REPORT_INVOICE_FLAG_CODE = 'report_invoiced_aggregated'; + public const REPORT_INVOICE_FLAG_CODE = 'report_invoiced_aggregated'; - const REPORT_REFUNDED_FLAG_CODE = 'report_refunded_aggregated'; + public const REPORT_REFUNDED_FLAG_CODE = 'report_refunded_aggregated'; - const REPORT_COUPONS_FLAG_CODE = 'report_coupons_aggregated'; + public const REPORT_COUPONS_FLAG_CODE = 'report_coupons_aggregated'; - const REPORT_BESTSELLERS_FLAG_CODE = 'report_bestsellers_aggregated'; + public const REPORT_BESTSELLERS_FLAG_CODE = 'report_bestsellers_aggregated'; - const REPORT_PRODUCT_VIEWED_FLAG_CODE = 'report_product_viewed_aggregated'; + public const REPORT_PRODUCT_VIEWED_FLAG_CODE = 'report_product_viewed_aggregated'; /** * Setter for flag code - * @codeCoverageIgnore * + * @codeCoverageIgnore * @param string $code * @return $this */ diff --git a/app/code/Magento/Reports/Model/Product/Index/Compared.php b/app/code/Magento/Reports/Model/Product/Index/Compared.php index a157a8eff9ec7..3efa7cd97e57f 100644 --- a/app/code/Magento/Reports/Model/Product/Index/Compared.php +++ b/app/code/Magento/Reports/Model/Product/Index/Compared.php @@ -16,6 +16,7 @@ * @method string getAddedAt() * @method \Magento\Reports\Model\Product\Index\Compared setAddedAt(string $value) * + * @SuppressWarnings(PHPMD.CookieAndSessionMisuse) * @api * @since 100.0.2 */ diff --git a/app/code/Magento/Reports/Model/Product/Index/Viewed.php b/app/code/Magento/Reports/Model/Product/Index/Viewed.php index 081fc7c7b93bf..99a297a959547 100644 --- a/app/code/Magento/Reports/Model/Product/Index/Viewed.php +++ b/app/code/Magento/Reports/Model/Product/Index/Viewed.php @@ -16,6 +16,7 @@ * @method string getAddedAt() * @method \Magento\Reports\Model\Product\Index\Viewed setAddedAt(string $value) * + * @SuppressWarnings(PHPMD.CookieAndSessionMisuse) * @api * @since 100.0.2 */