From bbf1a0f008e1432d9e8e358f0c9e4cd8d741c63e Mon Sep 17 00:00:00 2001 From: Dan Wallis Date: Tue, 7 Mar 2023 14:09:54 +0000 Subject: [PATCH 1/3] Remove forbidden @author tag --- .../Sales/Model/ResourceModel/Order/Creditmemo/Collection.php | 1 - .../Sales/Model/ResourceModel/Order/Creditmemo/Comment.php | 2 -- .../Model/ResourceModel/Order/Creditmemo/Comment/Collection.php | 1 - .../Magento/Sales/Model/ResourceModel/Order/Creditmemo/Item.php | 2 -- .../Model/ResourceModel/Order/Creditmemo/Item/Collection.php | 2 -- .../ResourceModel/Order/Invoice/Attribute/Backend/Child.php | 2 -- .../ResourceModel/Order/Invoice/Attribute/Backend/Item.php | 2 -- .../ResourceModel/Order/Invoice/Attribute/Backend/Order.php | 2 -- .../Sales/Model/ResourceModel/Order/Invoice/Collection.php | 1 - .../Magento/Sales/Model/ResourceModel/Order/Invoice/Comment.php | 2 -- .../Model/ResourceModel/Order/Invoice/Comment/Collection.php | 1 - .../Magento/Sales/Model/ResourceModel/Order/Invoice/Item.php | 2 -- .../Sales/Model/ResourceModel/Order/Invoice/Item/Collection.php | 1 - .../Magento/Sales/Model/ResourceModel/Order/Item/Collection.php | 1 - .../Sales/Model/ResourceModel/Order/Payment/Transaction.php | 2 -- .../ResourceModel/Order/Payment/Transaction/Collection.php | 2 -- .../Magento/Sales/Model/ResourceModel/Order/Rss/OrderStatus.php | 2 -- app/code/Magento/Sales/Model/ResourceModel/Order/Shipment.php | 2 -- .../ResourceModel/Order/Shipment/Attribute/Backend/Child.php | 2 -- .../Sales/Model/ResourceModel/Order/Shipment/Collection.php | 1 - .../Sales/Model/ResourceModel/Order/Shipment/Comment.php | 2 -- .../Model/ResourceModel/Order/Shipment/Comment/Collection.php | 1 - .../Magento/Sales/Model/ResourceModel/Order/Shipment/Item.php | 2 -- .../Model/ResourceModel/Order/Shipment/Item/Collection.php | 2 -- .../Magento/Sales/Model/ResourceModel/Order/Shipment/Track.php | 2 -- .../Model/ResourceModel/Order/Shipment/Track/Collection.php | 1 - app/code/Magento/Sales/Model/ResourceModel/Order/Status.php | 2 -- .../Sales/Model/ResourceModel/Order/Status/Collection.php | 2 -- .../Magento/Sales/Model/ResourceModel/Order/Status/History.php | 2 -- .../Model/ResourceModel/Order/Status/History/Collection.php | 2 -- 30 files changed, 51 deletions(-) diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Collection.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Collection.php index 80929d886673f..79a75090f1431 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Collection.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Collection.php @@ -12,7 +12,6 @@ * Flat sales order creditmemo collection * * @api - * @author Magento Core Team * @since 100.0.2 */ class Collection extends AbstractCollection implements CreditmemoSearchResultInterface diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Comment.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Comment.php index 5d9e69eb3db4b..1946304585de3 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Comment.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Comment.php @@ -11,8 +11,6 @@ /** * Flat sales order creditmemo comment resource - * - * @author Magento Core Team */ class Comment extends EntityAbstract implements CreditmemoCommentResourceInterface { diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Comment/Collection.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Comment/Collection.php index 76549adef0e36..b2ab78f9e6020 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Comment/Collection.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Comment/Collection.php @@ -12,7 +12,6 @@ * Flat sales order creditmemo comments collection * * @api - * @author Magento Core Team * @since 100.0.2 */ class Collection extends AbstractCollection implements CreditmemoCommentSearchResultInterface diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Item.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Item.php index d7b23cc49f371..94044fdfcba1c 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Item.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Item.php @@ -10,8 +10,6 @@ /** * Flat sales order creditmemo item resource - * - * @author Magento Core Team */ class Item extends SalesResource implements CreditmemoItemResourceInterface { diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Item/Collection.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Item/Collection.php index 081e990647fe9..edc30d7325ea0 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Item/Collection.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Item/Collection.php @@ -7,8 +7,6 @@ /** * Flat sales order creditmemo items collection - * - * @author Magento Core Team */ class Collection extends \Magento\Sales\Model\ResourceModel\Collection\AbstractCollection { diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Attribute/Backend/Child.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Attribute/Backend/Child.php index 69df9d24e66e0..af08b04185253 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Attribute/Backend/Child.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Attribute/Backend/Child.php @@ -7,8 +7,6 @@ /** * Invoice backend model for child attribute - * - * @author Magento Core Team */ class Child extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend { diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Attribute/Backend/Item.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Attribute/Backend/Item.php index 1205ae98588f5..81b512ed35cab 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Attribute/Backend/Item.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Attribute/Backend/Item.php @@ -7,8 +7,6 @@ /** * Invoice backend model for item attribute - * - * @author Magento Core Team */ class Item extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend { diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Attribute/Backend/Order.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Attribute/Backend/Order.php index 84e15dc104947..04cb7b58a50b5 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Attribute/Backend/Order.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Attribute/Backend/Order.php @@ -7,8 +7,6 @@ /** * Invoice backend model for order attribute - * - * @author Magento Core Team */ class Order extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend { diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Collection.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Collection.php index 3a5391e0e5cb5..89b930b4e6140 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Collection.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Collection.php @@ -12,7 +12,6 @@ * Flat sales order invoice collection * * @api - * @author Magento Core Team * @since 100.0.2 */ class Collection extends AbstractCollection implements InvoiceSearchResultInterface diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Comment.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Comment.php index eb4f9c43f1d58..fa699e60c3a25 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Comment.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Comment.php @@ -11,8 +11,6 @@ /** * Flat sales order invoice comment resource - * - * @author Magento Core Team */ class Comment extends EntityAbstract implements InvoiceCommentResourceInterface { diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Comment/Collection.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Comment/Collection.php index 54dbf613e39e5..0184690f94746 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Comment/Collection.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Comment/Collection.php @@ -12,7 +12,6 @@ * Flat sales order invoice comment collection * * @api - * @author Magento Core Team * @since 100.0.2 */ class Collection extends AbstractCollection implements InvoiceCommentSearchResultInterface diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Item.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Item.php index d5295d33d2aba..cbd600be9943f 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Item.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Item.php @@ -10,8 +10,6 @@ /** * Flat sales order invoice item resource - * - * @author Magento Core Team */ class Item extends SalesResource implements InvoiceItemResourceInterface { diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Item/Collection.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Item/Collection.php index bc14a57808a35..0bc11be34bbf3 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Item/Collection.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Item/Collection.php @@ -9,7 +9,6 @@ * Flat sales order invoice item collection * * @api - * @author Magento Core Team * @since 100.0.2 */ class Collection extends \Magento\Sales\Model\ResourceModel\Collection\AbstractCollection diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Item/Collection.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Item/Collection.php index 10191ba42ee76..3f7edefca55d8 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Order/Item/Collection.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Item/Collection.php @@ -11,7 +11,6 @@ * Flat sales order payment collection * * @api - * @author Magento Core Team * @since 100.0.2 */ class Collection extends AbstractCollection implements \Magento\Sales\Api\Data\OrderItemSearchResultInterface diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Payment/Transaction.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Payment/Transaction.php index 98524b64b39d7..b913dddbac2b2 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Order/Payment/Transaction.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Payment/Transaction.php @@ -10,8 +10,6 @@ /** * Sales transaction resource model - * - * @author Magento Core Team */ class Transaction extends EntityAbstract implements TransactionResourceInterface { diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Payment/Transaction/Collection.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Payment/Transaction/Collection.php index e068da8fb08d7..233b2cf950f9a 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Order/Payment/Transaction/Collection.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Payment/Transaction/Collection.php @@ -10,8 +10,6 @@ /** * Payment transactions collection - * - * @author Magento Core Team */ class Collection extends AbstractCollection implements TransactionSearchResultInterface { diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Rss/OrderStatus.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Rss/OrderStatus.php index b1d2deb248ba1..6003040b9fb84 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Order/Rss/OrderStatus.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Rss/OrderStatus.php @@ -9,8 +9,6 @@ /** * Order Rss Resource Model - * - * @author Magento Core Team */ class OrderStatus { diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment.php index d2d45b62250ed..40a0a8d684ee4 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment.php @@ -13,8 +13,6 @@ /** * Flat sales order shipment resource - * - * @author Magento Core Team */ class Shipment extends SalesResource implements ShipmentResourceInterface { diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Attribute/Backend/Child.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Attribute/Backend/Child.php index b06d484c5c5ad..fcbdd5570a522 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Attribute/Backend/Child.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Attribute/Backend/Child.php @@ -7,8 +7,6 @@ /** * Invoice backend model for child attribute - * - * @author Magento Core Team */ class Child extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend { diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Collection.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Collection.php index 8758fc1da92d8..c7f5539be9f06 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Collection.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Collection.php @@ -12,7 +12,6 @@ * Sales order shipment collection * * @api - * @author Magento Core Team * @since 100.0.2 */ class Collection extends AbstractCollection implements ShipmentSearchResultInterface diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Comment.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Comment.php index f8ff8268e4118..3d4bca491a45f 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Comment.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Comment.php @@ -11,8 +11,6 @@ /** * Flat sales order shipment comment resource - * - * @author Magento Core Team */ class Comment extends EntityAbstract implements ShipmentCommentResourceInterface { diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Comment/Collection.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Comment/Collection.php index 91bc59610262c..85e95f4d37412 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Comment/Collection.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Comment/Collection.php @@ -12,7 +12,6 @@ * Flat sales order shipment comments collection * * @api - * @author Magento Core Team * @since 100.0.2 */ class Collection extends AbstractCollection implements ShipmentCommentSearchResultInterface diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Item.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Item.php index e5e4292d897b5..93ccb58883905 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Item.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Item.php @@ -10,8 +10,6 @@ /** * Flat sales order shipment item resource - * - * @author Magento Core Team */ class Item extends SalesResource implements ShipmentItemResourceInterface { diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Item/Collection.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Item/Collection.php index a868a10384672..f4ee6fe5c8c92 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Item/Collection.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Item/Collection.php @@ -7,8 +7,6 @@ /** * Flat sales order shipment items collection - * - * @author Magento Core Team */ class Collection extends \Magento\Sales\Model\ResourceModel\Collection\AbstractCollection { diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Track.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Track.php index 4879df7d5f44a..4963bb57a1d83 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Track.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Track.php @@ -11,8 +11,6 @@ /** * Flat sales order shipment comment resource - * - * @author Magento Core Team */ class Track extends SalesResource implements ShipmentTrackResourceInterface { diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Track/Collection.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Track/Collection.php index d5ca4c6879966..6523ea31e4740 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Track/Collection.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Track/Collection.php @@ -12,7 +12,6 @@ * Flat sales order shipment tracks collection * * @api - * @author Magento Core Team * @since 100.0.2 */ class Collection extends AbstractCollection implements ShipmentTrackSearchResultInterface diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Status.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Status.php index 9e37ee815d448..66a2672cf89e1 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Order/Status.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Status.php @@ -15,8 +15,6 @@ /** * Order status resource model - * - * @author Magento Core Team */ class Status extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb { diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Status/Collection.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Status/Collection.php index 476a8282e73e8..6cf0e2c679833 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Order/Status/Collection.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Status/Collection.php @@ -7,8 +7,6 @@ /** * Flat sales order status history collection - * - * @author Magento Core Team */ class Collection extends \Magento\Sales\Model\ResourceModel\Collection\AbstractCollection { diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Status/History.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Status/History.php index 95fa9e11ce509..cb05b9d3f4b75 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Order/Status/History.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Status/History.php @@ -12,8 +12,6 @@ /** * Flat sales order status history resource - * - * @author Magento Core Team */ class History extends EntityAbstract implements OrderStatusHistoryResourceInterface { diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Status/History/Collection.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Status/History/Collection.php index aff98dd3f47c3..e68348fa8e9d2 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Order/Status/History/Collection.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Status/History/Collection.php @@ -12,8 +12,6 @@ /** * Flat sales order status history collection - * - * @author Magento Core Team */ class Collection extends AbstractCollection implements OrderStatusHistorySearchResultInterface { From 21aa95461eed0e6b4b6a1dc81cea91068c18f0d0 Mon Sep 17 00:00:00 2001 From: engcom-Echo Date: Tue, 9 Jul 2024 07:37:46 +0530 Subject: [PATCH 2/3] Fixed static test failures --- .../Model/ResourceModel/Order/Creditmemo/Collection.php | 6 ------ .../Model/ResourceModel/Order/Creditmemo/Comment.php | 8 ++------ .../ResourceModel/Order/Creditmemo/Comment/Collection.php | 4 ---- .../Sales/Model/ResourceModel/Order/Creditmemo/Item.php | 4 ++-- .../ResourceModel/Order/Creditmemo/Item/Collection.php | 4 ---- .../Model/ResourceModel/Order/Invoice/Collection.php | 6 ------ .../Sales/Model/ResourceModel/Order/Invoice/Comment.php | 8 ++------ .../ResourceModel/Order/Invoice/Comment/Collection.php | 4 ---- .../Sales/Model/ResourceModel/Order/Invoice/Item.php | 2 -- .../Model/ResourceModel/Order/Invoice/Item/Collection.php | 4 ---- .../Sales/Model/ResourceModel/Order/Item/Collection.php | 4 ---- .../Magento/Sales/Model/ResourceModel/Order/Shipment.php | 2 -- .../Model/ResourceModel/Order/Shipment/Collection.php | 4 ---- .../Sales/Model/ResourceModel/Order/Shipment/Comment.php | 8 ++------ .../ResourceModel/Order/Shipment/Comment/Collection.php | 4 ---- .../Sales/Model/ResourceModel/Order/Shipment/Item.php | 2 -- .../ResourceModel/Order/Shipment/Item/Collection.php | 4 ---- .../Sales/Model/ResourceModel/Order/Shipment/Track.php | 8 ++------ .../ResourceModel/Order/Shipment/Track/Collection.php | 6 ------ .../Sales/Model/ResourceModel/Order/Status/History.php | 6 ++---- .../ResourceModel/Order/Status/History/Collection.php | 4 ---- 21 files changed, 12 insertions(+), 90 deletions(-) diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Collection.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Collection.php index 79a75090f1431..13d52b5fbc079 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Collection.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Collection.php @@ -17,22 +17,16 @@ class Collection extends AbstractCollection implements CreditmemoSearchResultInterface { /** - * Id field name - * * @var string */ protected $_idFieldName = 'entity_id'; /** - * Event prefix - * * @var string */ protected $_eventPrefix = 'sales_order_creditmemo_collection'; /** - * Event object - * * @var string */ protected $_eventObject = 'order_creditmemo_collection'; diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Comment.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Comment.php index 1946304585de3..b7bbd12b38268 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Comment.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Comment.php @@ -15,25 +15,21 @@ class Comment extends EntityAbstract implements CreditmemoCommentResourceInterface { /** - * Event prefix - * * @var string */ protected $_eventPrefix = 'sales_order_creditmemo_comment_resource'; /** - * Validator - * * @var \Magento\Sales\Model\Order\Creditmemo\Comment\Validator */ protected $validator; /** * @param \Magento\Framework\Model\ResourceModel\Db\Context $context - * @param \Magento\Sales\Model\ResourceModel\Attribute $attribute - * @param \Magento\SalesSequence\Model\Manager $sequenceManager * @param Snapshot $entitySnapshot * @param \Magento\Framework\Model\ResourceModel\Db\VersionControl\RelationComposite $entityRelationComposite + * @param \Magento\Sales\Model\ResourceModel\Attribute $attribute + * @param \Magento\SalesSequence\Model\Manager $sequenceManager * @param \Magento\Sales\Model\Order\Creditmemo\Comment\Validator $validator * @param string $connectionName */ diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Comment/Collection.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Comment/Collection.php index b2ab78f9e6020..8a1f613a7e01f 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Comment/Collection.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Comment/Collection.php @@ -17,15 +17,11 @@ class Collection extends AbstractCollection implements CreditmemoCommentSearchResultInterface { /** - * Event prefix - * * @var string */ protected $_eventPrefix = 'sales_order_creditmemo_comment_collection'; /** - * Event object - * * @var string */ protected $_eventObject = 'order_creditmemo_comment_collection'; diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Item.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Item.php index 94044fdfcba1c..49ef0993e0670 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Item.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Item.php @@ -14,8 +14,6 @@ class Item extends SalesResource implements CreditmemoItemResourceInterface { /** - * Event prefix - * * @var string */ protected $_eventPrefix = 'sales_order_creditmemo_item_resource'; @@ -31,6 +29,8 @@ protected function _construct() } /** + * Before save + * * @param \Magento\Framework\Model\AbstractModel $object * @return $this */ diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Item/Collection.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Item/Collection.php index edc30d7325ea0..ff257239abf35 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Item/Collection.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Item/Collection.php @@ -11,15 +11,11 @@ class Collection extends \Magento\Sales\Model\ResourceModel\Collection\AbstractCollection { /** - * Event prefix - * * @var string */ protected $_eventPrefix = 'sales_order_creditmemo_item_collection'; /** - * Event object - * * @var string */ protected $_eventObject = 'order_creditmemo_item_collection'; diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Collection.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Collection.php index 89b930b4e6140..1fb801cb502f5 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Collection.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Collection.php @@ -17,22 +17,16 @@ class Collection extends AbstractCollection implements InvoiceSearchResultInterface { /** - * Id field name - * * @var string */ protected $_idFieldName = 'entity_id'; /** - * Event prefix - * * @var string */ protected $_eventPrefix = 'sales_order_invoice_collection'; /** - * Event object - * * @var string */ protected $_eventObject = 'order_invoice_collection'; diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Comment.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Comment.php index fa699e60c3a25..0d0f9af4e330e 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Comment.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Comment.php @@ -15,25 +15,21 @@ class Comment extends EntityAbstract implements InvoiceCommentResourceInterface { /** - * Event prefix - * * @var string */ protected $_eventPrefix = 'sales_order_invoice_comment_resource'; /** - * Validator - * * @var \Magento\Sales\Model\Order\Invoice\Comment\Validator */ protected $validator; /** * @param \Magento\Framework\Model\ResourceModel\Db\Context $context - * @param \Magento\Sales\Model\ResourceModel\Attribute $attribute - * @param \Magento\SalesSequence\Model\Manager $sequenceManager * @param Snapshot $entitySnapshot * @param \Magento\Framework\Model\ResourceModel\Db\VersionControl\RelationComposite $entityRelationComposite + * @param \Magento\Sales\Model\ResourceModel\Attribute $attribute + * @param \Magento\SalesSequence\Model\Manager $sequenceManager * @param \Magento\Sales\Model\Order\Invoice\Comment\Validator $validator * @param string $connectionName */ diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Comment/Collection.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Comment/Collection.php index 0184690f94746..528cde8a5be5e 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Comment/Collection.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Comment/Collection.php @@ -17,15 +17,11 @@ class Collection extends AbstractCollection implements InvoiceCommentSearchResultInterface { /** - * Event prefix - * * @var string */ protected $_eventPrefix = 'sales_order_invoice_comment_collection'; /** - * Event object - * * @var string */ protected $_eventObject = 'order_invoice_comment_collection'; diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Item.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Item.php index cbd600be9943f..ae12ef5b1b81a 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Item.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Item.php @@ -14,8 +14,6 @@ class Item extends SalesResource implements InvoiceItemResourceInterface { /** - * Event prefix - * * @var string */ protected $_eventPrefix = 'sales_order_invoice_item_resource'; diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Item/Collection.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Item/Collection.php index 0bc11be34bbf3..4421eb6d47789 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Item/Collection.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Item/Collection.php @@ -14,15 +14,11 @@ class Collection extends \Magento\Sales\Model\ResourceModel\Collection\AbstractCollection { /** - * Event prefix - * * @var string */ protected $_eventPrefix = 'sales_order_invoice_item_collection'; /** - * Event object - * * @var string */ protected $_eventObject = 'order_invoice_item_collection'; diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Item/Collection.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Item/Collection.php index 3f7edefca55d8..adc1a3aa9b205 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Order/Item/Collection.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Item/Collection.php @@ -16,15 +16,11 @@ class Collection extends AbstractCollection implements \Magento\Sales\Api\Data\OrderItemSearchResultInterface { /** - * Event prefix - * * @var string */ protected $_eventPrefix = 'sales_order_item_collection'; /** - * Event object - * * @var string */ protected $_eventObject = 'order_item_collection'; diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment.php index 40a0a8d684ee4..58ccf06d92def 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment.php @@ -17,8 +17,6 @@ class Shipment extends SalesResource implements ShipmentResourceInterface { /** - * Event prefix - * * @var string */ protected $_eventPrefix = 'sales_order_shipment_resource'; diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Collection.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Collection.php index c7f5539be9f06..95384fdab3fe9 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Collection.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Collection.php @@ -22,15 +22,11 @@ class Collection extends AbstractCollection implements ShipmentSearchResultInter protected $_idFieldName = 'entity_id'; /** - * Event prefix - * * @var string */ protected $_eventPrefix = 'sales_order_shipment_collection'; /** - * Event object - * * @var string */ protected $_eventObject = 'order_shipment_collection'; diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Comment.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Comment.php index 3d4bca491a45f..5441398298b41 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Comment.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Comment.php @@ -15,25 +15,21 @@ class Comment extends EntityAbstract implements ShipmentCommentResourceInterface { /** - * Event prefix - * * @var string */ protected $_eventPrefix = 'sales_order_shipment_comment_resource'; /** - * Validator - * * @var \Magento\Sales\Model\Order\Shipment\Comment\Validator */ protected $validator; /** * @param \Magento\Framework\Model\ResourceModel\Db\Context $context - * @param \Magento\Sales\Model\ResourceModel\Attribute $attribute - * @param \Magento\SalesSequence\Model\Manager $sequenceManager * @param Snapshot $entitySnapshot * @param \Magento\Framework\Model\ResourceModel\Db\VersionControl\RelationComposite $entityRelationComposite + * @param \Magento\Sales\Model\ResourceModel\Attribute $attribute + * @param \Magento\SalesSequence\Model\Manager $sequenceManager * @param \Magento\Sales\Model\Order\Shipment\Comment\Validator $validator * @param string $connectionName */ diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Comment/Collection.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Comment/Collection.php index 85e95f4d37412..05dbc195f0608 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Comment/Collection.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Comment/Collection.php @@ -17,15 +17,11 @@ class Collection extends AbstractCollection implements ShipmentCommentSearchResultInterface { /** - * Event prefix - * * @var string */ protected $_eventPrefix = 'sales_order_shipment_comment_collection'; /** - * Event object - * * @var string */ protected $_eventObject = 'order_shipment_comment_collection'; diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Item.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Item.php index 93ccb58883905..f4ba82639fd51 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Item.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Item.php @@ -14,8 +14,6 @@ class Item extends SalesResource implements ShipmentItemResourceInterface { /** - * Event prefix - * * @var string */ protected $_eventPrefix = 'sales_order_shipment_item_resource'; diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Item/Collection.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Item/Collection.php index f4ee6fe5c8c92..d3eebcc20d5d7 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Item/Collection.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Item/Collection.php @@ -11,15 +11,11 @@ class Collection extends \Magento\Sales\Model\ResourceModel\Collection\AbstractCollection { /** - * Event prefix - * * @var string */ protected $_eventPrefix = 'sales_order_shipment_item_collection'; /** - * Event object - * * @var string */ protected $_eventObject = 'order_shipment_item_collection'; diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Track.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Track.php index 4963bb57a1d83..dc787ccad51d5 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Track.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Track.php @@ -15,25 +15,21 @@ class Track extends SalesResource implements ShipmentTrackResourceInterface { /** - * Event prefix - * * @var string */ protected $_eventPrefix = 'sales_order_shipment_track_resource'; /** - * Validator - * * @var \Magento\Sales\Model\Order\Shipment\Track\Validator */ protected $validator; /** * @param \Magento\Framework\Model\ResourceModel\Db\Context $context - * @param \Magento\Sales\Model\ResourceModel\Attribute $attribute - * @param \Magento\SalesSequence\Model\Manager $sequenceManager * @param Snapshot $entitySnapshot * @param \Magento\Framework\Model\ResourceModel\Db\VersionControl\RelationComposite $entityRelationComposite + * @param \Magento\Sales\Model\ResourceModel\Attribute $attribute + * @param \Magento\SalesSequence\Model\Manager $sequenceManager * @param \Magento\Sales\Model\Order\Shipment\Track\Validator $validator * @param string $connectionName */ diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Track/Collection.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Track/Collection.php index 6523ea31e4740..72ad33a8db2ca 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Track/Collection.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Track/Collection.php @@ -17,22 +17,16 @@ class Collection extends AbstractCollection implements ShipmentTrackSearchResultInterface { /** - * Event prefix - * * @var string */ protected $_eventPrefix = 'sales_order_shipment_track_collection'; /** - * Event object - * * @var string */ protected $_eventObject = 'order_shipment_track_collection'; /** - * Order field - * * @var string */ protected $_orderField = 'order_id'; diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Status/History.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Status/History.php index cb05b9d3f4b75..0860e8e7722c9 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Order/Status/History.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Status/History.php @@ -22,10 +22,10 @@ class History extends EntityAbstract implements OrderStatusHistoryResourceInterf /** * @param \Magento\Framework\Model\ResourceModel\Db\Context $context - * @param \Magento\Sales\Model\ResourceModel\Attribute $attribute - * @param \Magento\SalesSequence\Model\Manager $sequenceManager * @param Snapshot $entitySnapshot * @param \Magento\Framework\Model\ResourceModel\Db\VersionControl\RelationComposite $entityRelationComposite + * @param \Magento\Sales\Model\ResourceModel\Attribute $attribute + * @param \Magento\SalesSequence\Model\Manager $sequenceManager * @param Validator $validator * @param string $connectionName */ @@ -50,8 +50,6 @@ public function __construct( } /** - * Event prefix - * * @var string */ protected $_eventPrefix = 'sales_order_status_history_resource'; diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Status/History/Collection.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Status/History/Collection.php index e68348fa8e9d2..f5fc4b6360d61 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Order/Status/History/Collection.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Status/History/Collection.php @@ -16,15 +16,11 @@ class Collection extends AbstractCollection implements OrderStatusHistorySearchResultInterface { /** - * Event prefix - * * @var string */ protected $_eventPrefix = 'sales_order_status_history_collection'; /** - * Event object - * * @var string */ protected $_eventObject = 'order_status_history_collection'; From ae2332ca3fe7950b73696b9f0424d28c89b3bf44 Mon Sep 17 00:00:00 2001 From: glo24157 Date: Fri, 16 May 2025 12:27:44 +0530 Subject: [PATCH 3/3] Fix copyright static test failure --- .../Sales/Model/ResourceModel/Order/Creditmemo/Collection.php | 4 ++-- .../ResourceModel/Order/Creditmemo/Comment/Collection.php | 4 ++-- .../Sales/Model/ResourceModel/Order/Creditmemo/Item.php | 4 ++-- .../Model/ResourceModel/Order/Creditmemo/Item/Collection.php | 4 ++-- .../ResourceModel/Order/Invoice/Attribute/Backend/Child.php | 4 ++-- .../ResourceModel/Order/Invoice/Attribute/Backend/Item.php | 4 ++-- .../ResourceModel/Order/Invoice/Attribute/Backend/Order.php | 4 ++-- .../Sales/Model/ResourceModel/Order/Invoice/Collection.php | 4 ++-- .../Model/ResourceModel/Order/Invoice/Comment/Collection.php | 4 ++-- .../Magento/Sales/Model/ResourceModel/Order/Invoice/Item.php | 4 ++-- .../Model/ResourceModel/Order/Invoice/Item/Collection.php | 4 ++-- .../Sales/Model/ResourceModel/Order/Item/Collection.php | 4 ++-- .../ResourceModel/Order/Payment/Transaction/Collection.php | 4 ++-- .../Sales/Model/ResourceModel/Order/Rss/OrderStatus.php | 4 ++-- app/code/Magento/Sales/Model/ResourceModel/Order/Shipment.php | 4 ++-- .../ResourceModel/Order/Shipment/Attribute/Backend/Child.php | 4 ++-- .../Sales/Model/ResourceModel/Order/Shipment/Collection.php | 4 ++-- .../Model/ResourceModel/Order/Shipment/Comment/Collection.php | 4 ++-- .../Magento/Sales/Model/ResourceModel/Order/Shipment/Item.php | 4 ++-- .../Model/ResourceModel/Order/Shipment/Item/Collection.php | 4 ++-- .../Sales/Model/ResourceModel/Order/Shipment/Track.php | 4 ++-- .../Model/ResourceModel/Order/Shipment/Track/Collection.php | 4 ++-- app/code/Magento/Sales/Model/ResourceModel/Order/Status.php | 4 ++-- .../Sales/Model/ResourceModel/Order/Status/Collection.php | 4 ++-- .../Sales/Model/ResourceModel/Order/Status/History.php | 4 ++-- .../Model/ResourceModel/Order/Status/History/Collection.php | 4 ++-- 26 files changed, 52 insertions(+), 52 deletions(-) diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Collection.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Collection.php index 13d52b5fbc079..c1e030e37f3bd 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Collection.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Collection.php @@ -1,7 +1,7 @@