Use constructor property promotion in module Sales Inventory #37230
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -6,6 +6,7 @@ | |||||
| namespace Magento\SalesInventory\Model\Order; | ||||||
|
|
||||||
| use Magento\Framework\Exception\NoSuchEntityException; | ||||||
| use Magento\Framework\Phrase; | ||||||
| use Magento\Sales\Api\Data\CreditmemoInterface; | ||||||
| use Magento\Sales\Api\Data\CreditmemoItemInterface; | ||||||
| use Magento\Sales\Api\Data\OrderItemInterface; | ||||||
|
|
@@ -16,24 +17,19 @@ | |||||
| */ | ||||||
| class ReturnValidator | ||||||
| { | ||||||
| /** | ||||||
| * ReturnValidator constructor. | ||||||
| * @param OrderItemRepositoryInterface $orderItemRepository | ||||||
| */ | ||||||
| public function __construct( | ||||||
| private readonly OrderItemRepositoryInterface $orderItemRepository | ||||||
|
There was a problem hiding this comment. A trailing comma makes future additions easier to review.
Suggested change
|
||||||
| ) { | ||||||
| } | ||||||
|
|
||||||
| /** | ||||||
| * @param int[] $returnToStockItems | ||||||
| * @param CreditmemoInterface $creditmemo | ||||||
| * @return Phrase|null | ||||||
| */ | ||||||
| public function validate($returnToStockItems, CreditmemoInterface $creditmemo) | ||||||
| { | ||||||
|
|
||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -5,6 +5,7 @@ | |||||
| */ | ||||||
| namespace Magento\SalesInventory\Model\Plugin\Order\Validation; | ||||||
|
|
||||||
| use Magento\Sales\Api\Data\CreditmemoCommentCreationInterface; | ||||||
| use Magento\Sales\Api\Data\InvoiceInterface; | ||||||
| use Magento\Sales\Model\Order\Validation\RefundInvoiceInterface; | ||||||
| use Magento\Sales\Api\Data\CreditmemoCreationArgumentsInterface; | ||||||
|
|
@@ -18,19 +19,13 @@ | |||||
| */ | ||||||
| class InvoiceRefundCreationArguments | ||||||
| { | ||||||
| /** | ||||||
| * InvoiceRefundCreationArguments constructor. | ||||||
| * @param ReturnValidator $returnValidator | ||||||
| */ | ||||||
| public function __construct( | ||||||
| private readonly ReturnValidator $returnValidator | ||||||
|
There was a problem hiding this comment. A trailing comma makes future additions easier to review.
Suggested change
|
||||||
| ) { | ||||||
| } | ||||||
|
|
||||||
| /** | ||||||
|
|
@@ -43,8 +38,8 @@ public function __construct( | |||||
| * @param bool $isOnline | ||||||
| * @param bool $notify | ||||||
| * @param bool $appendComment | ||||||
| * @param CreditmemoCommentCreationInterface|null $comment | ||||||
| * @param CreditmemoCreationArgumentsInterface|null $arguments | ||||||
| * @return ValidatorResultInterface | ||||||
| * @SuppressWarnings(PHPMD.UnusedFormalParameter) | ||||||
| * @SuppressWarnings(PHPMD.ExcessiveParameterList) | ||||||
|
|
@@ -59,8 +54,8 @@ public function afterValidate( | |||||
| $isOnline = false, | ||||||
| $notify = false, | ||||||
| $appendComment = false, | ||||||
| CreditmemoCommentCreationInterface $comment = null, | ||||||
| CreditmemoCreationArgumentsInterface $arguments = null | ||||||
| ) { | ||||||
| if ($this->isReturnToStockItems($arguments)) { | ||||||
| return $validationResults; | ||||||
|
|
||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -18,19 +18,13 @@ | |||||
| */ | ||||||
| class OrderRefundCreationArguments | ||||||
| { | ||||||
| /** | ||||||
| * OrderRefundCreationArguments constructor. | ||||||
| * @param ReturnValidator $returnValidator | ||||||
| */ | ||||||
| public function __construct( | ||||||
| private readonly ReturnValidator $returnValidator | ||||||
|
There was a problem hiding this comment. A trailing comma makes future additions easier to review.
Suggested change
|
||||||
| ) { | ||||||
| } | ||||||
|
|
||||||
| /** | ||||||
|
|
||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -6,10 +6,14 @@ | |||||
|
|
||||||
| namespace Magento\SalesInventory\Observer; | ||||||
|
|
||||||
| use Magento\Catalog\Model\Indexer\Product\Price\Processor as PriceProcessor; | ||||||
| use Magento\CatalogInventory\Api\StockConfigurationInterface; | ||||||
| use Magento\CatalogInventory\Api\StockManagementInterface; | ||||||
| use Magento\CatalogInventory\Model\Indexer\Stock\Processor as StockProcessor; | ||||||
| use Magento\Framework\Event\Observer as EventObserver; | ||||||
| use Magento\Framework\Event\ObserverInterface; | ||||||
| use Magento\Sales\Api\OrderRepositoryInterface; | ||||||
| use Magento\Sales\Model\Order\Creditmemo as OrderCreditmemo; | ||||||
| use Magento\SalesInventory\Model\Order\ReturnProcessor; | ||||||
|
|
||||||
| /** | ||||||
|
|
@@ -18,59 +22,23 @@ | |||||
| */ | ||||||
| class RefundOrderInventoryObserver implements ObserverInterface | ||||||
| { | ||||||
| /** | ||||||
| * RefundOrderInventoryObserver constructor. | ||||||
| * @param StockConfigurationInterface $stockConfiguration | ||||||
| * @param StockManagementInterface $stockManagement | ||||||
| * @param StockProcessor $stockIndexerProcessor | ||||||
| * @param PriceProcessor $priceIndexer | ||||||
| * @param ReturnProcessor $returnProcessor | ||||||
| * @param OrderRepositoryInterface $orderRepository | ||||||
| */ | ||||||
| public function __construct( | ||||||
| private readonly StockConfigurationInterface $stockConfiguration, | ||||||
| private readonly StockManagementInterface $stockManagement, | ||||||
| private readonly StockProcessor $stockIndexerProcessor, | ||||||
| private readonly PriceProcessor $priceIndexer, | ||||||
| private readonly ReturnProcessor $returnProcessor, | ||||||
| private readonly OrderRepositoryInterface $orderRepository | ||||||
|
There was a problem hiding this comment. A trailing comma makes future additions easier to review.
Suggested change
|
||||||
| ) { | ||||||
| } | ||||||
|
|
||||||
| /** | ||||||
|
|
@@ -81,7 +49,7 @@ public function __construct( | |||||
| */ | ||||||
| public function execute(EventObserver $observer) | ||||||
| { | ||||||
| /* @var OrderCreditmemo $creditmemo */ | ||||||
| $creditmemo = $observer->getEvent()->getCreditmemo(); | ||||||
| $order = $this->orderRepository->get($creditmemo->getOrderId()); | ||||||
| $returnToStockItems = []; | ||||||
|
|
||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,4 +6,8 @@ | |
|
|
||
| use Magento\Framework\Component\ComponentRegistrar; | ||
|
|
||
| ComponentRegistrar::register( | ||
| ComponentRegistrar::MODULE, | ||
| 'Magento_SalesInventory', | ||
| __DIR__ | ||
| ); | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why has this not been promoted?