From 96879099e64e581b19fe0550fea2ddb26f6cb3b3 Mon Sep 17 00:00:00 2001 From: Dan Wallis Date: Tue, 7 Mar 2023 14:11:21 +0000 Subject: [PATCH 1/2] Remove forbidden @author tag --- app/code/Magento/Sales/Model/ResourceModel/Order/Tax.php | 2 -- .../Magento/Sales/Model/ResourceModel/Order/Tax/Collection.php | 2 -- app/code/Magento/Sales/Model/ResourceModel/Report.php | 2 -- .../Magento/Sales/Model/ResourceModel/Report/AbstractReport.php | 2 -- .../ResourceModel/Report/Collection/AbstractCollection.php | 2 -- app/code/Magento/Sales/Model/ResourceModel/Report/Invoiced.php | 2 -- .../Model/ResourceModel/Report/Invoiced/Collection/Invoiced.php | 2 -- .../Model/ResourceModel/Report/Invoiced/Collection/Order.php | 2 -- .../Sales/Model/ResourceModel/Report/Order/Collection.php | 2 -- .../Sales/Model/ResourceModel/Report/Order/Createdat.php | 2 -- .../Sales/Model/ResourceModel/Report/Order/Updatedat.php | 2 -- .../Model/ResourceModel/Report/Order/Updatedat/Collection.php | 2 -- app/code/Magento/Sales/Model/ResourceModel/Report/Refunded.php | 2 -- .../Model/ResourceModel/Report/Refunded/Collection/Order.php | 2 -- .../Model/ResourceModel/Report/Refunded/Collection/Refunded.php | 2 -- app/code/Magento/Sales/Model/ResourceModel/Report/Shipping.php | 2 -- .../Model/ResourceModel/Report/Shipping/Collection/Order.php | 2 -- .../Model/ResourceModel/Report/Shipping/Collection/Shipment.php | 2 -- app/code/Magento/Sales/Model/Status/ListStatus.php | 2 -- app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote.php | 1 - .../SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Coupons.php | 2 -- .../Block/Adminhtml/Promo/Quote/Edit/Tab/Coupons/Form.php | 2 -- .../Promo/Quote/Edit/Tab/Coupons/Grid/Column/Renderer/Used.php | 2 -- app/code/Magento/SalesRule/Model/Coupon/Massgenerator.php | 2 -- app/code/Magento/SalesRule/Model/ResourceModel/Coupon.php | 2 -- .../Magento/SalesRule/Model/ResourceModel/Coupon/Collection.php | 2 -- app/code/Magento/SalesRule/Model/ResourceModel/Coupon/Usage.php | 2 -- .../Magento/SalesRule/Model/ResourceModel/Report/Collection.php | 2 -- app/code/Magento/SalesRule/Model/ResourceModel/Report/Rule.php | 2 -- .../SalesRule/Model/ResourceModel/Report/Rule/Createdat.php | 2 -- 30 files changed, 59 deletions(-) diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Tax.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Tax.php index b46a131857775..5a8506070b02e 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Order/Tax.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Tax.php @@ -7,8 +7,6 @@ /** * Order Tax Model - * - * @author Magento Core Team */ class Tax extends \Magento\Sales\Model\ResourceModel\EntityAbstract { diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Tax/Collection.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Tax/Collection.php index 788dd5e8b7a40..e5192688b8c66 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Order/Tax/Collection.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Tax/Collection.php @@ -7,8 +7,6 @@ /** * Order Tax Collection - * - * @author Magento Core Team */ class Collection extends \Magento\Sales\Model\ResourceModel\Collection\AbstractCollection { diff --git a/app/code/Magento/Sales/Model/ResourceModel/Report.php b/app/code/Magento/Sales/Model/ResourceModel/Report.php index 9f7f4be2bfda4..709b9eb838e78 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Report.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Report.php @@ -7,8 +7,6 @@ /** * Sales report resource model - * - * @author Magento Core Team */ class Report extends \Magento\Sales\Model\ResourceModel\EntityAbstract { diff --git a/app/code/Magento/Sales/Model/ResourceModel/Report/AbstractReport.php b/app/code/Magento/Sales/Model/ResourceModel/Report/AbstractReport.php index 1202fd269ada4..811a2e65f0514 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Report/AbstractReport.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Report/AbstractReport.php @@ -7,8 +7,6 @@ /** * Order report resource model - * - * @author Magento Core Team */ abstract class AbstractReport extends \Magento\Reports\Model\ResourceModel\Report\AbstractReport { diff --git a/app/code/Magento/Sales/Model/ResourceModel/Report/Collection/AbstractCollection.php b/app/code/Magento/Sales/Model/ResourceModel/Report/Collection/AbstractCollection.php index 9c4c87c2e2e25..ff3c5f47eed26 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Report/Collection/AbstractCollection.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Report/Collection/AbstractCollection.php @@ -7,8 +7,6 @@ /** * Report collection abstract model - * - * @author Magento Core Team */ class AbstractCollection extends \Magento\Reports\Model\ResourceModel\Report\Collection\AbstractCollection { diff --git a/app/code/Magento/Sales/Model/ResourceModel/Report/Invoiced.php b/app/code/Magento/Sales/Model/ResourceModel/Report/Invoiced.php index b121d802377df..3862cbc2b25d0 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Report/Invoiced.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Report/Invoiced.php @@ -7,8 +7,6 @@ /** * Invoice report resource model - * - * @author Magento Core Team */ class Invoiced extends AbstractReport { diff --git a/app/code/Magento/Sales/Model/ResourceModel/Report/Invoiced/Collection/Invoiced.php b/app/code/Magento/Sales/Model/ResourceModel/Report/Invoiced/Collection/Invoiced.php index 584f17846c1c7..ba8f79dd99c64 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Report/Invoiced/Collection/Invoiced.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Report/Invoiced/Collection/Invoiced.php @@ -7,8 +7,6 @@ /** * Sales report invoiced collection - * - * @author Magento Core Team */ class Invoiced extends Order { diff --git a/app/code/Magento/Sales/Model/ResourceModel/Report/Invoiced/Collection/Order.php b/app/code/Magento/Sales/Model/ResourceModel/Report/Invoiced/Collection/Order.php index c65d94edce18c..cddfba7f66e94 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Report/Invoiced/Collection/Order.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Report/Invoiced/Collection/Order.php @@ -7,8 +7,6 @@ /** * Sales report invoiced collection - * - * @author Magento Core Team */ class Order extends \Magento\Sales\Model\ResourceModel\Report\Collection\AbstractCollection { diff --git a/app/code/Magento/Sales/Model/ResourceModel/Report/Order/Collection.php b/app/code/Magento/Sales/Model/ResourceModel/Report/Order/Collection.php index 2debe3b0a4df7..c4a720eabe00f 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Report/Order/Collection.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Report/Order/Collection.php @@ -7,8 +7,6 @@ /** * Report order collection - * - * @author Magento Core Team */ class Collection extends \Magento\Sales\Model\ResourceModel\Report\Collection\AbstractCollection { diff --git a/app/code/Magento/Sales/Model/ResourceModel/Report/Order/Createdat.php b/app/code/Magento/Sales/Model/ResourceModel/Report/Order/Createdat.php index 9c0df9a9b4b58..6f4dd1eadf4e5 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Report/Order/Createdat.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Report/Order/Createdat.php @@ -7,8 +7,6 @@ /** * Order entity resource model with aggregation by created at - * - * @author Magento Core Team */ class Createdat extends \Magento\Sales\Model\ResourceModel\Report\AbstractReport { diff --git a/app/code/Magento/Sales/Model/ResourceModel/Report/Order/Updatedat.php b/app/code/Magento/Sales/Model/ResourceModel/Report/Order/Updatedat.php index 3d75f5530538d..87ea49a1d5a68 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Report/Order/Updatedat.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Report/Order/Updatedat.php @@ -7,8 +7,6 @@ /** * Order entity resource model with aggregation by updated at - * - * @author Magento Core Team */ class Updatedat extends Createdat { diff --git a/app/code/Magento/Sales/Model/ResourceModel/Report/Order/Updatedat/Collection.php b/app/code/Magento/Sales/Model/ResourceModel/Report/Order/Updatedat/Collection.php index 81cb917a906eb..2261def3ddd42 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Report/Order/Updatedat/Collection.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Report/Order/Updatedat/Collection.php @@ -7,8 +7,6 @@ /** * Report order updated_at collection - * - * @author Magento Core Team */ class Collection extends \Magento\Sales\Model\ResourceModel\Report\Order\Collection { diff --git a/app/code/Magento/Sales/Model/ResourceModel/Report/Refunded.php b/app/code/Magento/Sales/Model/ResourceModel/Report/Refunded.php index 89a4e759c43a7..f2d55de47f38d 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Report/Refunded.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Report/Refunded.php @@ -7,8 +7,6 @@ /** * Refund report resource model - * - * @author Magento Core Team */ class Refunded extends AbstractReport { diff --git a/app/code/Magento/Sales/Model/ResourceModel/Report/Refunded/Collection/Order.php b/app/code/Magento/Sales/Model/ResourceModel/Report/Refunded/Collection/Order.php index 3c2d5890481d9..670eab9c16e59 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Report/Refunded/Collection/Order.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Report/Refunded/Collection/Order.php @@ -7,8 +7,6 @@ /** * Sales report refunded collection - * - * @author Magento Core Team */ class Order extends \Magento\Sales\Model\ResourceModel\Report\Collection\AbstractCollection { diff --git a/app/code/Magento/Sales/Model/ResourceModel/Report/Refunded/Collection/Refunded.php b/app/code/Magento/Sales/Model/ResourceModel/Report/Refunded/Collection/Refunded.php index e64049c900ed8..125ebe7c8a40b 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Report/Refunded/Collection/Refunded.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Report/Refunded/Collection/Refunded.php @@ -7,8 +7,6 @@ /** * Sales report refunded collection - * - * @author Magento Core Team */ class Refunded extends Order { diff --git a/app/code/Magento/Sales/Model/ResourceModel/Report/Shipping.php b/app/code/Magento/Sales/Model/ResourceModel/Report/Shipping.php index 0f04239ce663c..a48dfab077f71 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Report/Shipping.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Report/Shipping.php @@ -7,8 +7,6 @@ /** * Shipping report resource model - * - * @author Magento Core Team */ class Shipping extends AbstractReport { diff --git a/app/code/Magento/Sales/Model/ResourceModel/Report/Shipping/Collection/Order.php b/app/code/Magento/Sales/Model/ResourceModel/Report/Shipping/Collection/Order.php index 670c467a89356..7c70a488da589 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Report/Shipping/Collection/Order.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Report/Shipping/Collection/Order.php @@ -7,8 +7,6 @@ /** * Sales report shipping collection - * - * @author Magento Core Team */ class Order extends \Magento\Sales\Model\ResourceModel\Report\Collection\AbstractCollection { diff --git a/app/code/Magento/Sales/Model/ResourceModel/Report/Shipping/Collection/Shipment.php b/app/code/Magento/Sales/Model/ResourceModel/Report/Shipping/Collection/Shipment.php index 8ae1522f3dc62..fcf8c172c35a5 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Report/Shipping/Collection/Shipment.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Report/Shipping/Collection/Shipment.php @@ -7,8 +7,6 @@ /** * Sales report shipping collection - * - * @author Magento Core Team */ class Shipment extends Order { diff --git a/app/code/Magento/Sales/Model/Status/ListStatus.php b/app/code/Magento/Sales/Model/Status/ListStatus.php index e3311285f9158..273f1e38bed98 100644 --- a/app/code/Magento/Sales/Model/Status/ListStatus.php +++ b/app/code/Magento/Sales/Model/Status/ListStatus.php @@ -9,8 +9,6 @@ * Service model for managing statuses information. Statuses are just records with code, message and any * additional data. The model helps to keep track and manipulate statuses, that different modules want to set * to owner object of this model. - * - * @author Magento Core Team */ class ListStatus { diff --git a/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote.php b/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote.php index 21bcbd475e7fb..7725395de0994 100644 --- a/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote.php +++ b/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote.php @@ -9,7 +9,6 @@ * Catalog price rules * * @api - * @author Magento Core Team * @since 100.0.2 */ class Quote extends \Magento\Backend\Block\Widget\Grid\Container diff --git a/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Coupons.php b/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Coupons.php index 2d80084d35efe..507b0d278254a 100644 --- a/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Coupons.php +++ b/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Coupons.php @@ -7,8 +7,6 @@ /** * "Manage Coupons Codes" Tab - * - * @author Magento Core Team */ class Coupons extends \Magento\Framework\View\Element\Template implements \Magento\Backend\Block\Widget\Tab\TabInterface { diff --git a/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Coupons/Form.php b/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Coupons/Form.php index 0a88459d138e6..6873b39725ff7 100644 --- a/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Coupons/Form.php +++ b/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Coupons/Form.php @@ -10,8 +10,6 @@ /** * Coupons generation parameters form * - * @author Magento Core Team - * * Class \Magento\SalesRule\Block\Adminhtml\Promo\Quote\Edit\Tab\Coupons\Form */ class Form extends \Magento\Backend\Block\Widget\Form\Generic diff --git a/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Coupons/Grid/Column/Renderer/Used.php b/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Coupons/Grid/Column/Renderer/Used.php index e17bb7c304663..21baa847ba75b 100644 --- a/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Coupons/Grid/Column/Renderer/Used.php +++ b/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Coupons/Grid/Column/Renderer/Used.php @@ -7,8 +7,6 @@ /** * Coupon codes grid "Used" column renderer - * - * @author Magento Core Team */ class Used extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Text { diff --git a/app/code/Magento/SalesRule/Model/Coupon/Massgenerator.php b/app/code/Magento/SalesRule/Model/Coupon/Massgenerator.php index b9cac227be127..b72795b9e854b 100644 --- a/app/code/Magento/SalesRule/Model/Coupon/Massgenerator.php +++ b/app/code/Magento/SalesRule/Model/Coupon/Massgenerator.php @@ -7,8 +7,6 @@ /** * SalesRule Mass Coupon Generator - * - * @author Magento Core Team */ class Massgenerator extends \Magento\Framework\Model\AbstractModel implements \Magento\SalesRule\Model\Coupon\CodegeneratorInterface diff --git a/app/code/Magento/SalesRule/Model/ResourceModel/Coupon.php b/app/code/Magento/SalesRule/Model/ResourceModel/Coupon.php index 42498448cd13f..1d1d431d1853d 100644 --- a/app/code/Magento/SalesRule/Model/ResourceModel/Coupon.php +++ b/app/code/Magento/SalesRule/Model/ResourceModel/Coupon.php @@ -9,8 +9,6 @@ /** * SalesRule Resource Coupon - * - * @author Magento Core Team */ class Coupon extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb implements \Magento\SalesRule\Model\Spi\CouponResourceInterface diff --git a/app/code/Magento/SalesRule/Model/ResourceModel/Coupon/Collection.php b/app/code/Magento/SalesRule/Model/ResourceModel/Coupon/Collection.php index 22f87a6f29016..e369d59266261 100644 --- a/app/code/Magento/SalesRule/Model/ResourceModel/Coupon/Collection.php +++ b/app/code/Magento/SalesRule/Model/ResourceModel/Coupon/Collection.php @@ -11,8 +11,6 @@ /** * SalesRule Model Resource Coupon_Collection - * - * @author Magento Core Team */ class Collection extends AbstractCollection { diff --git a/app/code/Magento/SalesRule/Model/ResourceModel/Coupon/Usage.php b/app/code/Magento/SalesRule/Model/ResourceModel/Coupon/Usage.php index 39a2f8855e246..031d61ba91859 100644 --- a/app/code/Magento/SalesRule/Model/ResourceModel/Coupon/Usage.php +++ b/app/code/Magento/SalesRule/Model/ResourceModel/Coupon/Usage.php @@ -7,8 +7,6 @@ /** * SalesRule Model Resource Coupon_Usage - * - * @author Magento Core Team */ class Usage extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb { diff --git a/app/code/Magento/SalesRule/Model/ResourceModel/Report/Collection.php b/app/code/Magento/SalesRule/Model/ResourceModel/Report/Collection.php index 049547e65c4a2..90a2a123f4289 100644 --- a/app/code/Magento/SalesRule/Model/ResourceModel/Report/Collection.php +++ b/app/code/Magento/SalesRule/Model/ResourceModel/Report/Collection.php @@ -7,8 +7,6 @@ /** * Sales report coupons collection - * - * @author Magento Core Team */ class Collection extends \Magento\Sales\Model\ResourceModel\Report\Collection\AbstractCollection { diff --git a/app/code/Magento/SalesRule/Model/ResourceModel/Report/Rule.php b/app/code/Magento/SalesRule/Model/ResourceModel/Report/Rule.php index 907d2c0494364..f859c0a68d5ab 100644 --- a/app/code/Magento/SalesRule/Model/ResourceModel/Report/Rule.php +++ b/app/code/Magento/SalesRule/Model/ResourceModel/Report/Rule.php @@ -7,8 +7,6 @@ /** * Rule report resource model - * - * @author Magento Core Team */ class Rule extends \Magento\Reports\Model\ResourceModel\Report\AbstractReport { diff --git a/app/code/Magento/SalesRule/Model/ResourceModel/Report/Rule/Createdat.php b/app/code/Magento/SalesRule/Model/ResourceModel/Report/Rule/Createdat.php index 342fa8363da09..b9e94d42072a7 100644 --- a/app/code/Magento/SalesRule/Model/ResourceModel/Report/Rule/Createdat.php +++ b/app/code/Magento/SalesRule/Model/ResourceModel/Report/Rule/Createdat.php @@ -8,8 +8,6 @@ /** * Rule report resource model with aggregation by created at - * - * @author Magento Core Team */ class Createdat extends \Magento\Reports\Model\ResourceModel\Report\AbstractReport { From 4771b770864cfde870ebd1a13b3ff241d6c7735b Mon Sep 17 00:00:00 2001 From: engcom-Echo Date: Tue, 11 Jun 2024 11:47:11 +0530 Subject: [PATCH 2/2] Fixed static test failrues --- app/code/Magento/Sales/Model/ResourceModel/Report.php | 1 + .../Report/Collection/AbstractCollection.php | 2 -- .../ResourceModel/Report/Invoiced/Collection/Order.php | 4 ++-- .../Model/ResourceModel/Report/Order/Collection.php | 4 ---- .../ResourceModel/Report/Refunded/Collection/Order.php | 4 ---- .../ResourceModel/Report/Shipping/Collection/Order.php | 4 ---- app/code/Magento/Sales/Model/Status/ListStatus.php | 3 +-- .../Block/Adminhtml/Promo/Quote/Edit/Tab/Coupons.php | 10 +++++----- .../Adminhtml/Promo/Quote/Edit/Tab/Coupons/Form.php | 2 -- .../Edit/Tab/Coupons/Grid/Column/Renderer/Used.php | 2 ++ .../Magento/SalesRule/Model/Coupon/Massgenerator.php | 6 ++---- .../Model/ResourceModel/Report/Collection.php | 2 +- 12 files changed, 14 insertions(+), 30 deletions(-) diff --git a/app/code/Magento/Sales/Model/ResourceModel/Report.php b/app/code/Magento/Sales/Model/ResourceModel/Report.php index 709b9eb838e78..5079231712b2e 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Report.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Report.php @@ -14,6 +14,7 @@ class Report extends \Magento\Sales\Model\ResourceModel\EntityAbstract * Resource initialization * * @return void + * phpcs:disable Magento2.CodeAnalysis.EmptyBlock */ protected function _construct() { diff --git a/app/code/Magento/Sales/Model/ResourceModel/Report/Collection/AbstractCollection.php b/app/code/Magento/Sales/Model/ResourceModel/Report/Collection/AbstractCollection.php index ff3c5f47eed26..9c08bb556f3f3 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Report/Collection/AbstractCollection.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Report/Collection/AbstractCollection.php @@ -11,8 +11,6 @@ class AbstractCollection extends \Magento\Reports\Model\ResourceModel\Report\Collection\AbstractCollection { /** - * Order status - * * @var string */ protected $_orderStatus = null; diff --git a/app/code/Magento/Sales/Model/ResourceModel/Report/Invoiced/Collection/Order.php b/app/code/Magento/Sales/Model/ResourceModel/Report/Invoiced/Collection/Order.php index cddfba7f66e94..074cff9b63a95 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Report/Invoiced/Collection/Order.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Report/Invoiced/Collection/Order.php @@ -11,8 +11,6 @@ class Order extends \Magento\Sales\Model\ResourceModel\Report\Collection\AbstractCollection { /** - * Period format - * * @var string */ protected $_periodFormat; @@ -82,6 +80,8 @@ protected function _getSelectedColumns() } /** + * Before load + * * @return $this */ protected function _beforeLoad() diff --git a/app/code/Magento/Sales/Model/ResourceModel/Report/Order/Collection.php b/app/code/Magento/Sales/Model/ResourceModel/Report/Order/Collection.php index c4a720eabe00f..98c6faad5a99b 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Report/Order/Collection.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Report/Order/Collection.php @@ -11,8 +11,6 @@ class Collection extends \Magento\Sales\Model\ResourceModel\Report\Collection\AbstractCollection { /** - * Period format - * * @var string */ protected $_periodFormat; @@ -25,8 +23,6 @@ class Collection extends \Magento\Sales\Model\ResourceModel\Report\Collection\Ab protected $_aggregationTable = 'sales_order_aggregated_created'; /** - * Selected columns - * * @var array */ protected $_selectedColumns = []; diff --git a/app/code/Magento/Sales/Model/ResourceModel/Report/Refunded/Collection/Order.php b/app/code/Magento/Sales/Model/ResourceModel/Report/Refunded/Collection/Order.php index 670eab9c16e59..a51dcfabf4173 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Report/Refunded/Collection/Order.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Report/Refunded/Collection/Order.php @@ -11,15 +11,11 @@ class Order extends \Magento\Sales\Model\ResourceModel\Report\Collection\AbstractCollection { /** - * Period format - * * @var string */ protected $_periodFormat; /** - * Selected columns - * * @var array */ protected $_selectedColumns = []; diff --git a/app/code/Magento/Sales/Model/ResourceModel/Report/Shipping/Collection/Order.php b/app/code/Magento/Sales/Model/ResourceModel/Report/Shipping/Collection/Order.php index 7c70a488da589..5350cc35028b3 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Report/Shipping/Collection/Order.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Report/Shipping/Collection/Order.php @@ -11,15 +11,11 @@ class Order extends \Magento\Sales\Model\ResourceModel\Report\Collection\AbstractCollection { /** - * Period format - * * @var string */ protected $_periodFormat; /** - * Selected columns - * * @var array */ protected $_selectedColumns = []; diff --git a/app/code/Magento/Sales/Model/Status/ListStatus.php b/app/code/Magento/Sales/Model/Status/ListStatus.php index 273f1e38bed98..7641241f6389c 100644 --- a/app/code/Magento/Sales/Model/Status/ListStatus.php +++ b/app/code/Magento/Sales/Model/Status/ListStatus.php @@ -87,8 +87,7 @@ public function removeItemsByParams($params) } /** - * Removes items at mentioned index/indexes. - * Returns items removed. + * Removes items at mentioned index/indexes. Returns items removed. * * @param int|array $indexes * @return array diff --git a/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Coupons.php b/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Coupons.php index 507b0d278254a..bf5dfe6a62a09 100644 --- a/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Coupons.php +++ b/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Coupons.php @@ -11,7 +11,7 @@ class Coupons extends \Magento\Framework\View\Element\Template implements \Magento\Backend\Block\Widget\Tab\TabInterface { /** - * {@inheritdoc} + * @inheritdoc */ public function getTabLabel() { @@ -19,7 +19,7 @@ public function getTabLabel() } /** - * {@inheritdoc} + * @inheritdoc */ public function getTabTitle() { @@ -27,7 +27,7 @@ public function getTabTitle() } /** - * {@inheritdoc} + * @inheritdoc */ public function canShowTab() { @@ -35,7 +35,7 @@ public function canShowTab() } /** - * {@inheritdoc} + * @inheritdoc */ public function isHidden() { @@ -43,7 +43,7 @@ public function isHidden() } /** - * {@inheritdoc} + * @inheritdoc * @codeCoverageIgnore */ public function setCanSHow($canShow) diff --git a/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Coupons/Form.php b/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Coupons/Form.php index 6873b39725ff7..7f721f86b8fd2 100644 --- a/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Coupons/Form.php +++ b/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Coupons/Form.php @@ -15,8 +15,6 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic { /** - * Sales rule coupon - * * @var \Magento\SalesRule\Helper\Coupon */ protected $_salesRuleCoupon = null; diff --git a/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Coupons/Grid/Column/Renderer/Used.php b/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Coupons/Grid/Column/Renderer/Used.php index 21baa847ba75b..32a85179deaea 100644 --- a/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Coupons/Grid/Column/Renderer/Used.php +++ b/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Coupons/Grid/Column/Renderer/Used.php @@ -11,6 +11,8 @@ class Used extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Text { /** + * Render + * * @param \Magento\Framework\DataObject $row * @return string */ diff --git a/app/code/Magento/SalesRule/Model/Coupon/Massgenerator.php b/app/code/Magento/SalesRule/Model/Coupon/Massgenerator.php index b72795b9e854b..ebcc536be8436 100644 --- a/app/code/Magento/SalesRule/Model/Coupon/Massgenerator.php +++ b/app/code/Magento/SalesRule/Model/Coupon/Massgenerator.php @@ -14,12 +14,12 @@ class Massgenerator extends \Magento\Framework\Model\AbstractModel implements /** * Maximum probability of guessing the coupon on the first attempt */ - const MAX_PROBABILITY_OF_GUESSING = 0.25; + public const MAX_PROBABILITY_OF_GUESSING = 0.25; /** * Number of attempts to generate */ - const MAX_GENERATE_ATTEMPTS = 10; + public const MAX_GENERATE_ATTEMPTS = 10; /** * Count of generated Coupons @@ -33,8 +33,6 @@ class Massgenerator extends \Magento\Framework\Model\AbstractModel implements protected $generatedCodes = []; /** - * Sales rule coupon - * * @var \Magento\SalesRule\Helper\Coupon */ protected $salesRuleCoupon; diff --git a/app/code/Magento/SalesRule/Model/ResourceModel/Report/Collection.php b/app/code/Magento/SalesRule/Model/ResourceModel/Report/Collection.php index 90a2a123f4289..8abe26d67b8fb 100644 --- a/app/code/Magento/SalesRule/Model/ResourceModel/Report/Collection.php +++ b/app/code/Magento/SalesRule/Model/ResourceModel/Report/Collection.php @@ -48,8 +48,8 @@ class Collection extends \Magento\Sales\Model\ResourceModel\Report\Collection\Ab * @param \Psr\Log\LoggerInterface $logger * @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy * @param \Magento\Framework\Event\ManagerInterface $eventManager - * @param \Magento\SalesRule\Model\ResourceModel\Report\RuleFactory $ruleFactory * @param \Magento\Sales\Model\ResourceModel\Report $resource + * @param \Magento\SalesRule\Model\ResourceModel\Report\RuleFactory $ruleFactory * @param mixed $connection */ public function __construct(