Skip to content

Commit 1ca6c6d

Browse files
committed
Code review changes
1 parent 4213997 commit 1ca6c6d

File tree

3 files changed

+16
-31
lines changed

3 files changed

+16
-31
lines changed

app/code/Magento/CatalogInventory/Block/Plugin/ProductView.php

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
namespace Magento\CatalogInventory\Block\Plugin;
77

88
use Magento\CatalogInventory\Model\Product\QuantityValidator;
9+
use Magento\Framework\App\ObjectManager;
910

1011
class ProductView
1112
{
@@ -15,12 +16,14 @@ class ProductView
1516
private $productQuantityValidator;
1617

1718
/**
18-
* @param QuantityValidator $productQuantityValidator
19+
* @param QuantityValidator|null $productQuantityValidator
1920
*/
2021
public function __construct(
21-
QuantityValidator $productQuantityValidator
22+
QuantityValidator $productQuantityValidator = null
2223
) {
23-
$this->productQuantityValidator = $productQuantityValidator;
24+
$this->productQuantityValidator = $productQuantityValidator ?: ObjectManager::getInstance()->get(
25+
QuantityValidator::class
26+
);
2427
}
2528

2629
/**

app/code/Magento/CatalogInventory/Model/Product/QuantityValidator.php

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,40 +11,34 @@
1111

1212
class QuantityValidator
1313
{
14-
/**
15-
* @var StockRegistryInterface
16-
*/
17-
private $stockRegistry;
18-
1914
/**
2015
* @param StockRegistryInterface $stockRegistry
2116
*/
2217
public function __construct(
23-
StockRegistryInterface $stockRegistry
18+
private readonly StockRegistryInterface $stockRegistry
2419
) {
25-
$this->stockRegistry = $stockRegistry;
2620
}
2721

2822
/**
2923
* To get quantity validators
3024
*
3125
* @param int $productId
32-
* @param int $websiteId
26+
* @param int|null $websiteId
3327
*
3428
* @return array
3529
*/
36-
public function getData($productId, $websiteId): array
30+
public function getData(int $productId, int|null $websiteId): array
3731
{
3832
$stockItem = $this->stockRegistry->getStockItem($productId, $websiteId);
3933

4034
$params = [];
4135
$validators = [];
42-
$params['minAllowed'] = (float)$stockItem->getMinSaleQty();
36+
$params['minAllowed'] = $stockItem->getMinSaleQty();
4337
if ($stockItem->getMaxSaleQty()) {
44-
$params['maxAllowed'] = (float)$stockItem->getMaxSaleQty();
38+
$params['maxAllowed'] = $stockItem->getMaxSaleQty();
4539
}
4640
if ($stockItem->getQtyIncrements() > 0) {
47-
$params['qtyIncrements'] = (float)$stockItem->getQtyIncrements();
41+
$params['qtyIncrements'] = (float) $stockItem->getQtyIncrements();
4842
}
4943
$validators['validate-item-quantity'] = $params;
5044

app/code/Magento/GroupedProduct/ViewModel/ValidateQuantity.php

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -16,37 +16,25 @@
1616
*/
1717
class ValidateQuantity implements ArgumentInterface
1818
{
19-
/**
20-
* @var Json
21-
*/
22-
private $serializer;
23-
24-
/**
25-
* @var QuantityValidator
26-
*/
27-
private $productQuantityValidator;
28-
2919
/**
3020
* @param Json $serializer
3121
* @param QuantityValidator $productQuantityValidator
3222
*/
3323
public function __construct(
34-
Json $serializer,
35-
QuantityValidator $productQuantityValidator,
24+
private readonly Json $serializer,
25+
private readonly QuantityValidator $productQuantityValidator,
3626
) {
37-
$this->serializer = $serializer;
38-
$this->productQuantityValidator = $productQuantityValidator;
3927
}
4028

4129
/**
4230
* To get the quantity validators
4331
*
4432
* @param int $productId
45-
* @param int $websiteId
33+
* @param int|null $websiteId
4634
*
4735
* @return string
4836
*/
49-
public function getQuantityValidators($productId, $websiteId): string
37+
public function getQuantityValidators(int $productId, int|null $websiteId): string
5038
{
5139
return $this->serializer->serialize(
5240
array_merge(

0 commit comments

Comments
 (0)