Merge ec5efa7 into 084d804

.gitignore

@@ -9,3 +9,4 @@
 
 /behat.yml
 /phpspec.yml
+/bin/*

README.md

@@ -67,17 +67,26 @@ $ bin/console debug:container bitbag_sylius_przelewy24_plugin
 ```bash
 $ composer install
 $ cd tests/Application
+$ cp .env .env.local #edit .env.local file and setup configuration 
 $ yarn install
 $ yarn run gulp
 $ bin/console assets:install -e test
 $ bin/console doctrine:database:create -e test
 $ bin/console doctrine:schema:create -e test
 $ bin/console server:run 127.0.0.1:8080 -e test
-$ open http://localhost:8080
-$ bin/behat
-$ bin/phpspec run
+$ bin/console sylius:fixture:load -e test #install fixtures
+open http://localhost:8080
+```
+For admin panel:
+```
+open http://localhost:8080/admin
+sylius:sylius
+```
+From root catalog
+```bash
+$ vendor/bin/behat
+$ vendor/bin/phpspec run
 ```
-
 ## Contribution
 
 Learn more about our contribution workflow on http://docs.sylius.org/en/latest/contributing/.

composer.json

@@ -6,8 +6,7 @@
     "license": "MIT",
     "require": {
         "php": "^7.2",
-
-        "sylius/sylius": "~1.4.0"
+        "sylius/sylius": "^1.5"
     },
     "require-dev": {
         "behat/behat": "^3.4",

src/Action/CaptureAction.php

@@ -15,6 +15,7 @@
 use BitBag\SyliusPrzelewy24Plugin\Bridge\Przelewy24BridgeInterface;
 use Payum\Core\Action\ActionInterface;
 use Payum\Core\ApiAwareInterface;
+use Payum\Core\Bridge\Spl\ArrayObject;
 use Payum\Core\Exception\RequestNotSupportedException;
 use Payum\Core\Exception\UnsupportedApiException;
 use Payum\Core\GatewayAwareInterface;
@@ -58,6 +59,7 @@ public function execute($request): void
     {
         RequestNotSupportedException::assertSupports($this, $request);
 
+        /** @var ArrayObject $details */
         $details = $request->getModel();
 
         if (isset($details['p24_status'])) {
@@ -66,14 +68,14 @@ public function execute($request): void
 
         /** @var TokenInterface $token */
         $token = $request->getToken();
-        $details['p24_session_id'] = uniqid();
+        $details['p24_session_id'] = uniqid('p24_', true);
         $notifyToken = $this->tokenFactory->createNotifyToken($token->getGatewayName(), $token->getDetails());
         $details['p24_url_return'] = $token->getAfterUrl();
         $details['p24_url_cancel'] = $token->getAfterUrl() . '&' . http_build_query(['status' => Przelewy24BridgeInterface::CANCELLED_STATUS]);
         $details['p24_wait_for_result'] = '1';
         $details['p24_url_status'] = $notifyToken->getTargetUrl();
-        $details['token'] = $this->przelewy24Bridge->trnRegister($details->toUnsafeArray());
         $details['p24_status'] = Przelewy24BridgeInterface::CREATED_STATUS;
+        $details['token'] = $this->przelewy24Bridge->trnRegister($details->toUnsafeArray());
 
         throw new HttpPostRedirect(
             $this->przelewy24Bridge->getTrnRequestUrl($details['token'])

src/Bridge/Przelewy24Bridge.php

@@ -12,6 +12,7 @@
 
 namespace BitBag\SyliusPrzelewy24Plugin\Bridge;
 
+use Exception;
 use GuzzleHttp\ClientInterface;
 
 final class Przelewy24Bridge implements Przelewy24BridgeInterface
@@ -45,24 +46,23 @@ public function setAuthorizationData(
 
     public function getTrnRegisterUrl(): string
     {
-        return $this->getHostForEnvironment() . 'trnRegister';
+        return sprintf('%strnRegister', $this->getHostForEnvironment());
     }
 
     public function getTrnRequestUrl(string $token): string
     {
-        return $this->getHostForEnvironment() . 'trnRequest/' . $token;
+        return sprintf('%strnRequest/%s', $this->getHostForEnvironment(), $token);
     }
 
     public function getTrnVerifyUrl(): string
     {
-        return $this->getHostForEnvironment() . 'trnVerify';
+        return sprintf('%strnVerify', $this->getHostForEnvironment());
     }
 
     public function getHostForEnvironment(): string
     {
         return self::SANDBOX_ENVIRONMENT === $this->environment ?
-            self::SANDBOX_HOST : self::PRODUCTION_HOST
-        ;
+            self::SANDBOX_HOST : self::PRODUCTION_HOST;
     }
 
     public function createSign(array $parameters): string
@@ -76,12 +76,14 @@ public function trnRegister(array $posData): string
         $posData['p24_pos_id'] = $this->merchantId;
         $posData['p24_api_version'] = self::P24_API_VERSION;
 
-        $sign = $this->createSign([
-            $posData['p24_session_id'],
-            $posData['p24_merchant_id'],
-            $posData['p24_amount'],
-            $posData['p24_currency'],
-        ]);
+        $sign = $this->createSign(
+            [
+                $posData['p24_session_id'],
+                $posData['p24_merchant_id'],
+                $posData['p24_amount'],
+                $posData['p24_currency'],
+            ]
+        );
 
         $posData['p24_sign'] = $sign;
 
@@ -94,21 +96,23 @@ public function trnVerify(array $posData): bool
         $posData['p24_pos_id'] = $this->merchantId;
         $posData['p24_api_version'] = self::P24_API_VERSION;
 
-        $sign = $this->createSign([
-            $posData['p24_session_id'],
-            $posData['p24_order_id'],
-            $posData['p24_amount'],
-            $posData['p24_currency'],
-        ]);
+        $sign = $this->createSign(
+            [
+                $posData['p24_session_id'],
+                $posData['p24_order_id'],
+                $posData['p24_amount'],
+                $posData['p24_currency'],
+            ]
+        );
 
         $posData['p24_sign'] = $sign;
 
-        return (int) $this->request($posData, $this->getTrnVerifyUrl())['error'] === 0;
+        return (int)$this->request($posData, $this->getTrnVerifyUrl())['error'] === 0;
     }
 
     public function request(array $posData, string $url): array
     {
-        $response = (string) $this->client->request('POST', $url, ['form_params' => $posData])->getBody();
+        $response = (string)$this->client->request('POST', $url, ['form_params' => $posData])->getBody();
 
         $result = [];
 
@@ -119,7 +123,7 @@ public function request(array $posData, string $url): array
         }
 
         if (!isset($result['error']) || $result['error'] > 0) {
-            throw new \Exception($response);
+            throw new \RuntimeException($response);
         }
 
         return $result;

src/Bridge/Przelewy24BridgeInterface.php

@@ -14,15 +14,15 @@
 
 interface Przelewy24BridgeInterface
 {
-    const SANDBOX_ENVIRONMENT = 'sandbox';
-    const PRODUCTION_ENVIRONMENT = 'production';
-    const SANDBOX_HOST = 'https://sandbox.przelewy24.pl/';
-    const PRODUCTION_HOST = 'https://secure.przelewy24.pl/';
-    const P24_API_VERSION = '3.2';
-    const COMPLETED_STATUS = 'completed';
-    const FAILED_STATUS = 'failed';
-    const CANCELLED_STATUS = 'cancelled';
-    const CREATED_STATUS = 'created';
+    public const SANDBOX_ENVIRONMENT    = 'sandbox';
+    public const PRODUCTION_ENVIRONMENT = 'production';
+    public const SANDBOX_HOST           = 'https://sandbox.przelewy24.pl/';
+    public const PRODUCTION_HOST        = 'https://secure.przelewy24.pl/';
+    public const P24_API_VERSION        = '3.2';
+    public const COMPLETED_STATUS       = 'completed';
+    public const FAILED_STATUS          = 'failed';
+    public const CANCELLED_STATUS       = 'cancelled';
+    public const CREATED_STATUS         = 'created';
 
     public function getTrnRegisterUrl(): string;