From 94ef3d77ff28d704b9395034d0d3cce6ee465c9f Mon Sep 17 00:00:00 2001 From: Dan Wallis Date: Tue, 7 Mar 2023 14:06:28 +0000 Subject: [PATCH 1/3] Remove forbidden @author tag --- .../Sales/Block/Adminhtml/Order/Create/Totals/Discount.php | 1 - .../Sales/Block/Adminhtml/Order/Create/Totals/Grandtotal.php | 1 - .../Sales/Block/Adminhtml/Order/Create/Totals/Shipping.php | 1 - .../Sales/Block/Adminhtml/Order/Create/Totals/Subtotal.php | 1 - .../Magento/Sales/Block/Adminhtml/Order/Create/Totals/Table.php | 2 -- .../Magento/Sales/Block/Adminhtml/Order/Create/Totals/Tax.php | 1 - .../Magento/Sales/Block/Adminhtml/Order/Creditmemo/Totals.php | 1 - .../Magento/Sales/Block/Adminhtml/Order/Creditmemo/View.php | 1 - .../Sales/Block/Adminhtml/Order/Creditmemo/View/Comments.php | 1 - .../Sales/Block/Adminhtml/Order/Creditmemo/View/Form.php | 1 - .../Magento/Sales/Block/Adminhtml/Order/Invoice/Create/Form.php | 1 - app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/Totals.php | 1 - app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/View.php | 1 - .../Sales/Block/Adminhtml/Order/Invoice/View/Comments.php | 1 - .../Magento/Sales/Block/Adminhtml/Order/Invoice/View/Form.php | 1 - app/code/Magento/Sales/Block/Adminhtml/Order/Payment.php | 1 - app/code/Magento/Sales/Block/Adminhtml/Order/Status.php | 1 - app/code/Magento/Sales/Block/Adminhtml/Order/Totalbar.php | 1 - app/code/Magento/Sales/Block/Adminhtml/Order/Totals.php | 1 - app/code/Magento/Sales/Block/Adminhtml/Order/Totals/Tax.php | 1 - app/code/Magento/Sales/Block/Adminhtml/Order/View/Form.php | 2 -- .../Magento/Sales/Block/Adminhtml/Order/View/Giftmessage.php | 1 - app/code/Magento/Sales/Block/Adminhtml/Order/View/Messages.php | 1 - app/code/Magento/Sales/Block/Adminhtml/Order/View/Tab/Info.php | 1 - .../Magento/Sales/Block/Adminhtml/Reorder/Renderer/Action.php | 2 -- app/code/Magento/Sales/Block/Adminhtml/Report/Filter/Form.php | 1 - .../Magento/Sales/Block/Adminhtml/Report/Filter/Form/Coupon.php | 1 - .../Magento/Sales/Block/Adminhtml/Report/Filter/Form/Order.php | 1 - app/code/Magento/Sales/Block/Adminhtml/Shipment.php | 2 -- app/code/Magento/Sales/Block/Adminhtml/Transactions.php | 1 - app/code/Magento/Sales/Block/Adminhtml/Transactions/Detail.php | 1 - .../Magento/Sales/Block/Adminhtml/Transactions/Detail/Grid.php | 1 - 32 files changed, 36 deletions(-) diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Discount.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Discount.php index b6b1d4f59715e..d7d2ee7a30c86 100644 --- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Discount.php +++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Discount.php @@ -10,7 +10,6 @@ /** * Subtotal Total Row Renderer * - * @author Magento Core Team * @SuppressWarnings(PHPMD.DepthOfInheritance) */ class Discount extends \Magento\Sales\Block\Adminhtml\Order\Create\Totals\DefaultTotals diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Grandtotal.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Grandtotal.php index cf9f8a44dee27..354f8a8902130 100644 --- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Grandtotal.php +++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Grandtotal.php @@ -10,7 +10,6 @@ /** * Subtotal Total Row Renderer * - * @author Magento Core Team * @SuppressWarnings(PHPMD.DepthOfInheritance) */ class Grandtotal extends \Magento\Sales\Block\Adminhtml\Order\Create\Totals\DefaultTotals diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Shipping.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Shipping.php index 34a9ed8070e26..5750b29df68ea 100644 --- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Shipping.php +++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Shipping.php @@ -10,7 +10,6 @@ /** * Subtotal Total Row Renderer * - * @author Magento Core Team * @SuppressWarnings(PHPMD.DepthOfInheritance) */ class Shipping extends \Magento\Sales\Block\Adminhtml\Order\Create\Totals\DefaultTotals diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Subtotal.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Subtotal.php index 166f3c9637ebb..52103f4499cff 100644 --- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Subtotal.php +++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Subtotal.php @@ -10,7 +10,6 @@ /** * Subtotal Total Row Renderer * - * @author Magento Core Team * @SuppressWarnings(PHPMD.DepthOfInheritance) */ class Subtotal extends \Magento\Sales\Block\Adminhtml\Order\Create\Totals\DefaultTotals diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Table.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Table.php index 19d526155a3ca..d20c633b362ae 100644 --- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Table.php +++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Table.php @@ -9,8 +9,6 @@ /** * Adminhtml sales order create totals table block - * - * @author Magento Core Team */ class Table extends \Magento\Backend\Block\Template { diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Tax.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Tax.php index 165875955baa2..f8bf1edb32cd7 100644 --- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Tax.php +++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Tax.php @@ -12,7 +12,6 @@ /** * Tax Total Row Renderer * - * @author Magento Core Team * @SuppressWarnings(PHPMD.DepthOfInheritance) */ class Tax extends \Magento\Sales\Block\Adminhtml\Order\Create\Totals\DefaultTotals diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/Totals.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/Totals.php index 7947ba4c27262..dd2f4c14541d9 100644 --- a/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/Totals.php +++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/Totals.php @@ -11,7 +11,6 @@ * Adminhtml order creditmemo totals block * * @api - * @author Magento Core Team * @since 100.0.2 */ class Totals extends \Magento\Sales\Block\Adminhtml\Totals diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/View.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/View.php index 69081bcd11e6f..b1b93a4a9aceb 100644 --- a/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/View.php +++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/View.php @@ -9,7 +9,6 @@ * Adminhtml creditmemo view * * @api - * @author Magento Core Team * @since 100.0.2 */ class View extends \Magento\Backend\Block\Widget\Form\Container diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/View/Comments.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/View/Comments.php index caeb958774a75..b4dab51ac9618 100644 --- a/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/View/Comments.php +++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/View/Comments.php @@ -9,7 +9,6 @@ * Adminhtml sales shipment comment view block * * @api - * @author Magento Core Team * @since 100.0.2 */ class Comments extends \Magento\Backend\Block\Text\ListText diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/View/Form.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/View/Form.php index 093930ef2c5f2..c201668036a6a 100644 --- a/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/View/Form.php +++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/View/Form.php @@ -9,7 +9,6 @@ * Creditmemo view form * * @api - * @author Magento Core Team * @since 100.0.2 */ class Form extends \Magento\Sales\Block\Adminhtml\Order\AbstractOrder diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/Create/Form.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/Create/Form.php index 3f41eb5ba7d8e..6be5e56480e15 100644 --- a/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/Create/Form.php +++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/Create/Form.php @@ -12,7 +12,6 @@ * Adminhtml invoice create form * * @api - * @author Magento Core Team * @since 100.0.2 */ class Form extends \Magento\Sales\Block\Adminhtml\Order\AbstractOrder diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/Totals.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/Totals.php index 5cf916d24ee39..eba03f32d880f 100644 --- a/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/Totals.php +++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/Totals.php @@ -12,7 +12,6 @@ * Adminhtml order invoice totals block * * @api - * @author Magento Core Team * @since 100.0.2 */ class Totals extends \Magento\Sales\Block\Adminhtml\Totals diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/View.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/View.php index 074aa99a5e791..1dbb48a156d7a 100644 --- a/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/View.php +++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/View.php @@ -10,7 +10,6 @@ * Adminhtml invoice create * * @api - * @author Magento Core Team * @since 100.0.2 */ class View extends \Magento\Backend\Block\Widget\Form\Container diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/View/Comments.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/View/Comments.php index ba7665c391c45..be84acf7dcf48 100644 --- a/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/View/Comments.php +++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/View/Comments.php @@ -9,7 +9,6 @@ * Adminhtml sales shipment comment view block * * @api - * @author Magento Core Team * @since 100.0.2 */ class Comments extends \Magento\Backend\Block\Text\ListText diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/View/Form.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/View/Form.php index f026ac02b4f4c..a8f1ed2a37ada 100644 --- a/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/View/Form.php +++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/View/Form.php @@ -9,7 +9,6 @@ * Invoice view form * * @api - * @author Magento Core Team * @since 100.0.2 */ class Form extends \Magento\Sales\Block\Adminhtml\Order\AbstractOrder diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Payment.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Payment.php index 9548b64a74f30..b014e04a2db43 100644 --- a/app/code/Magento/Sales/Block/Adminhtml/Order/Payment.php +++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Payment.php @@ -11,7 +11,6 @@ * Adminhtml sales order payment information * * @api - * @author Magento Core Team * @since 100.0.2 */ class Payment extends \Magento\Backend\Block\Template diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Status.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Status.php index d90f1b0cd3efe..871f4a578f64a 100644 --- a/app/code/Magento/Sales/Block/Adminhtml/Order/Status.php +++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Status.php @@ -9,7 +9,6 @@ * Adminhtml sales order's status management block * * @api - * @author Magento Core Team * @since 100.0.2 */ class Status extends \Magento\Backend\Block\Widget\Grid\Container diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Totalbar.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Totalbar.php index 33e5250d27d26..55e81c8473fb9 100644 --- a/app/code/Magento/Sales/Block/Adminhtml/Order/Totalbar.php +++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Totalbar.php @@ -10,7 +10,6 @@ * * @deprecated 101.0.6 * @api - * @author Magento Core Team * @since 100.0.2 */ class Totalbar extends \Magento\Sales\Block\Adminhtml\Order\AbstractOrder diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Totals.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Totals.php index 6cd2c53f894f8..7539fb9bbecbe 100644 --- a/app/code/Magento/Sales/Block/Adminhtml/Order/Totals.php +++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Totals.php @@ -9,7 +9,6 @@ * Adminhtml order totals block * * @api - * @author Magento Core Team * @since 100.0.2 */ class Totals extends \Magento\Sales\Block\Adminhtml\Totals//\Magento\Sales\Block\Adminhtml\Order\AbstractOrder diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Totals/Tax.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Totals/Tax.php index 1f8d0a0bc265d..58f18d096e20d 100644 --- a/app/code/Magento/Sales/Block/Adminhtml/Order/Totals/Tax.php +++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Totals/Tax.php @@ -12,7 +12,6 @@ * Adminhtml order tax totals block * * @api - * @author Magento Core Team * @since 100.0.2 */ class Tax extends \Magento\Tax\Block\Sales\Order\Tax diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/View/Form.php b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Form.php index 6c06e9d624c81..cb8710bbe5596 100644 --- a/app/code/Magento/Sales/Block/Adminhtml/Order/View/Form.php +++ b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Form.php @@ -7,8 +7,6 @@ /** * Adminhtml sales order view plane - * - * @author Magento Core Team */ class Form extends \Magento\Backend\Block\Template { diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/View/Giftmessage.php b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Giftmessage.php index 633fd26d7e731..4075ac6a6e13d 100644 --- a/app/code/Magento/Sales/Block/Adminhtml/Order/View/Giftmessage.php +++ b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Giftmessage.php @@ -9,7 +9,6 @@ * Edit order giftmessage block * * @api - * @author Magento Core Team * @since 100.0.2 */ class Giftmessage extends \Magento\Backend\Block\Widget diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/View/Messages.php b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Messages.php index adce934ff1cae..ac4329108613a 100644 --- a/app/code/Magento/Sales/Block/Adminhtml/Order/View/Messages.php +++ b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Messages.php @@ -12,7 +12,6 @@ * Order view messages * * @api - * @author Magento Core Team * @since 100.0.2 */ class Messages extends \Magento\Framework\View\Element\Messages diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/View/Tab/Info.php b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Tab/Info.php index 8ddd0022296ea..a70bb12d3218e 100644 --- a/app/code/Magento/Sales/Block/Adminhtml/Order/View/Tab/Info.php +++ b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Tab/Info.php @@ -9,7 +9,6 @@ * Order information tab * * @api - * @author Magento Core Team * @since 100.0.2 */ class Info extends \Magento\Sales\Block\Adminhtml\Order\AbstractOrder implements diff --git a/app/code/Magento/Sales/Block/Adminhtml/Reorder/Renderer/Action.php b/app/code/Magento/Sales/Block/Adminhtml/Reorder/Renderer/Action.php index 566ea1214d91f..40b07829e5b97 100644 --- a/app/code/Magento/Sales/Block/Adminhtml/Reorder/Renderer/Action.php +++ b/app/code/Magento/Sales/Block/Adminhtml/Reorder/Renderer/Action.php @@ -7,8 +7,6 @@ /** * Adminhtml alert queue grid block action item renderer - * - * @author Magento Core Team */ class Action extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer { diff --git a/app/code/Magento/Sales/Block/Adminhtml/Report/Filter/Form.php b/app/code/Magento/Sales/Block/Adminhtml/Report/Filter/Form.php index 69391e07bbcde..296136486e3ce 100644 --- a/app/code/Magento/Sales/Block/Adminhtml/Report/Filter/Form.php +++ b/app/code/Magento/Sales/Block/Adminhtml/Report/Filter/Form.php @@ -9,7 +9,6 @@ * Sales Adminhtml report filter form * * @api - * @author Magento Core Team * @SuppressWarnings(PHPMD.DepthOfInheritance) * @since 100.0.2 */ diff --git a/app/code/Magento/Sales/Block/Adminhtml/Report/Filter/Form/Coupon.php b/app/code/Magento/Sales/Block/Adminhtml/Report/Filter/Form/Coupon.php index 1e92ebada0d8c..b79ebd42ea9be 100644 --- a/app/code/Magento/Sales/Block/Adminhtml/Report/Filter/Form/Coupon.php +++ b/app/code/Magento/Sales/Block/Adminhtml/Report/Filter/Form/Coupon.php @@ -9,7 +9,6 @@ * Sales Adminhtml report filter form for coupons report * * @api - * @author Magento Core Team * @SuppressWarnings(PHPMD.DepthOfInheritance) * @since 100.0.2 */ diff --git a/app/code/Magento/Sales/Block/Adminhtml/Report/Filter/Form/Order.php b/app/code/Magento/Sales/Block/Adminhtml/Report/Filter/Form/Order.php index a94a7b9d3f557..0531fcab41ea2 100644 --- a/app/code/Magento/Sales/Block/Adminhtml/Report/Filter/Form/Order.php +++ b/app/code/Magento/Sales/Block/Adminhtml/Report/Filter/Form/Order.php @@ -9,7 +9,6 @@ * Sales Adminhtml report filter form order * * @api - * @author Magento Core Team * @SuppressWarnings(PHPMD.DepthOfInheritance) * @since 100.0.2 */ diff --git a/app/code/Magento/Sales/Block/Adminhtml/Shipment.php b/app/code/Magento/Sales/Block/Adminhtml/Shipment.php index 2226ec63fff55..f2f956cc365f9 100644 --- a/app/code/Magento/Sales/Block/Adminhtml/Shipment.php +++ b/app/code/Magento/Sales/Block/Adminhtml/Shipment.php @@ -7,8 +7,6 @@ /** * Adminhtml sales shipments block - * - * @author Magento Core Team */ class Shipment extends \Magento\Backend\Block\Widget\Grid\Container { diff --git a/app/code/Magento/Sales/Block/Adminhtml/Transactions.php b/app/code/Magento/Sales/Block/Adminhtml/Transactions.php index 204f87e01c323..77ffdadd167e4 100644 --- a/app/code/Magento/Sales/Block/Adminhtml/Transactions.php +++ b/app/code/Magento/Sales/Block/Adminhtml/Transactions.php @@ -9,7 +9,6 @@ * Adminhtml sales transactions block * * @api - * @author Magento Core Team * @since 100.0.2 */ class Transactions extends \Magento\Backend\Block\Widget\Grid\Container diff --git a/app/code/Magento/Sales/Block/Adminhtml/Transactions/Detail.php b/app/code/Magento/Sales/Block/Adminhtml/Transactions/Detail.php index 78756eb03c94a..f52cad35bd494 100644 --- a/app/code/Magento/Sales/Block/Adminhtml/Transactions/Detail.php +++ b/app/code/Magento/Sales/Block/Adminhtml/Transactions/Detail.php @@ -12,7 +12,6 @@ * Adminhtml transaction detail * * @api - * @author Magento Core Team * @since 100.0.2 */ class Detail extends \Magento\Backend\Block\Widget\Container diff --git a/app/code/Magento/Sales/Block/Adminhtml/Transactions/Detail/Grid.php b/app/code/Magento/Sales/Block/Adminhtml/Transactions/Detail/Grid.php index 537c00893dbfb..5d1570161fdaa 100644 --- a/app/code/Magento/Sales/Block/Adminhtml/Transactions/Detail/Grid.php +++ b/app/code/Magento/Sales/Block/Adminhtml/Transactions/Detail/Grid.php @@ -9,7 +9,6 @@ * Adminhtml transaction details grid * * @api - * @author Magento Core Team * @since 100.0.2 */ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended From 887b05ffc07fa290d243b83b66db43a23764e2e5 Mon Sep 17 00:00:00 2001 From: engcom-Echo Date: Fri, 14 Jun 2024 07:42:48 +0530 Subject: [PATCH 2/3] Fixed static test failures. --- .../Block/Adminhtml/Order/Create/Totals/Discount.php | 2 +- .../Adminhtml/Order/Create/Totals/Grandtotal.php | 6 +----- .../Block/Adminhtml/Order/Create/Totals/Shipping.php | 6 +----- .../Block/Adminhtml/Order/Create/Totals/Subtotal.php | 6 +----- .../Block/Adminhtml/Order/Create/Totals/Table.php | 2 -- .../Sales/Block/Adminhtml/Order/Create/Totals/Tax.php | 2 -- .../Sales/Block/Adminhtml/Order/Creditmemo/Totals.php | 2 -- .../Sales/Block/Adminhtml/Order/Creditmemo/View.php | 2 -- .../Adminhtml/Order/Creditmemo/View/Comments.php | 2 -- .../Sales/Block/Adminhtml/Order/Invoice/View.php | 4 ---- .../Block/Adminhtml/Order/Invoice/View/Comments.php | 2 -- .../Magento/Sales/Block/Adminhtml/Order/Payment.php | 2 -- .../Magento/Sales/Block/Adminhtml/Order/Totalbar.php | 3 +-- .../Sales/Block/Adminhtml/Order/Totals/Tax.php | 11 ++--------- .../Magento/Sales/Block/Adminhtml/Order/View/Form.php | 2 -- .../Sales/Block/Adminhtml/Order/View/Giftmessage.php | 6 ------ .../Sales/Block/Adminhtml/Order/View/Tab/Info.php | 8 ++++---- .../Sales/Block/Adminhtml/Reorder/Renderer/Action.php | 2 -- .../Sales/Block/Adminhtml/Report/Filter/Form.php | 2 -- .../Sales/Block/Adminhtml/Transactions/Detail.php | 2 -- .../Block/Adminhtml/Transactions/Detail/Grid.php | 4 ---- 21 files changed, 11 insertions(+), 67 deletions(-) diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Discount.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Discount.php index d7d2ee7a30c86..16e727f0521eb 100644 --- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Discount.php +++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Discount.php @@ -23,9 +23,9 @@ class Discount extends \Magento\Sales\Block\Adminhtml\Order\Create\Totals\Defaul * @param \Magento\Backend\Block\Template\Context $context * @param \Magento\Backend\Model\Session\Quote $sessionQuote * @param \Magento\Sales\Model\AdminOrder\Create $orderCreate + * @param PriceCurrencyInterface $priceCurrency * @param \Magento\Sales\Helper\Data $salesData * @param \Magento\Sales\Model\Config $salesConfig - * @param PriceCurrencyInterface $priceCurrency * @param \Magento\Tax\Model\Config $taxConfig * @param array $data */ diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Grandtotal.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Grandtotal.php index 354f8a8902130..6efc51a720f22 100644 --- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Grandtotal.php +++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Grandtotal.php @@ -15,15 +15,11 @@ class Grandtotal extends \Magento\Sales\Block\Adminhtml\Order\Create\Totals\DefaultTotals { /** - * Template - * * @var string */ protected $_template = 'Magento_Sales::order/create/totals/grandtotal.phtml'; /** - * Tax config - * * @var \Magento\Tax\Model\Config */ protected $_taxConfig; @@ -32,9 +28,9 @@ class Grandtotal extends \Magento\Sales\Block\Adminhtml\Order\Create\Totals\Defa * @param \Magento\Backend\Block\Template\Context $context * @param \Magento\Backend\Model\Session\Quote $sessionQuote * @param \Magento\Sales\Model\AdminOrder\Create $orderCreate + * @param PriceCurrencyInterface $priceCurrency * @param \Magento\Sales\Helper\Data $salesData * @param \Magento\Sales\Model\Config $salesConfig - * @param PriceCurrencyInterface $priceCurrency * @param \Magento\Tax\Model\Config $taxConfig * @param array $data */ diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Shipping.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Shipping.php index 5750b29df68ea..f3c1ef18587e7 100644 --- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Shipping.php +++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Shipping.php @@ -15,15 +15,11 @@ class Shipping extends \Magento\Sales\Block\Adminhtml\Order\Create\Totals\DefaultTotals { /** - * Template - * * @var string */ protected $_template = 'Magento_Sales::order/create/totals/shipping.phtml'; /** - * Tax config - * * @var \Magento\Tax\Model\Config */ protected $_taxConfig; @@ -32,9 +28,9 @@ class Shipping extends \Magento\Sales\Block\Adminhtml\Order\Create\Totals\Defaul * @param \Magento\Backend\Block\Template\Context $context * @param \Magento\Backend\Model\Session\Quote $sessionQuote * @param \Magento\Sales\Model\AdminOrder\Create $orderCreate + * @param PriceCurrencyInterface $priceCurrency * @param \Magento\Sales\Helper\Data $salesData * @param \Magento\Sales\Model\Config $salesConfig - * @param PriceCurrencyInterface $priceCurrency * @param \Magento\Tax\Model\Config $taxConfig * @param array $data */ diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Subtotal.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Subtotal.php index 52103f4499cff..05adae82a1099 100644 --- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Subtotal.php +++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Subtotal.php @@ -15,15 +15,11 @@ class Subtotal extends \Magento\Sales\Block\Adminhtml\Order\Create\Totals\DefaultTotals { /** - * Template - * * @var string */ protected $_template = 'Magento_Sales::order/create/totals/subtotal.phtml'; /** - * Tax config - * * @var \Magento\Tax\Model\Config */ protected $_taxConfig; @@ -32,9 +28,9 @@ class Subtotal extends \Magento\Sales\Block\Adminhtml\Order\Create\Totals\Defaul * @param \Magento\Backend\Block\Template\Context $context * @param \Magento\Backend\Model\Session\Quote $sessionQuote * @param \Magento\Sales\Model\AdminOrder\Create $orderCreate + * @param PriceCurrencyInterface $priceCurrency * @param \Magento\Sales\Helper\Data $salesData * @param \Magento\Sales\Model\Config $salesConfig - * @param PriceCurrencyInterface $priceCurrency * @param \Magento\Tax\Model\Config $taxConfig * @param array $data */ diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Table.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Table.php index d20c633b362ae..4c2fc5e9c66f9 100644 --- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Table.php +++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Table.php @@ -13,8 +13,6 @@ class Table extends \Magento\Backend\Block\Template { /** - * Website collection - * * @var Collection|null */ protected $_websiteCollection = null; diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Tax.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Tax.php index f8bf1edb32cd7..20e9ab87458ac 100644 --- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Tax.php +++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Tax.php @@ -41,8 +41,6 @@ public function __construct( } /** - * Template - * * @var string */ protected $_template = 'Magento_Sales::order/create/totals/tax.phtml'; diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/Totals.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/Totals.php index dd2f4c14541d9..74681d272cd1e 100644 --- a/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/Totals.php +++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/Totals.php @@ -16,8 +16,6 @@ class Totals extends \Magento\Sales\Block\Adminhtml\Totals { /** - * Creditmemo - * * @var Creditmemo|null */ protected $_creditmemo; diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/View.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/View.php index b1b93a4a9aceb..f1a0bae180fd4 100644 --- a/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/View.php +++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/View.php @@ -14,8 +14,6 @@ class View extends \Magento\Backend\Block\Widget\Form\Container { /** - * Core registry - * * @var \Magento\Framework\Registry */ protected $_coreRegistry = null; diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/View/Comments.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/View/Comments.php index b4dab51ac9618..564d5d840d884 100644 --- a/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/View/Comments.php +++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/View/Comments.php @@ -14,8 +14,6 @@ class Comments extends \Magento\Backend\Block\Text\ListText { /** - * Core registry - * * @var \Magento\Framework\Registry */ protected $_coreRegistry = null; diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/View.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/View.php index 1dbb48a156d7a..932bc6422c373 100644 --- a/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/View.php +++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/View.php @@ -22,15 +22,11 @@ class View extends \Magento\Backend\Block\Widget\Form\Container protected $_session; /** - * Core registry - * * @var \Magento\Framework\Registry */ protected $_coreRegistry = null; /** - * Backend session - * * @var \Magento\Backend\Model\Auth\Session */ protected $_backendSession; diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/View/Comments.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/View/Comments.php index be84acf7dcf48..a63ec62199dbb 100644 --- a/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/View/Comments.php +++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/View/Comments.php @@ -14,8 +14,6 @@ class Comments extends \Magento\Backend\Block\Text\ListText { /** - * Core registry - * * @var \Magento\Framework\Registry */ protected $_coreRegistry = null; diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Payment.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Payment.php index b014e04a2db43..67efb83b3f8fd 100644 --- a/app/code/Magento/Sales/Block/Adminhtml/Order/Payment.php +++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Payment.php @@ -16,8 +16,6 @@ class Payment extends \Magento\Backend\Block\Template { /** - * Payment data - * * @var \Magento\Payment\Helper\Data */ protected $_paymentData = null; diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Totalbar.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Totalbar.php index 55e81c8473fb9..997b85d39e00d 100644 --- a/app/code/Magento/Sales/Block/Adminhtml/Order/Totalbar.php +++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Totalbar.php @@ -11,12 +11,11 @@ * @deprecated 101.0.6 * @api * @since 100.0.2 + * @see Nothing */ class Totalbar extends \Magento\Sales\Block\Adminhtml\Order\AbstractOrder { /** - * Totals - * * @var array */ protected $_totals = []; diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Totals/Tax.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Totals/Tax.php index 58f18d096e20d..09de3c89a1998 100644 --- a/app/code/Magento/Sales/Block/Adminhtml/Order/Totals/Tax.php +++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Totals/Tax.php @@ -17,29 +17,21 @@ class Tax extends \Magento\Tax\Block\Sales\Order\Tax { /** - * Tax helper - * * @var \Magento\Tax\Helper\Data */ protected $_taxHelper; /** - * Tax calculation - * * @var \Magento\Tax\Model\Calculation */ protected $_taxCalculation; /** - * Tax factory - * * @var \Magento\Tax\Model\Sales\Order\TaxFactory */ protected $_taxOrderFactory; /** - * Sales admin helper - * * @var \Magento\Sales\Helper\Admin */ protected $_salesAdminHelper; @@ -88,10 +80,11 @@ public function getFullTaxInfo() } $taxClassAmount = []; + //phpcs:disable if (empty($source)) { return $taxClassAmount; } - + //phpcs:enable $taxClassAmount = $this->_taxHelper->getCalculatedTaxes($source); if (empty($taxClassAmount)) { $rates = $this->_taxOrderFactory->create()->getCollection()->loadByOrder($this->getOrder())->toArray(); diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/View/Form.php b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Form.php index cb8710bbe5596..3308d163e3369 100644 --- a/app/code/Magento/Sales/Block/Adminhtml/Order/View/Form.php +++ b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Form.php @@ -11,8 +11,6 @@ class Form extends \Magento\Backend\Block\Template { /** - * Template - * * @var string */ protected $_template = 'Magento_Sales::order/view/form.phtml'; diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/View/Giftmessage.php b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Giftmessage.php index 4075ac6a6e13d..ed44ce6c94264 100644 --- a/app/code/Magento/Sales/Block/Adminhtml/Order/View/Giftmessage.php +++ b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Giftmessage.php @@ -21,22 +21,16 @@ class Giftmessage extends \Magento\Backend\Block\Widget protected $_entity; /** - * Core registry - * * @var \Magento\Framework\Registry */ protected $_coreRegistry = null; /** - * Message factory - * * @var \Magento\GiftMessage\Model\MessageFactory */ protected $_messageFactory; /** - * Message helper - * * @var \Magento\GiftMessage\Helper\Message */ protected $_messageHelper; diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/View/Tab/Info.php b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Tab/Info.php index a70bb12d3218e..5ab6c684b6b41 100644 --- a/app/code/Magento/Sales/Block/Adminhtml/Order/View/Tab/Info.php +++ b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Tab/Info.php @@ -114,7 +114,7 @@ public function getViewUrl($orderId) */ /** - * {@inheritdoc} + * @inheritdoc */ public function getTabLabel() { @@ -122,7 +122,7 @@ public function getTabLabel() } /** - * {@inheritdoc} + * @inheritdoc */ public function getTabTitle() { @@ -130,7 +130,7 @@ public function getTabTitle() } /** - * {@inheritdoc} + * @inheritdoc */ public function canShowTab() { @@ -138,7 +138,7 @@ public function canShowTab() } /** - * {@inheritdoc} + * @inheritdoc */ public function isHidden() { diff --git a/app/code/Magento/Sales/Block/Adminhtml/Reorder/Renderer/Action.php b/app/code/Magento/Sales/Block/Adminhtml/Reorder/Renderer/Action.php index 40b07829e5b97..538d77b3d6f7d 100644 --- a/app/code/Magento/Sales/Block/Adminhtml/Reorder/Renderer/Action.php +++ b/app/code/Magento/Sales/Block/Adminhtml/Reorder/Renderer/Action.php @@ -18,8 +18,6 @@ class Action extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Abstract protected $_actions = []; /** - * Sales reorder - * * @var \Magento\Sales\Helper\Reorder */ protected $_salesReorder = null; diff --git a/app/code/Magento/Sales/Block/Adminhtml/Report/Filter/Form.php b/app/code/Magento/Sales/Block/Adminhtml/Report/Filter/Form.php index 296136486e3ce..3f9270da23b4a 100644 --- a/app/code/Magento/Sales/Block/Adminhtml/Report/Filter/Form.php +++ b/app/code/Magento/Sales/Block/Adminhtml/Report/Filter/Form.php @@ -15,8 +15,6 @@ class Form extends \Magento\Reports\Block\Adminhtml\Filter\Form { /** - * Order config - * * @var \Magento\Sales\Model\Order\ConfigFactory */ protected $_orderConfig; diff --git a/app/code/Magento/Sales/Block/Adminhtml/Transactions/Detail.php b/app/code/Magento/Sales/Block/Adminhtml/Transactions/Detail.php index f52cad35bd494..05a77e3a678e2 100644 --- a/app/code/Magento/Sales/Block/Adminhtml/Transactions/Detail.php +++ b/app/code/Magento/Sales/Block/Adminhtml/Transactions/Detail.php @@ -24,8 +24,6 @@ class Detail extends \Magento\Backend\Block\Widget\Container protected $_txn; /** - * Core registry - * * @var \Magento\Framework\Registry */ protected $_coreRegistry = null; diff --git a/app/code/Magento/Sales/Block/Adminhtml/Transactions/Detail/Grid.php b/app/code/Magento/Sales/Block/Adminhtml/Transactions/Detail/Grid.php index 5d1570161fdaa..32cb25855c6ce 100644 --- a/app/code/Magento/Sales/Block/Adminhtml/Transactions/Detail/Grid.php +++ b/app/code/Magento/Sales/Block/Adminhtml/Transactions/Detail/Grid.php @@ -14,15 +14,11 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended { /** - * Core registry - * * @var \Magento\Framework\Registry */ protected $_coreRegistry = null; /** - * Collection factory - * * @var \Magento\Framework\Data\CollectionFactory */ protected $_collectionFactory; From 6ab343b360d4abdb31c3f3935484bf942ee3048f Mon Sep 17 00:00:00 2001 From: engcom-Echo Date: Tue, 18 Jun 2024 11:24:16 +0530 Subject: [PATCH 3/3] Fixed static test failures. --- app/code/Magento/Sales/Block/Adminhtml/Order/Totals/Tax.php | 5 ++--- .../Magento/Sales/Block/Adminhtml/Order/View/Messages.php | 2 -- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Totals/Tax.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Totals/Tax.php index 09de3c89a1998..347fa3be4659c 100644 --- a/app/code/Magento/Sales/Block/Adminhtml/Order/Totals/Tax.php +++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Totals/Tax.php @@ -80,11 +80,10 @@ public function getFullTaxInfo() } $taxClassAmount = []; - //phpcs:disable - if (empty($source)) { + if ($source == null) { return $taxClassAmount; } - //phpcs:enable + $taxClassAmount = $this->_taxHelper->getCalculatedTaxes($source); if (empty($taxClassAmount)) { $rates = $this->_taxOrderFactory->create()->getCollection()->loadByOrder($this->getOrder())->toArray(); diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/View/Messages.php b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Messages.php index ac4329108613a..b60105a071613 100644 --- a/app/code/Magento/Sales/Block/Adminhtml/Order/View/Messages.php +++ b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Messages.php @@ -17,8 +17,6 @@ class Messages extends \Magento\Framework\View\Element\Messages { /** - * Core registry - * * @var \Magento\Framework\Registry */ protected $coreRegistry = null;