Backport main to develop

.github/workflows/aqua.yml

@@ -0,0 +1,31 @@
+name: Aqua
+on:
+  pull_request:
+    branches:
+      - main
+      - develop
+
+jobs:
+  aqua:
+    name: Aqua scanner
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Run Aqua scanner
+        uses: docker://aquasec/aqua-scanner
+        with:
+          args: trivy fs --sast --reachability --scanners config,vuln,secret .
+          # To customize which severities add the following flag: --severity UNKNOWN,LOW,MEDIUM,HIGH,CRITICAL
+          # To enable SAST scanning, add: --sast
+          # To enable reachability scanning, add: --reachability
+          # To enable npm/dotnet non-lock file scanning, add: --package-json / --dotnet-proj
+        env:
+          AQUA_KEY: ${{ secrets.AQUA_KEY }}
+          AQUA_SECRET: ${{ secrets.AQUA_SECRET }}
+          GITHUB_TOKEN: ${{ github.token }}
+          AQUA_URL: https://api.eu-1.supply-chain.cloud.aquasec.com
+          CSPM_URL: https://eu-1.api.cloudsploit.com
+          TRIVY_RUN_AS_PLUGIN: "aqua"
+          # For http/https proxy configuration add env vars: HTTP_PROXY/HTTPS_PROXY, CA-CRET (path to CA certificate)

.github/workflows/php.yml

@@ -15,10 +15,10 @@ jobs:
         working-directory: .
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 #v4
 
       - name: Setup PHP
-        uses: shivammathur/setup-php@v2
+        uses: shivammathur/setup-php@accd6127cb78bee3e8082180cb391013d204ef9f #v2
         with:
           php-version: 8.0
 

CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+v2.2.0
+------
+
+- Feat: Compatibility Sylius 1.14
+
+v2.1.0
+------
+
+- Fix: CartBuilder fix call to member function getPath() on null
+
 v2.0.0
 ------
 

README.md

@@ -1,14 +1,35 @@
 <p align="center">
     <img src="src/Resources/public/img/alma-logo.svg" alt="logo alma" height="75" style="margin-right:30px" />
-    <img src="https://demo.sylius.com/assets/shop/img/logo.png" height="75" />
+    <img src="src/Resources/public/img/sylius-logo.png" alt="logo sylius" height="75" />
 </p>
 
 <h1 align="center">Sylius Alma Payment Plugin</h1>
 
 <p align="center">Integrate Alma installments and pay later payments with your Sylius shop</p>
 
+## Requirements
+
+### Compatibility
+- **Sylius**: Compatible with versions `1.9.x` to `1.12.x`
+- **PHP**: Compatible with versions `7.3` to `8.0`
+
+Alma currently accepts Euros only; make sure you activate your payment method on channels that use that currency, else
+you won't see it at checkout.
+
+Your Alma payment methods will only show for eligible carts. Eligibility is mainly based on the purchased amount, which
+by default should be between 100€ and 2000€; if you want those limits changed, you can talk to your sales representative
+at Alma, or contact [support@getalma.eu](mailto:support@getalma.eu).
+
 ## Documentation
 
