OP-263 Add ecs and phpStan + fixes

.gitignore

@@ -16,3 +16,8 @@
 # Symfony CLI https://symfony.com/doc/current/setup/symfony_server.html#different-php-settings-per-project
 /.php-version
 /php.ini
+
+###> friendsofphp/php-cs-fixer ###
+/.php-cs-fixer.php
+/.php-cs-fixer.cache
+###< friendsofphp/php-cs-fixer ###

.php-cs-fixer.dist.php

@@ -0,0 +1,13 @@
+<?php
+
+$finder = (new PhpCsFixer\Finder())
+    ->in(__DIR__)
+    ->exclude('var')
+;
+
+return (new PhpCsFixer\Config())
+    ->setRules([
+        '@Symfony' => true,
+    ])
+    ->setFinder($finder)
+;

composer.json

@@ -16,6 +16,7 @@
     "require-dev": {
         "behat/behat": "^3.6.1",
         "behat/mink-selenium2-driver": "^1.4",
+        "bitbag/coding-standard": "^3.0",
         "dmore/behat-chrome-extension": "^1.3",
         "dmore/chrome-mink-driver": "^2.7",
         "friends-of-behat/mink": "^1.8",
@@ -28,7 +29,7 @@
         "friends-of-behat/variadic-extension": "^1.3",
         "phpspec/phpspec": "^7.5",
         "phpstan/extension-installer": "^1.0",
-        "phpstan/phpstan": "^1.8.1",
+        "phpstan/phpstan": "^1.10",
         "phpstan/phpstan-doctrine": "1.3.40",
         "phpstan/phpstan-strict-rules": "^1.3.0",
         "phpstan/phpstan-webmozart-assert": "^1.2.0",

ecs.php

@@ -12,6 +12,8 @@
         __DIR__ . '/ecs.php',
     ]);
 
