Merge pull request #569 from mollie/release/2.17.0

Release/2.17.0

Author: Marvin-Magmodules

.github/workflows/codeql.yml

@@ -0,0 +1,72 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ "master" ]
+  schedule:
+    - cron: '16 9 * * 2'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'javascript' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
+        # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v3
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v2
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        
+        # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
+        # queries: security-extended,security-and-quality
+
+        
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v2
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
+
+    #   If the Autobuild fails above, remove it and uncomment the following three lines. 
+    #   modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
+
+    # - run: |
+    #   echo "Run, Build Application using script"
+    #   ./location_of_script_within_repo/buildscript.sh
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v2

.github/workflows/integration-test.yml

@@ -6,8 +6,6 @@ jobs:
     strategy:
       matrix:
         include:
-          - PHP_VERSION: php71-fpm
-            MAGENTO_VERSION: 2.3.3
           - PHP_VERSION: php73-fpm
             MAGENTO_VERSION: 2.3.7-p3
           - PHP_VERSION: php73-fpm

.github/workflows/linting.yml

@@ -2,20 +2,6 @@ name: Lint PHP files
 on: [push, pull_request]
 
 jobs:
-  php-70:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: StephaneBour/actions-php-lint@7.0
-        with:
-          dir: './'
-
-  php-71:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: StephaneBour/actions-php-lint@7.1
-        with:
-          dir: './'
-
   php-72:
     runs-on: ubuntu-latest
     steps:
@@ -36,3 +22,10 @@ jobs:
       - uses: StephaneBour/actions-php-lint@7.4
         with:
           dir: './'
+
+  php-81:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: StephaneBour/actions-php-lint@8.1
+        with:
+          dir: './'

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

@@ -6,14 +6,14 @@ jobs:
         strategy:
             matrix:
               include:
-                - PHP_VERSION: php71-fpm
-                  MAGENTO_VERSION: 2.3.3
                 - PHP_VERSION: php73-fpm
                   MAGENTO_VERSION: 2.3.7-p3
                 - PHP_VERSION: php74-fpm
                   MAGENTO_VERSION: 2.4.2
                 - PHP_VERSION: php74-fpm
                   MAGENTO_VERSION: 2.4.3-with-replacements
+                - PHP_VERSION: php81-fpm
+                  MAGENTO_VERSION: 2.4.4
 
         runs-on: ubuntu-latest
         steps:

.github/workflows/unit-test.yml

@@ -6,8 +6,6 @@ jobs:
     strategy:
       matrix:
         include:
-          - PHP_VERSION: php71-fpm
-            MAGENTO_VERSION: 2.3.3
           - PHP_VERSION: php73-fpm
             MAGENTO_VERSION: 2.3.7-p3
           - PHP_VERSION: php74-fpm

Config.php

@@ -155,12 +155,22 @@ public function getVersion()
 
     /**
      * Returns current version of Magento
+     *
+     * @return string
      */
     public function getMagentoVersion(): string
     {
         return $this->productMetadata->getVersion();
     }
 
+    /**
+     * @return string
+     */
+    public function getMagentoEdition(): string
+    {
+        return $this->productMetadata->getEdition();
+    }
+
     /**
      * Returns API key
      *

Controller/Checkout/Webhook.php

@@ -70,16 +70,13 @@ public function execute()
 
         $transactionId = $this->getRequest()->getParam('id');
         if (!$transactionId) {
-            return $this->getErrorResponse(404, __('No transaction ID found')->render());
+            return $this->getOkResponse();
         }
 
         try {
             $orderIds = $this->mollieModel->getOrderIdsByTransactionId($transactionId);
             if (!$orderIds) {
-                return $this->getErrorResponse(
-                    404,
-                    __('There is no order found that belongs to "%1"', $transactionId)->render()
-                );
+                return $this->getOkResponse();
             }
 
             foreach ($orderIds as $orderId) {
@@ -90,7 +87,7 @@ public function execute()
         } catch (\Exception $e) {
             $this->mollieHelper->addTolog('error', $e->getMessage());
 
-            return $this->getErrorResponse(503);
+            return $this->getErrorResponse(200);
         }
     }
 

GraphQL/Resolver/Checkout/ProcessTransaction.php

@@ -84,7 +84,6 @@ private function getCart(string $status, string $cartId): ?array
             PaymentStatus::STATUS_EXPIRED,
             PaymentStatus::STATUS_CANCELED,
             PaymentStatus::STATUS_FAILED,
-            PaymentStatus::STATUS_PENDING,
         ]);
 
         try {

Model/Api.php

@@ -38,7 +38,8 @@ public function __construct(
     public function load($storeId = null)
     {
         $this->setApiKey($this->mollieHelper->getApiKey($storeId));
-        $this->addVersionString('Magento/' . $this->mollieHelper->getMagentoVersion());
+        $this->addVersionString('Magento/' . $this->config->getMagentoVersion());
+        $this->addVersionString('MagentoEdition/' . $this->config->getMagentoEdition());
         $this->addVersionString('MollieMagento2/' . $this->mollieHelper->getExtensionVersion());
     }
 }

Model/Client/Orders.php

@@ -25,6 +25,7 @@
 use Mollie\Api\Resources\Order as MollieOrder;
 use Mollie\Api\Resources\Payment;
 use Mollie\Api\Types\OrderStatus;
+use Mollie\Payment\Config;
 use Mollie\Payment\Helper\General as MollieHelper;
 use Mollie\Payment\Model\Adminhtml\Source\InvoiceMoment;
 use Mollie\Payment\Model\Client\Orders\ProcessTransaction;
@@ -129,6 +130,11 @@ class Orders extends AbstractModel
      */
     private $processTransaction;
 
+    /**
+     * @var Config
+     */
+    private $config;
+
     /**
      * Orders constructor.
      *
@@ -171,6 +177,7 @@ public function __construct(
         BuildTransaction $buildTransaction,
         PaymentTokenForOrder $paymentTokenForOrder,
         ProcessTransaction $processTransaction,
+        Config $config,
         EventManager $eventManager
     ) {
         $this->orderLines = $orderLines;
@@ -192,6 +199,7 @@ public function __construct(
         $this->eventManager = $eventManager;
         $this->paymentTokenForOrder = $paymentTokenForOrder;
         $this->processTransaction = $processTransaction;
+        $this->config = $config;
     }
 
     /**
@@ -433,7 +441,8 @@ public function loadMollieApi($apiKey)
         if (class_exists('Mollie\Api\MollieApiClient')) {
             $mollieApiClient = new MollieApiClient();
             $mollieApiClient->setApiKey($apiKey);
-            $mollieApiClient->addVersionString('Magento/' . $this->mollieHelper->getMagentoVersion());
+            $mollieApiClient->addVersionString('Magento/' . $this->config->getMagentoVersion());
+            $mollieApiClient->addVersionString('MagentoEdition/' . $this->config->getMagentoEdition());
             $mollieApiClient->addVersionString('MollieMagento2/' . $this->mollieHelper->getExtensionVersion());
             return $mollieApiClient;
         } else {