PHPStan fixes

PrestaShopCorp · Feb 13, 2024 · 9deda5b · 9deda5b
1 parent 06e19c1
commit 9deda5b
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 25 deletions.
diff --git a/src/Handler/CreatePaypalOrderHandler.php b/src/Handler/CreatePaypalOrderHandler.php
@@ -25,12 +25,7 @@
 use Module;
 use PrestaShop\Module\PrestashopCheckout\Api\Payment\Order;
 use PrestaShop\Module\PrestashopCheckout\Builder\Payload\OrderPayloadBuilder;
-use PrestaShop\Module\PrestashopCheckout\Context\PrestaShopContext;
-use PrestaShop\Module\PrestashopCheckout\DTO\Orders\CreatePayPalOrderRequest;
-use PrestaShop\Module\PrestashopCheckout\DTO\Orders\CreatePayPalOrderResponse;
 use PrestaShop\Module\PrestashopCheckout\Exception\PsCheckoutException;
-use PrestaShop\Module\PrestashopCheckout\PayPal\Order\Exception\PayPalOrderException;
-use PrestaShop\Module\PrestashopCheckout\PayPal\Order\PayPalOrderHttpClientInterface;
 use PrestaShop\Module\PrestashopCheckout\Presenter\Cart\CartPresenter;
 use PrestaShop\Module\PrestashopCheckout\ShopContext;
 use Ps_checkout;
@@ -40,11 +35,11 @@ class CreatePaypalOrderHandler
     /**
      * Prestashop context object
      *
-     * @var PrestaShopContext
+     * @var Context
      */
     private $context;
 
-    public function __construct(\Context $context)
+    public function __construct(Context $context)
     {
         $this->context = $context;
     }

diff --git a/src/PayPal/Order/CommandHandler/CreatePayPalOrderCommandHandler.php b/src/PayPal/Order/CommandHandler/CreatePayPalOrderCommandHandler.php
@@ -22,14 +22,11 @@
 
 use PrestaShop\Module\PrestashopCheckout\Cart\CartRepositoryInterface;
 use PrestaShop\Module\PrestashopCheckout\Cart\Exception\CartNotFoundException;
-use PrestaShop\Module\PrestashopCheckout\Context\PrestaShopContext;
 use PrestaShop\Module\PrestashopCheckout\Event\EventDispatcherInterface;
-use PrestaShop\Module\PrestashopCheckout\Handler\CreatePaypalOrderHandler;
 use PrestaShop\Module\PrestashopCheckout\PayPal\Order\Command\CreatePayPalOrderCommand;
 use PrestaShop\Module\PrestashopCheckout\PayPal\Order\CreatePayPalOrderPayloadBuilderInterface;
 use PrestaShop\Module\PrestashopCheckout\PayPal\Order\Event\PayPalOrderCreatedEvent;
 use PrestaShop\Module\PrestashopCheckout\PayPal\Order\Exception\PayPalOrderException;
-use PrestaShop\Module\PrestashopCheckout\PayPal\Order\PayPalOrderHttpClientInterface;
 
 class CreatePayPalOrderCommandHandler
 {

diff --git a/src/PayPal/Order/CreatePayPalOrderPayloadBuilderInterface.php b/src/PayPal/Order/CreatePayPalOrderPayloadBuilderInterface.php
@@ -21,7 +21,8 @@
 namespace PrestaShop\Module\PrestashopCheckout\PayPal\Order;
 
 use PrestaShop\Module\PrestashopCheckout\Cart\CartInterface;
-use PrestaShop\Module\PrestashopCheckout\DTO\Orders\CreatePayPalOrderRequest;
+use PrestaShop\Module\PrestashopCheckout\PayPal\Order\DTO\CreatePayPalOrderRequest;
+
 
 interface CreatePayPalOrderPayloadBuilderInterface
 {

diff --git a/src/PayPal/Order/PayPalOrderHttpClientInterface.php b/src/PayPal/Order/PayPalOrderHttpClientInterface.php
@@ -20,10 +20,8 @@
 
 namespace PrestaShop\Module\PrestashopCheckout\PayPal\Order;
 
-use PrestaShop\Module\PrestashopCheckout\DTO\Orders\CreatePayPalOrderRequest;
-use PrestaShop\Module\PrestashopCheckout\DTO\Orders\CreatePayPalOrderResponse;
-use PrestaShop\Module\PrestashopCheckout\DTO\Orders\PatchPayPalOrderRequest;
-use PrestaShop\Module\PrestashopCheckout\DTO\Orders\PatchPayPalOrderResponse;
+use PrestaShop\Module\PrestashopCheckout\PayPal\Order\DTO\CreatePayPalOrderRequest;
+use PrestaShop\Module\PrestashopCheckout\PayPal\Order\DTO\CreatePayPalOrderResponse;
 use PrestaShop\Module\PrestashopCheckout\PayPal\Order\Exception\PayPalOrderException;
 
 interface PayPalOrderHttpClientInterface
@@ -36,13 +34,4 @@ interface PayPalOrderHttpClientInterface
      * @throws PayPalOrderException
      */
     public function createOrder(CreatePayPalOrderRequest $payload);
-
-    /**
-     * @param PatchPayPalOrderRequest $payload
-     *
-     * @return PatchPayPalOrderResponse
-     *
-     * @throws PayPalOrderException
-     */
-    public function patchOrder(PatchPayPalOrderRequest $payload);
 }
diff --git a/src/PayPal/Order/QueryHandler/GetPayPalOrderQueryHandler.php b/src/PayPal/Order/QueryHandler/GetPayPalOrderQueryHandler.php
@@ -52,7 +52,7 @@ public function __construct(CacheInterface $orderCache, PsCheckoutCartRepository
      */
     public function handle(GetPayPalOrderQuery $query)
     {
-        $orderId = $query->getOrderId() ? $query->getOrderId()->getValue() : null;
+        $orderId = !$query->getOrderId()->getValue() ? null : $query->getOrderId()->getValue();
 
         if (!$orderId) {
             $psCheckoutCart = $this->checkoutCartRepository->findOneByCartId($query->getCartId()->getValue());