Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix static analysis issues #133

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/Model/GetInventoryRequestFromOrder.php
Original file line number Diff line number Diff line change
Expand Up @@ -108,10 +108,10 @@ private function getAddressFromOrder(OrderInterface $order): ?AddressInterface

return $this->addressInterfaceFactory->create([
'country' => $shippingAddress->getCountryId(),
'postcode' => $shippingAddress->getPostcode() ?? '',
'postcode' => $shippingAddress->getPostcode() ? $shippingAddress->getPostcode() : '',
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Screenshot 2023-12-08 at 16 04 19
https://www.php.net/manual/en/migration70.new-features.php

Not sure whats complaining here, this seems like an old way of doing it? or am i completely misinterpreting this.

'street' => implode("\n", $shippingAddress->getStreet()),
'region' => $region ?? $shippingAddress->getRegionCode() ?? '',
'city' => $shippingAddress->getCity() ?? ''
'region' => $region ? $region : $shippingAddress->getRegionCode() ? $shippingAddress->getRegionCode() : '',
'city' => $shippingAddress->getCity() ? $shippingAddress->getCity() : ''
]);
}
}
9 changes: 0 additions & 9 deletions src/Plugin/Model/OrderRepositoryPlugin.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
use Magento\Sales\Api\Data\OrderInterface;
use Magento\Sales\Api\Data\OrderSearchResultInterface;
use Magento\Sales\Api\Data\OrderExtensionFactory;
use Magento\InventorySourceSelectionApi\Api\Data\SourceSelectionResultInterfaceFactory;
use Ampersand\DisableStockReservation\Model\Sources as SourceModel;
use Ampersand\DisableStockReservation\Service\SourcesConverter;
use Magento\Framework\Exception\NoSuchEntityException;
Expand All @@ -30,11 +29,6 @@ class OrderRepositoryPlugin
*/
private $orderExtensionFactory;

/**
* @var SourceSelectionResultInterfaceFactory
*/
private $sourceSelectionResultInterfaceFactory;

/**
* @var SourcesConverter
*/
Expand All @@ -49,20 +43,17 @@ class OrderRepositoryPlugin
* OrderRepositoryPlugin constructor.
* @param SourcesRepositoryInterface $sourcesRepository
* @param OrderExtensionFactory $orderExtensionFactory
* @param SourceSelectionResultInterfaceFactory $sourceSelectionResultInterfaceFactory
* @param SourcesConverter $sourcesConverter
* @param CollectionFactory $collectionFactory
*/
public function __construct(
SourcesRepositoryInterface $sourcesRepository,
OrderExtensionFactory $orderExtensionFactory,
SourceSelectionResultInterfaceFactory $sourceSelectionResultInterfaceFactory,
SourcesConverter $sourcesConverter,
CollectionFactory $collectionFactory
) {
$this->sourcesRepository = $sourcesRepository;
$this->orderExtensionFactory = $orderExtensionFactory;
$this->sourceSelectionResultInterfaceFactory = $sourceSelectionResultInterfaceFactory;
$this->sourcesConverter = $sourcesConverter;
$this->collectionFactory = $collectionFactory;
}
Expand Down
9 changes: 0 additions & 9 deletions src/Plugin/SourceDeductionProcessor.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
use Magento\Sales\Model\Order;
use Magento\Sales\Model\Service\OrderService;
use Ampersand\DisableStockReservation\Api\SourcesRepositoryInterface;
use Magento\Sales\Api\Data\OrderExtensionFactory;
use Ampersand\DisableStockReservation\Service\SourcesConverter;
use Ampersand\DisableStockReservation\Api\Data\SourcesInterfaceFactory;

Expand Down Expand Up @@ -59,11 +58,6 @@ class SourceDeductionProcessor
*/
private $sourceRepository;

/**
* @var OrderExtensionFactory
*/
private $orderExtensionFactory;

/**
* @var SourcesConverter
*/
Expand All @@ -82,7 +76,6 @@ class SourceDeductionProcessor
* @param ItemToSellInterfaceFactory $itemToSellFactory
* @param PlaceReservationsForSalesEventInterface $placeReservationsForSalesEvent
* @param SourcesRepositoryInterface $sourceRepository
* @param OrderExtensionFactory $orderExtensionFactory
* @param SourcesConverter $sourcesConverter
* @param SourcesInterfaceFactory $sourcesFactory
*/
Expand All @@ -94,7 +87,6 @@ public function __construct(
ItemToSellInterfaceFactory $itemToSellFactory,
PlaceReservationsForSalesEventInterface $placeReservationsForSalesEvent,
SourcesRepositoryInterface $sourceRepository,
OrderExtensionFactory $orderExtensionFactory,
SourcesConverter $sourcesConverter,
SourcesInterfaceFactory $sourcesFactory
) {
Expand All @@ -105,7 +97,6 @@ public function __construct(
$this->itemToSellFactory = $itemToSellFactory;
$this->placeReservationsForSalesEvent = $placeReservationsForSalesEvent;
$this->sourceRepository = $sourceRepository;
$this->orderExtensionFactory = $orderExtensionFactory;
$this->sourcesConverter = $sourcesConverter;
$this->sourcesFactory = $sourcesFactory;
}
Expand Down