Merge pull request #25 from AmpersandHQ/fix-static-analysis

Fix static analysis
AmpersandHQ · Jun 9, 2020 · a3e654b · a3e654b
2 parents 3442189 + 801be69
commit a3e654b
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 9 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -17,7 +17,7 @@ install:
   - cd vendor/ampersand/travis-vanilla-magento/instances/disablestockres
   - export COMPOSER_MEMORY_LIMIT=-1
   - composer config repo.disablestockres git "../../../../../"
-  - composer require ampersand/magento2-disable-stock-reservation dev-$TRAVIS_BRANCH || composer require ampersand/magento2-disable-stock-reservation $TRAVIS_BRANCH
+  - composer require -vvv ampersand/magento2-disable-stock-reservation dev-$TRAVIS_BRANCH || composer require -vvv ampersand/magento2-disable-stock-reservation $TRAVIS_BRANCH
   - php bin/magento setup:upgrade
 # compile magento
   - php bin/magento setup:di:compile

diff --git a/dev/tests/_support/AcceptanceTester.php b/dev/tests/_support/AcceptanceTester.php
@@ -1,6 +1,5 @@
 <?php
 
-
 /**
  * Inherited Methods
  * @method void wantToTest($text)
@@ -15,7 +14,7 @@
  * @method void pause()
  *
  * @SuppressWarnings(PHPMD)
-*/
+ */
 class AcceptanceTester extends \Codeception\Actor
 {
     use _generated\AcceptanceTesterActions;

diff --git a/dev/tests/acceptance/CheckoutCest.php b/dev/tests/acceptance/CheckoutCest.php
@@ -142,7 +142,7 @@ public function stockDeductionPreventsSubsequentAddToBasket(Step\Acceptance\Mage
 
         // Add 30 of unit, 10 over the limit, this should error with "Requested qty is not available"
         $newCartId = $I->getGuestQuote();
-        $I->expectThrowable(Exception\RequestedQtyNotAvailable::class, function() use ($newCartId, $I) {
+        $I->expectThrowable(Exception\RequestedQtyNotAvailable::class, function () use ($newCartId, $I) {
             $I->addSimpleProductToQuote($newCartId, 'amp_verify_stock_deduction_prevents_add_to_basket', 30);
         });
 

diff --git a/src/Model/GetInventoryRequestFromOrder.php b/src/Model/GetInventoryRequestFromOrder.php
@@ -107,7 +107,7 @@ public function execute(OrderInterface $order, array $requestItems): InventoryRe
      */
     private function getAddressFromOrder(OrderInterface $order): ?AddressInterface
     {
-        /** @var Address $shippingAddress */
+        /** @var Address|null $shippingAddress */
         $shippingAddress = $order->getShippingAddress();
         if ($shippingAddress === null) {
             return null;

diff --git a/src/Model/GetItemsToDeductFromOrder.php b/src/Model/GetItemsToDeductFromOrder.php
@@ -52,7 +52,7 @@ public function execute(Order $order): array
     {
         $itemsToOrder = [];
 
-        /** @var \Magento\Sales\Model\Order\Item $orderItem */
+        /** @var \Magento\Sales\Model\Order\Item|null $orderItem */
         foreach ($order->getAllVisibleItems() as $orderItem) {
             if ($orderItem->getParentItem() !== null) {
                 continue;

diff --git a/src/Model/GetSourceSelectionResultFromOrder.php b/src/Model/GetSourceSelectionResultFromOrder.php
@@ -82,12 +82,13 @@ public function execute(OrderInterface $order): SourceSelectionResultInterface
     /**
      * Get selection request items
      *
-     * @param OrderItemInterface[]|Traversable $orderItems
+     * @param OrderItemInterface[] $orderItems
      * @return array
      */
-    private function getSelectionRequestItems(iterable $orderItems): array
+    private function getSelectionRequestItems($orderItems): array
     {
         $selectionRequestItems = [];
+        /** @var \Magento\Sales\Model\Order\Item $orderItem */
         foreach ($orderItems as $orderItem) {
             if ($orderItem->isDummy()) {
                 continue;

diff --git a/src/Plugin/SourceDeductionProcessor.php b/src/Plugin/SourceDeductionProcessor.php
@@ -78,7 +78,7 @@ public function __construct(
      * @param OrderService $subject
      * @param OrderInterface $result
      *
-     * @return OrderInterface
+     * @return OrderInterface|void
      * @throws CouldNotSaveException
      * @throws InputException
      * @throws LocalizedException