Merge pull request #121 from Paazl/release/1.19.0

Release/1.19.0

Author: Marvin-Magmodules

.github/workflows/linting.yml

@@ -5,20 +5,24 @@ jobs:
   php-74:
     runs-on: ubuntu-latest
     steps:
-      - uses: StephaneBour/[email protected]
-        with:
-          dir: './'
+      - uses: prestashop/github-action-php-lint/[email protected]
 
-  php-80:
+  php-81:
     runs-on: ubuntu-latest
     steps:
-      - uses: StephaneBour/[email protected]
-        with:
-          dir: './'
+      - uses: prestashop/github-action-php-lint/[email protected]
 
-  php-81:
+  php-82:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: prestashop/github-action-php-lint/[email protected]
+
+  php-83:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: prestashop/github-action-php-lint/[email protected]
+
+  php-84:
     runs-on: ubuntu-latest
     steps:
-      - uses: StephaneBour/[email protected]
-        with:
-          dir: './'
+      - uses: prestashop/github-action-php-lint/[email protected]

.github/workflows/setup-di-compile.yml

@@ -12,6 +12,10 @@ jobs:
             MAGENTO_VERSION: 2.4.4
           - PHP_VERSION: php82-fpm
             MAGENTO_VERSION: 2.4.6
+          - PHP_VERSION: php83-fpm
+            MAGENTO_VERSION: 2.4.7
+          - PHP_VERSION: php84-fpm
+            MAGENTO_VERSION: 2.4.8
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v1
@@ -29,4 +33,4 @@ jobs:
         run: docker exec magento-project-community-edition composer require paazl/magento2-checkout-widget:@dev --no-plugins
 
       - name: Run setup:di:compile
-        run: docker exec magento-project-community-edition ./retry "php bin/magento setup:di:compile"
+        run: docker exec magento-project-community-edition ./retry "php bin/magento setup:di:compile"

.github/workflows/templates/docker-compose.yml

@@ -79,5 +79,5 @@ public function getTokenExpiresAt();
      *
      * @return bool
      */
-    public function isTokenExpired(\DateTime $now = null);
+    public function isTokenExpired(?\DateTime $now = null);
 }

Api/Data/Quote/QuoteReferenceInterface.php

@@ -51,7 +51,7 @@ public function __construct(
         $this->quoteIdMaskResource = $quoteIdMaskResource;
     }
 
-    public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
+    public function resolve(Field $field, $context, ResolveInfo $info, ?array $value = null, ?array $args = null)
     {
         if (!isset($args['cart_id']) || empty($args['cart_id'])) {
             throw new GraphQlInputException(__('"cart_id" is required'));

GraphQL/Resolver/ConfigurationResolver.php

@@ -1,28 +1,17 @@
 <?php
 /**
- * Copyright © 2019 Paazl. All rights reserved.
+ * Copyright © Paazl. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Paazl\CheckoutWidget\Logger;
 
 use Monolog\Logger;
 use Magento\Framework\Logger\Handler\Base;
 
-/**
- * Class PaazlHandler
- *
- * @package Paazl\CheckoutWidget\Logger
- */
 class PaazlHandler extends Base
 {
-
-    /**
-     * @var int
-     */
     protected $loggerType = Logger::DEBUG;
-    /**
-     * @var string
-     */
     protected $fileName = '/var/log/paazl.log';
 }

Logger/PaazlHandler.php

@@ -8,47 +8,27 @@
 namespace Paazl\CheckoutWidget\Logger;
 
 use Magento\Framework\Serialize\Serializer\Json;
-use Monolog\Logger;
+use Monolog\Logger as MonologLogger;
 
-/**
- * DebugLogger logger class
- */
-class PaazlLogger extends Logger
+class PaazlLogger
 {
+    private MonologLogger $logger;
+    private Json $json;
 
-    /**
-     * @var Json
-     */
-    private $json;
-
-    /**
-     * DebugLogger constructor.
-     *
-     * @param Json   $json
-     * @param string $name
-     * @param array  $handlers
-     * @param array  $processors
-     */
     public function __construct(
-        Json $json,
-        string $name,
-        array $handlers = [],
-        array $processors = []
+        MonologLogger $logger,
+        Json $json
     ) {
+        $this->logger = $logger;
         $this->json = $json;
-        parent::__construct($name, $handlers, $processors);
     }
 
-    /**
-     * @param string $type
-     * @param mixed $data
-     */
-    public function add($type, $data)
+    public function add(string $type, $data): void
     {
         if (is_array($data) || is_object($data)) {
-            $this->addRecord(static::INFO, $type . ': ' . $this->json->serialize($data));
+            $this->logger->info( $type . ': ' . $this->json->serialize($data));
         } else {
-            $this->addRecord(static::INFO, $type . ': ' . $data);
+            $this->logger->info( $type . ': ' . $data);
         }
     }
 }

Logger/PaazlLogger.php

@@ -78,6 +78,7 @@ public function getConfig()
         $config['googleMapKey'] = $this->config->getGoogleMapKey($storeId);
         $config['widgetConfig'] = $this->widgetConfigProvider->getConfig();
         $config['mode'] = $this->config->isProductionApiMode($storeId) ? 'live' : 'test';
+        $config['version'] = $this->config->getApiVersion($storeId);
 
         if (empty($config['widgetConfig']['token'])) {
             // We were unable to obtain a token - enabling other methods if they're available

Model/Admin/Order/Create/PaazlConfigProvider.php

@@ -20,7 +20,7 @@ class ApiException extends \Exception
     public function __construct(
         $message = "",
         $code = 0,
-        Throwable $previous = null,
+        ?Throwable $previous = null,
         $response = false
     ) {
         if ($response) {

Model/Api/ApiException.php

@@ -46,6 +46,12 @@ public function __construct(
      */
     public function create($storeId = null): UrlProvider
     {
-        return $this->objectManager->create(UrlProvider::class, ['mode' => $this->config->getApiMode($storeId)]);
+        return $this->objectManager->create(
+            UrlProvider::class,
+            [
+                'mode' => $this->config->getApiMode($storeId),
+                'version' => $this->config->getApiVersion($storeId)
+            ]
+        );
     }
 }