+### Account Setup (Required)
+
+Before configuring the module, you need to create your merchant account on [dashboard.getalma.eu](https://dashboard.getalma.eu).
+
+1. Go to [registration page](https://dashboard.getalma.eu/register) and create an account.
+2. Retrieve your API key from the dashboard.
+3. Use these credentials in the module configuration.
+
 ### Installation
 1. Use Composer to install the plugin:
 
@@ -53,18 +74,6 @@ $ php bin/console translation:update --dump-messages en AlmaSyliusPaymentPlugin
 $ php bin/console cache:clear
 ```
 
-### Requirements
-
-- PHP version >= 7.3
-- Sylius version >= 1.9.0
-
-Alma currently accepts Euros only; make sure you activate your payment method on channels that use that currency, else 
-you won't see it at checkout.
-
-Your Alma payment methods will only show for eligible carts. Eligibility is mainly based on the purchased amount, which
-by default should be between 100€ and 2000€; if you want those limits changed, you can talk to your sales representative
-at Alma, or contact [support@getalma.eu](mailto:support@getalma.eu).
-
 ### Usage
 1. Go to the Payment Methods admin page and choose to create a new "Alma Payments" method
 
@@ -80,3 +89,6 @@ at Alma, or contact [support@getalma.eu](mailto:support@getalma.eu).
 5. Choose a name for your method in the languages relevant to your shop.
 
 6. You're done! Save the payment method to start accepting instalments payments on your shop!
+
+## Support
+If you encounter any issues or have questions, feel free to contact us at [support@getalma.eu](mailto:support@getalma.eu.).

composer.json

@@ -1,6 +1,7 @@
 {
   "name": "alma/sylius-payment-plugin",
   "type": "sylius-plugin",
+  "version": "2.2.0",
   "keywords": [
     "alma",
     "buy now pay later",
@@ -13,9 +14,9 @@
   "description": "Payment plugin to integrate Alma installments and pay later payments with your Sylius shop",
   "license": "MIT",
   "require": {
-    "php":  "~7.3 || ~7.4 || ~8.0 || ~8.1 || ~8.2",
+    "php":  "~7.4 || ~8.0 || ~8.1 || ~8.2 || ~8.3",
     "alma/alma-php-client": ">=1.11.2",
-    "sylius/sylius": ">=v1.9.0",
+    "sylius/sylius": ">=v1.9.0 <2.0",
     "ext-json": "*"
   },
   "require-dev": {
@@ -34,19 +35,18 @@
     "lakion/mink-debug-extension": "^2.0.0",
     "phpspec/phpspec": "^7.0",
     "phpstan/extension-installer": "^1.0",
-    "phpstan/phpstan": "0.12.88",
-    "phpstan/phpstan-doctrine": "0.12.37",
-    "phpstan/phpstan-strict-rules": "^0.12.0",
-    "phpstan/phpstan-webmozart-assert": "0.12.12",
-    "phpunit/phpunit": "^9.5",
-    "sensiolabs/security-checker": "^6.0",
-    "sylius-labs/coding-standard": "^3.1",
-    "symfony/browser-kit": "^4.4 || ^5.2",
-    "symfony/debug-bundle": "^4.4 || ^5.2",
-    "symfony/dotenv": "^4.4 || ^5.2",
-    "symfony/intl": "^4.4 || ^5.2",
-    "symfony/web-profiler-bundle": "^4.4 || ^5.2",
-    "vimeo/psalm": "4.6.4"
+    "phpstan/phpstan": "^1.0",
+    "phpstan/phpstan-doctrine": "^1.0",
+    "phpstan/phpstan-strict-rules": "^1.0",
+    "phpstan/phpstan-webmozart-assert": "^1.0",
+    "phpunit/phpunit": "^9.5 || ^10.0",
+    "sylius-labs/coding-standard": "^3.1 || ^4.0",
+    "symfony/browser-kit": "^4.4 || ^5.2 || ^6.0",
+    "symfony/debug-bundle": "^4.4 || ^5.2 || ^6.0",
+    "symfony/dotenv": "^4.4 || ^5.2 || ^6.0",
+    "symfony/intl": "^4.4 || ^5.2 || ^6.0",
+    "symfony/web-profiler-bundle": "^4.4 || ^5.2 || ^6.0",
+    "vimeo/psalm": "^4.6 || ^5.0"
   },
   "autoload": {
     "psr-4": {
@@ -74,7 +74,8 @@
       "symfony/thanks": true,
       "dealerdirect/phpcodesniffer-composer-installer": true,
       "phpstan/extension-installer": true,
-      "symfony/flex": true
+      "symfony/flex": true,
+      "rector/extension-installer": true
     }
   }
 }

src/AlmaSyliusPaymentPlugin.php

@@ -11,7 +11,7 @@
 
 final class AlmaSyliusPaymentPlugin extends Bundle
 {
-    const VERSION = "2.0.0";
+    const VERSION = "2.2.0";
 
     use SyliusPluginTrait;
 

src/DataBuilder/CartDataBuilder.php

@@ -158,9 +158,9 @@ private function getProductPictureUrl(ProductVariantInterface $variant): string
         /** @var ImageInterface[] $images */
         $images = $subject->getImages();
 
-        if (count($mainPictures) > 0) {
+        if (!empty($mainPictures) && $mainPictures[0] !== null ) {
             $path = $mainPictures[0]->getPath();
-        } elseif (count($images) > 0) {
+        } elseif (!empty($images) && $images[0] !== null) {
             $path = $images[0]->getPath();
         }
 

src/Form/Type/AlmaGatewayConfigurationType.php

@@ -102,9 +102,6 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
                 ChoiceType::class,
                 [
                     'choices' => [
-                        $this->translator->trans(
-                            'alma_sylius_payment_plugin.config.payment_page_mode_in_page'
-                        ) => GatewayConfigInterface::PAYMENT_PAGE_MODE_IN_PAGE,
                         $this->translator->trans(
                             'alma_sylius_payment_plugin.config.payment_page_mode_redirect'
                         ) => GatewayConfigInterface::PAYMENT_PAGE_MODE_REDIRECT,
@@ -127,7 +124,7 @@ public function onPreSetData(FormEvent $event): void
         // Set default values for the different form fields (useful for gateway creations)
         $data->defaults([
             GatewayConfigInterface::CONFIG_INSTALLMENTS_COUNT => 3,
-            GatewayConfigInterface::CONFIG_PAYMENT_PAGE_MODE => GatewayConfigInterface::PAYMENT_PAGE_MODE_IN_PAGE,
+            GatewayConfigInterface::CONFIG_PAYMENT_PAGE_MODE => GatewayConfigInterface::PAYMENT_PAGE_MODE_REDIRECT,
             GatewayConfigInterface::CONFIG_API_MODE => AlmaClient::TEST_MODE
         ]);
 

src/Payum/Action/CaptureAction.php

@@ -41,23 +41,7 @@ public function execute($request): void
     {
         RequestNotSupportedException::assertSupports($this, $request);
 
-        $config = $this->api->getGatewayConfig();
-
-        $paymentPageMode = $config->getPaymentPageMode();
-        switch ($paymentPageMode) {
-            case GatewayConfigInterface::PAYMENT_PAGE_MODE_IN_PAGE:
-                $this->gateway->execute(new RenderInPagePayment($request->getModel()));
-                break;
-
-            case GatewayConfigInterface::PAYMENT_PAGE_MODE_REDIRECT:
-                $this->gateway->execute(new RedirectToPaymentPage($request));
-                break;
-
-            default:
-                throw new RuntimeException(
-                    "[Alma] Unknown payment page mode '${paymentPageMode}'. Check gateway config"
-                );
-        }
+        $this->gateway->execute(new RedirectToPaymentPage($request));
     }
 
     public function supports($request): bool

src/Payum/Gateway/AlmaGatewayFactory.php

@@ -18,7 +18,7 @@ protected function populateConfig(ArrayObject $config): void
             'payum.factory_name' => self::FACTORY_NAME,
             'payum.factory_title' => 'Alma Payments',
             GatewayConfigInterface::CONFIG_INSTALLMENTS_COUNT => 3,
-            GatewayConfigInterface::CONFIG_PAYMENT_PAGE_MODE => GatewayConfigInterface::PAYMENT_PAGE_MODE_IN_PAGE,
+            GatewayConfigInterface::CONFIG_PAYMENT_PAGE_MODE => GatewayConfigInterface::PAYMENT_PAGE_MODE_REDIRECT,
             GatewayConfigInterface::CONFIG_PAYMENT_FORM_TEMPLATE => '@AlmaSyliusPaymentPlugin/Action/payment_form.html.twig',
         ]);
 

src/Payum/Gateway/GatewayConfigInterface.php

@@ -17,7 +17,6 @@ interface GatewayConfigInterface {
     const CONFIG_PAYMENT_PAGE_MODE = 'payment_page_mode';
     const CONFIG_PAYMENT_FORM_TEMPLATE = 'payum.template.payment_form_template';
 
-    const PAYMENT_PAGE_MODE_IN_PAGE = 'payment_page_mode.in_page';
     const PAYMENT_PAGE_MODE_REDIRECT = 'payment_page_mode.redirect';
 
     public function __construct(ArrayObject $config);

src/Resources/config/services/controllers.yml

@@ -13,3 +13,5 @@ services:
       $eligibilityHelper: '@alma.sylius_payment_plugin.helper.eligibility'
       $logger: '@logger'
     tags: [ 'controller.service_arguments' ]
+
+  alma_sylius_payment_plugin.controller.installments: '@Alma\SyliusPaymentPlugin\Controller\InstallmentsController'

src/Resources/translations/messages.de.yml

@@ -8,7 +8,6 @@ alma_sylius_payment_plugin:
     installments_count_label: Raten zählen
     installments_count_choice_label: '%installments_count% Ratenzahlungen'
     payment_page_mode_label: Modus der Zahlungsseite
-    payment_page_mode_in_page: Iframe
     payment_page_mode_redirect: Weiterleitung zu Alma (empfohlen)
   errors:
     invalid_api_key: API-Schlüssel ist ungültig

src/Resources/translations/messages.en.yml

@@ -8,7 +8,6 @@ alma_sylius_payment_plugin:
     installments_count_label: Installments count
     installments_count_choice_label: '%installments_count% installments'
     payment_page_mode_label: Payment page mode
-    payment_page_mode_in_page: Iframe
     payment_page_mode_redirect: Redirect to Alma (Recommended)
   errors:
     invalid_api_key: API key is invalid

src/Resources/translations/messages.es.yml

@@ -8,7 +8,6 @@ alma_sylius_payment_plugin:
     installments_count_label: Los plazos cuentan
     installments_count_choice_label: '%installments_count% plazos'
     payment_page_mode_label: Modo de página de pago
-    payment_page_mode_in_page: Iframe
     payment_page_mode_redirect: Redirigir a Alma (Recomendado)
   errors:
     invalid_api_key: La clave API no es válida

src/Resources/translations/messages.fr.yml

@@ -8,7 +8,6 @@ alma_sylius_payment_plugin:
     installments_count_label: Nombre d'échéances
     installments_count_choice_label: '%installments_count% échéances'
     payment_page_mode_label: Mode de la page de paiement
-    payment_page_mode_in_page: Intégré (iframe)
     payment_page_mode_redirect: Redirection vers Alma (Recommandé)
   errors:
     invalid_api_key: Clé d'API invalide

src/Resources/translations/messages.it.yml

@@ -8,7 +8,6 @@ alma_sylius_payment_plugin:
     installments_count_label: Conteggio delle rate
     installments_count_choice_label: '%installments_count% rate'
     payment_page_mode_label: Modalità della pagina di pagamento
-    payment_page_mode_in_page: Iframe
     payment_page_mode_redirect: Reindirizzamento ad Alma (consigliato)
   errors:
     invalid_api_key: La chiave API non è valida

src/Resources/translations/messages.nl.yml

@@ -8,7 +8,6 @@ alma_sylius_payment_plugin:
     installments_count_label: Termijnen tellen
     installments_count_choice_label: '%installments_count% termijnen'
     payment_page_mode_label: Modus betalingspagina
-    payment_page_mode_in_page: Iframe
     payment_page_mode_redirect: Doorverwijzen naar Alma (aanbevolen)
   errors:
     invalid_api_key: API-sleutel is ongeldig

src/Resources/translations/messages.pt.yml

@@ -8,7 +8,6 @@ alma_sylius_payment_plugin:
     installments_count_label: As prestações contam
     installments_count_choice_label: '%installments_count% prestações'
     payment_page_mode_label: Modo da página de pagamento
-    payment_page_mode_in_page: Iframe
     payment_page_mode_redirect: Redirecionar para Alma (Recomendado)
   errors:
     invalid_api_key: A chave da API é inválida