+    putenv('ALLOW_BITBAG_OS_HEADER=0');
+
     $ecsConfig->import('vendor/sylius-labs/coding-standard/ecs.php');
 
     $ecsConfig->skip([

phpstan.neon

@@ -2,6 +2,7 @@ parameters:
     level: max
     reportUnmatchedIgnoredErrors: false
     checkMissingIterableValueType: false
+    checkGenericClassInNonGenericObjectType: false
     paths:
         - src
         - tests/Behat

src/Action/CaptureAction.php

@@ -27,7 +27,7 @@ public function __construct(private readonly SignatureResolverInterface $signatu
         $this->apiClass = ImojeApi::class;
     }
 
-    public function execute($request)
+    public function execute($request): void
     {
         RequestNotSupportedException::assertSupports($this, $request);
         $model = $request->getModel();
@@ -50,15 +50,15 @@ public function execute($request)
 
         throw new HttpPostRedirect(
             $this->api->getApiUrl(),
-            $orderData
+            $orderData,
         );
     }
 
     public function supports($request): bool
     {
         return
-            $request instanceof Capture
-            && $request->getModel() instanceof ArrayObject;
+            $request instanceof Capture &&
+            $request->getModel() instanceof ArrayObject;
     }
 
     private function prepareOrderData(OrderInterface $order, PaymentSecurityTokenInterface $token): array
@@ -73,10 +73,10 @@ private function prepareOrderData(OrderInterface $order, PaymentSecurityTokenInt
         $orderData['amount'] = $order->getTotal();
         $orderData['currency'] = $order->getCurrencyCode();
         $orderData['orderId'] = $order->getNumber();
-        $orderData['customerFirstName'] = $billingAddress->getFirstName();
-        $orderData['customerLastName'] = $billingAddress->getLastName();
+        $orderData['customerFirstName'] = $billingAddress?->getFirstName();
+        $orderData['customerLastName'] = $billingAddress?->getLastName();
         $orderData['urlReturn'] = $token->getAfterUrl();
-        $orderData['customerEmail'] = $customer->getEmail();
+        $orderData['customerEmail'] = $customer?->getEmail();
         $orderData['signature'] = $this->signatureResolver->createSignature($orderData, $this->api->getServiceKey());
 
         return $orderData;

src/Action/ConvertPaymentAction.php

@@ -19,7 +19,7 @@ public function execute($request): void
         $request->setResult((array) $details);
     }
 
-    public function supports($request)
+    public function supports($request): bool
     {
         return
             $request instanceof Convert &&

src/Action/NotifyAction.php

@@ -22,10 +22,10 @@ final class NotifyAction implements ActionInterface, ApiAwareInterface
     private Request $request;
 
     public function __construct(
-        private readonly RequestStack $requestStack,
+        protected RequestStack $requestStack,
         private readonly SignatureResolverInterface $signatureResolver,
     ) {
-        $this->request = $requestStack->getCurrentRequest();
+        $this->request = $requestStack->getCurrentRequest() ?? new Request();
         $this->apiClass = ImojeApi::class;
     }
 
@@ -45,8 +45,8 @@ public function execute($request): void
     public function supports($request): bool
     {
         return
-            $request instanceof Notify
-            && $request->getModel() instanceof ArrayObject
-            && $this->signatureResolver->verifySignature($this->request, $this->api->getServiceKey());
+            $request instanceof Notify &&
+            $request->getModel() instanceof ArrayObject &&
+            $this->signatureResolver->verifySignature($this->request, $this->api->getServiceKey());
     }
 }

src/Action/StatusAction.php

@@ -63,6 +63,6 @@ public function supports($request): bool
     {
         return $request instanceof GetStatusInterface &&
             $request->getModel() instanceof ArrayAccess
-            ;
+        ;
     }
 }

src/Api/ImojeApi.php

@@ -12,7 +12,8 @@ public function __construct(
         private readonly string $serviceId,
         private readonly string $serviceKey,
         private readonly string $authorizationToken,
-    ) {}
+    ) {
+    }
 
     public function getApiUrl(): string
     {

src/Api/ImojeApiInterface.php

@@ -1,19 +1,27 @@
 <?php
 
+declare(strict_types=1);
+
 namespace BitBag\SyliusImojePlugin\Api;
 
 interface ImojeApiInterface
 {
     public const SANDBOX_ENVIRONMENT = 'sandbox';
+
     public const PRODUCTION_ENVIRONMENT = 'production';
 
     public const SANDBOX_PAYWALL_URL = 'https://sandbox.paywall.imoje.pl/payment';
+
     public const PRODUCTION_PAYWALL_URL = 'https://paywall.imoje.pl/payment';
 
     public const NEW_STATUS = 'new';
+
     public const PENDING_STATUS = 'pending';
+
     public const SETTLED_STATUS = 'settled';
+
     public const REJECTED_STATUS = 'rejected';
+
     public const CANCELLED_STATUS = 'cancelled';
 
     public const HASHING_ALGORITHM = 'sha256';
@@ -27,5 +35,4 @@ public function getServiceId(): string;
     public function getServiceKey(): string;
 
     public function getAuthorizationToken(): string;
-
 }

src/Controller/NotifyController.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace BitBag\SyliusImojePlugin\Controller;
 
 use BitBag\SyliusImojePlugin\Provider\PaymentTokenProviderInterface;
@@ -16,7 +18,8 @@ final class NotifyController
     public function __construct(
         private readonly Payum $payum,
         private readonly PaymentTokenProviderInterface $paymentTokenProvider,
-    ) {}
+    ) {
+    }
 
     public function verifyImojeNotification(Request $request): Response
     {
@@ -33,14 +36,14 @@ public function verifyImojeNotification(Request $request): Response
             $gateway->execute(new Notify($notifyToken));
 
             return new JsonResponse(['status' => 'ok']);
-        } else {
-            throw new NotFoundHttpException('Payment token not found');
         }
+
+        throw new NotFoundHttpException('Payment token not found');
     }
 
     private function createRequestWithToken(
         Request $request,
-        PaymentSecurityTokenInterface $token
+        PaymentSecurityTokenInterface $token,
     ): Request {
         $request = Request::create(
             $token->getTargetUrl(),
@@ -49,11 +52,11 @@ private function createRequestWithToken(
             $request->cookies->all(),
             $request->files->all(),
             $request->server->all(),
-            $request->getContent()
+            $request->getContent(),
         );
 
         $request->attributes->add([
-            'payum_token' => $token->getHash()
+            'payum_token' => $token->getHash(),
         ]);
 
         return $request;