diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Tax.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Tax.php index b46a131857775..635eb546b6e43 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Order/Tax.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Tax.php @@ -1,14 +1,12 @@ */ 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..5b3c5451a4239 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Order/Tax/Collection.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Tax/Collection.php @@ -1,14 +1,12 @@ */ 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..b176746a3d7ff 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Report.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Report.php @@ -1,14 +1,12 @@ */ class Report extends \Magento\Sales\Model\ResourceModel\EntityAbstract { @@ -16,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/AbstractReport.php b/app/code/Magento/Sales/Model/ResourceModel/Report/AbstractReport.php index 1202fd269ada4..35724db1f2f20 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Report/AbstractReport.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Report/AbstractReport.php @@ -1,14 +1,12 @@ */ 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 17b74b32b284e..e200f408054ea 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Report/Collection/AbstractCollection.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Report/Collection/AbstractCollection.php @@ -1,20 +1,16 @@ */ 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.php b/app/code/Magento/Sales/Model/ResourceModel/Report/Invoiced.php index b121d802377df..700f40c7af228 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Report/Invoiced.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Report/Invoiced.php @@ -1,14 +1,12 @@ */ 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 a18399a6314b3..7b7808ad7df8a 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 @@ -1,14 +1,12 @@ */ 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 f194de3f32e60..a2b9a81b0c78d 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 @@ -1,20 +1,16 @@ */ class Order extends \Magento\Sales\Model\ResourceModel\Report\Collection\AbstractCollection { /** - * Period format - * * @var string */ protected $_periodFormat; @@ -84,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 b6d0f55063656..3f3a9859b5416 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Report/Order/Collection.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Report/Order/Collection.php @@ -1,20 +1,16 @@ */ class Collection extends \Magento\Sales\Model\ResourceModel\Report\Collection\AbstractCollection { /** - * Period format - * * @var string */ protected $_periodFormat; @@ -27,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/Order/Createdat.php b/app/code/Magento/Sales/Model/ResourceModel/Report/Order/Createdat.php index 9c0df9a9b4b58..ca1130a43116e 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Report/Order/Createdat.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Report/Order/Createdat.php @@ -1,14 +1,12 @@ */ 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..d231707ef4cd7 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Report/Order/Updatedat.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Report/Order/Updatedat.php @@ -1,14 +1,12 @@ */ 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..9664c3db367fc 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 @@ -1,14 +1,12 @@ */ 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..b31ad38f04cea 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Report/Refunded.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Report/Refunded.php @@ -1,14 +1,12 @@ */ 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 6161630874e24..fe5c7cc243018 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 @@ -1,27 +1,21 @@ */ 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/Refunded/Collection/Refunded.php b/app/code/Magento/Sales/Model/ResourceModel/Report/Refunded/Collection/Refunded.php index 734ba3b78b094..ff92364927f67 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 @@ -1,14 +1,12 @@ */ 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..b4e94e373ca5d 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Report/Shipping.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Report/Shipping.php @@ -1,14 +1,12 @@ */ 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 64d6bfc39161c..fc9bd3f1a5dd0 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 @@ -1,27 +1,21 @@ */ 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/Shipment.php b/app/code/Magento/Sales/Model/ResourceModel/Report/Shipping/Collection/Shipment.php index 6afe3a79a189e..89350a0e13c63 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 @@ -1,14 +1,12 @@ */ 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..14adda4b98167 100644 --- a/app/code/Magento/Sales/Model/Status/ListStatus.php +++ b/app/code/Magento/Sales/Model/Status/ListStatus.php @@ -1,7 +1,7 @@ */ class ListStatus { @@ -89,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.php b/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote.php index 21bcbd475e7fb..12787ac8bf5e2 100644 --- a/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote.php +++ b/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote.php @@ -1,7 +1,7 @@ * @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..1b790b014cae6 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 @@ -1,19 +1,17 @@ */ class Coupons extends \Magento\Framework\View\Element\Template implements \Magento\Backend\Block\Widget\Tab\TabInterface { /** - * {@inheritdoc} + * @inheritdoc */ public function getTabLabel() { @@ -21,7 +19,7 @@ public function getTabLabel() } /** - * {@inheritdoc} + * @inheritdoc */ public function getTabTitle() { @@ -29,7 +27,7 @@ public function getTabTitle() } /** - * {@inheritdoc} + * @inheritdoc */ public function canShowTab() { @@ -37,7 +35,7 @@ public function canShowTab() } /** - * {@inheritdoc} + * @inheritdoc */ public function isHidden() { @@ -45,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 0a88459d138e6..95ef6714bd948 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 @@ -1,7 +1,7 @@ - * * Class \Magento\SalesRule\Block\Adminhtml\Promo\Quote\Edit\Tab\Coupons\Form */ 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 e17bb7c304663..2a19d3c9772d5 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 @@ -1,18 +1,18 @@ */ 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 2bc49760c573f..b2a62cd3f560b 100644 --- a/app/code/Magento/SalesRule/Model/Coupon/Massgenerator.php +++ b/app/code/Magento/SalesRule/Model/Coupon/Massgenerator.php @@ -1,14 +1,12 @@ */ class Massgenerator extends \Magento\Framework\Model\AbstractModel implements \Magento\SalesRule\Model\Coupon\CodegeneratorInterface @@ -16,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 @@ -35,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/Coupon/Collection.php b/app/code/Magento/SalesRule/Model/ResourceModel/Coupon/Collection.php index 22f87a6f29016..b4c9fc68fda2c 100644 --- a/app/code/Magento/SalesRule/Model/ResourceModel/Coupon/Collection.php +++ b/app/code/Magento/SalesRule/Model/ResourceModel/Coupon/Collection.php @@ -1,7 +1,7 @@ */ 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..120b016943a19 100644 --- a/app/code/Magento/SalesRule/Model/ResourceModel/Coupon/Usage.php +++ b/app/code/Magento/SalesRule/Model/ResourceModel/Coupon/Usage.php @@ -1,14 +1,12 @@ */ 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 182dfabac32d3..b8bb8488df0c9 100644 --- a/app/code/Magento/SalesRule/Model/ResourceModel/Report/Collection.php +++ b/app/code/Magento/SalesRule/Model/ResourceModel/Report/Collection.php @@ -1,14 +1,12 @@ */ class Collection extends \Magento\Sales\Model\ResourceModel\Report\Collection\AbstractCollection { @@ -50,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( diff --git a/app/code/Magento/SalesRule/Model/ResourceModel/Report/Rule.php b/app/code/Magento/SalesRule/Model/ResourceModel/Report/Rule.php index 907d2c0494364..5020e81e45c71 100644 --- a/app/code/Magento/SalesRule/Model/ResourceModel/Report/Rule.php +++ b/app/code/Magento/SalesRule/Model/ResourceModel/Report/Rule.php @@ -1,14 +1,12 @@ */ class Rule extends \Magento\Reports\Model\ResourceModel\Report\AbstractReport {