Upgrade plugin to Sylius 2.0

.github/workflows/build.yml

@@ -20,18 +20,11 @@ jobs:
         strategy:
             fail-fast: false
             matrix:
-                php: [ "8.0", "8.1", "8.2", "8.3" ]
-                symfony: [ "^5.4", "^6.4" ]
-                sylius: [ "^1.12", "^1.13" ]
-                node: [ "18.x", "20.x" ]
-                mysql: [ "8.0" ]
-
-                exclude:
-                    - sylius: ^1.13
-                      php: 8.0
-                    - sylius: ^1.12
-                      php: 8.0
-                      symfony: ^6.4
+                php: [ "8.2", "8.3" ]
+                symfony: [ "^6.4", "^7.1" ]
+                sylius: [ "^2.0.4" ]
+                node: [ "20.x", "22.x" ]
+                mysql: [ "5.7", "8.0" ]
 
         env:
             APP_ENV: test
@@ -75,14 +68,6 @@ jobs:
                 name: Install certificates
                 run: symfony server:ca:install
 
-            -
-                name: Run Chrome Headless
-                run: google-chrome-stable --enable-automation --disable-background-networking --no-default-browser-check --no-first-run --disable-popup-blocking --disable-default-apps --allow-insecure-localhost --disable-translate --disable-extensions --no-sandbox --enable-features=Metal --headless --remote-debugging-port=9222 --window-size=2880,1800 --proxy-server='direct://' --proxy-bypass-list='*' http://127.0.0.1 > /dev/null 2>&1 &
-
-            -
-                name: Run webserver
-                run: (cd tests/Application && symfony server:start --port=8080 --dir=public --daemon)
-
             -
                 name: Get Composer cache directory
                 id: composer-cache
@@ -157,17 +142,9 @@ jobs:
                 name: Validate database schema
                 run: (cd tests/Application && bin/console doctrine:schema:validate)
 
-            -
-                name: Run PHPSpec
-                run: vendor/bin/phpspec run --ansi -f progress --no-interaction
-
             -
                 name: Run PHPUnit
                 run: vendor/bin/phpunit --colors=always
-
-            -   
-                name: Load fixtures in test application
-                run: (cd tests/Application && bin/console sylius:fixtures:load -n)
 
             -
                 name: Failed build Slack notification

.github/workflows/coding_standard.yml

@@ -18,17 +18,10 @@ jobs:
         strategy:
             fail-fast: false
             matrix:
-                php: [ "8.0", "8.1", "8.2", "8.3" ]
-                symfony: [ "^5.4", "^6.4" ]
-                sylius: [ "^1.12", "^1.13" ]
-                node: [ "18.x", "20.x" ]
-
-                exclude:
-                    - sylius: ^1.13
-                      php: 8.0
-                    - sylius: ^1.12
-                      php: 8.0
-                      symfony: ^6.4
+                php: [ "8.2", "8.3" ]
+                symfony: [ "^6.4", "^7.1" ]
+                sylius: [ "^2.0.4" ]
+                node: [ "20.x", "22.x" ]
 
         steps:
             - uses: actions/checkout@v3
@@ -70,10 +63,10 @@ jobs:
                   SYMFONY_REQUIRE: ${{ matrix.symfony }}
 
             - name: Run PHPStan
-              run: vendor/bin/phpstan analyse -c phpstan.neon -l 8 src/
+              run: vendor/bin/phpstan analyse -c phpstan.neon -l 7 src/
 
             - name: Run ECS
-              run: vendor/bin/ecs check src
+              run: vendor/bin/ecs check src --debug
 
             - name: Failed build Slack notification
               uses: rtCamp/action-slack-notify@v2

README.md

@@ -4,11 +4,11 @@
 
 We want to impact many unique eCommerce projects and build our brand recognition worldwide, so we are heavily involved in creating open-source solutions, especially for Sylius. We have already created over **35 extensions, which have been downloaded almost 2 million times.**
 
-You can find more information about our eCommerce services and technologies on our website: https://bitbag.io/. We have also created a unique service dedicated to creating plugins: https://bitbag.io/services/sylius-plugin-development. 
+You can find more information about our eCommerce services and technologies on our website: https://bitbag.io/. We have also created a unique service dedicated to creating plugins: https://bitbag.io/services/sylius-plugin-development.
 
-Do you like our work? Would you like to join us? Check out the **“Career” tab:** https://bitbag.io/pl/kariera. 
+Do you like our work? Would you like to join us? Check out the **“Career” tab:** https://bitbag.io/pl/kariera.
 
-# About Us 
+# About Us
 ---
 
 BitBag is a software house that implements tailor-made eCommerce platforms with the entire infrastructure—from creating eCommerce platforms to implementing PIM and CMS systems to developing custom eCommerce applications, specialist B2B solutions, and migrations from other platforms.
@@ -27,14 +27,14 @@ We have a 70-person team of experts: business analysts and consultants, eCommerc
 * PIM and CMS implementations
 
 **Some numbers from BitBag regarding Sylius:**
-* 70 experts on board 
+* 70 experts on board
 * +150 projects delivered on top of Sylius
 * 30 countries of BitBag’s customers
 * 7 years in the Sylius ecosystem
 * +35 plugins created for Sylius
 
 ---
-[![](https://bitbag.io/wp-content/uploads/2024/09/badges-sylius.png)](https://bitbag.io/contact-us/?utm_source=github&utm_medium=referral&utm_campaign=plugins_elasticsearch) 
+[![](https://bitbag.io/wp-content/uploads/2024/09/badges-sylius.png)](https://bitbag.io/contact-us/?utm_source=github&utm_medium=referral&utm_campaign=plugins_elasticsearch)
 
 ---
 
@@ -56,46 +56,28 @@ We have a 70-person team of experts: business analysts and consultants, eCommerc
 * [Community](#community)
 
 # Installation
-----
+
 The installation process for the Imoje Paywall Plugin can be found [here](doc/installation.md).
 
-## Requirements
----
+
+## Requirements:
 We work on stable, supported and up-to-date versions of packages. We recommend you to do the same.
 
-| Package       | Version             |
-|---------------|---------------------|
-| PHP           | \>=8.1              |
-| sylius/sylius | \>=1.12.13 - 1.13.x |
-| MySQL         | \>= 5.7             |
-| NodeJS        | \>= 14.x            |
+| Package       | Version  |
+|---------------|----------|
+| PHP           | \>=8.1   |
+| sylius/sylius | \>=2.0.4 |
+| MySQL         | \>= 5.7  |
+| NodeJS        | \>= 20.x |
+| Symfony       | \>= 6.4  |
 
-## Usage
+# Usage
 
 This plugin allows you to use the payment solution delivered by Imoje.
 
+# Configuration
 
-## Configuration
-
-To create an ING-based payment method, go to Payment methods in the Sylius admin panel.
-After that, you need to add an ING payment:
-
-![Screenshot showing payment method config in admin](doc/create_ing_method.png)
-
-And now, you can configure your payment method in the admin panel:
-
-![Screenshot showing payment method config in admin](doc/payment_method_config.png)
-
-
-To configure the imoje gateway, log in to ING the admin panel.
-
-From "Settings" -> "Data for integration" you can acquire all the needed keys:
-
-merchantId, serviceId, shopKey
-
-Also, here in the integration data page you need to configure the path to your webhook, just type in your shop URL followed by /payment/imoje/notify
-
-You also need an authorization token, so you need to go to: "Settings" -> "API Keys". And click on your "API key". This will be your authorization token.
+The configuration process for the Imoje Paywall Plugin can be found [here](doc/configuration.md).
 
 # Functionalities
 
@@ -106,7 +88,7 @@ All main functionalities of the plugin are described **[here.](doc/functionaliti
 **If you need some help with Sylius development, don't be hesitated to contact us directly. You can fill the form on [this site](https://bitbag.io/contact-us/?utm_source=github&utm_medium=referral&utm_campaign=plugins_mollie) or send us an e-mail to hello@bitbag.io!**
 
 ---
-# Demo 
+# Demo
 
 ---
 We created a demo app with some useful use-cases of plugins! Visit http://demo.sylius.com/ to take a look at it.
@@ -129,7 +111,7 @@ This plugin's source code is completely free and released under the terms of the
 
 [//]: # (These are reference links used in the body of this note and get stripped out when the markdown processor does its job. There is no need to format nicely because it shouldn't be seen.)
 
-# Contact and support 
+# Contact and support
 ---
 This open-source plugin was developed to help the Sylius community. If you have any additional questions, would like help with installing or configuring the plugin, or need any assistance with your Sylius project - let us know! **Contact us** or send us an **e-mail to hello@bitbag.io** with your question(s).
 

composer.json

@@ -8,74 +8,67 @@
     ],
     "license": "MIT",
     "require": {
-        "php": "^8.0",
-        "doctrine/annotations": "^1.14",
-        "sylius/sylius": "~1.12.0 || ~1.13.0",
-        "sylius/mailer-bundle":  "^1.8 || ^2.0@beta",
-        "symfony/webpack-encore-bundle": "^1.15"
+        "sylius/sylius": "^2.0.4",
+        "symfony/webpack-encore-bundle": "^2.1"
     },
     "require-dev": {
-        "behat/behat": "^3.6.1",
-        "behat/mink-selenium2-driver": "^1.4",
+        "behat/behat": "^3.14",
+        "behat/mink-selenium2-driver": "^1.6",
         "bitbag/coding-standard": "^3.0",
-        "dmore/behat-chrome-extension": "^1.3",
-        "dmore/chrome-mink-driver": "^2.7",
-        "friends-of-behat/mink": "^1.8",
-        "friends-of-behat/mink-browserkit-driver": "^1.4",
-        "friends-of-behat/mink-debug-extension": "^2.0.0",
-        "friends-of-behat/mink-extension": "^2.4",
+        "dmore/behat-chrome-extension": "^1.4",
+        "dmore/chrome-mink-driver": "^2.9",
+        "friends-of-behat/mink": "^1.11",
+        "friends-of-behat/mink-browserkit-driver": "^1.6",
+        "friends-of-behat/mink-debug-extension": "^2.1",
+        "friends-of-behat/mink-extension": "^2.7",
         "friends-of-behat/page-object-extension": "^0.3",
         "friends-of-behat/suite-settings-extension": "^1.0",
-        "friends-of-behat/symfony-extension": "^2.1",
-        "friends-of-behat/variadic-extension": "^1.3",
-        "phpspec/phpspec": "^7.5",
+        "friends-of-behat/symfony-extension": "^2.6",
+        "friends-of-behat/variadic-extension": "^1.6",
         "phpstan/extension-installer": "^1.0",
         "phpstan/phpstan": "^1.10",
         "phpstan/phpstan-doctrine": "1.3.40",
         "phpstan/phpstan-strict-rules": "^1.3.0",
         "phpstan/phpstan-webmozart-assert": "^1.2.0",
         "phpunit/phpunit": "^9.5",
         "polishsymfonycommunity/symfony-mocker-container": "^1.0",
-        "sylius-labs/coding-standard": "^4.2",
-        "symfony/browser-kit": "^5.4 || ^6.0",
-        "symfony/debug-bundle": "^5.4 || ^6.0",
-        "symfony/dotenv": "^5.4 || ^6.0",
-        "symfony/flex": "^2.2.2",
-        "symfony/intl": "^5.4 || ^6.0",
-        "symfony/web-profiler-bundle": "^5.4 || ^6.0",
-        "vimeo/psalm": "4.27.0"
-    },
-    "conflict": {
-        "behat/mink-selenium2-driver": ">=1.7.0",
-        "symfony/framework-bundle": "6.2.8",
-        "symfony/validator": "6.4.7"
+        "sylius/mailer-bundle":  "^1.8 || ^2.0@beta",
+        "sylius-labs/coding-standard": "^4.4",
+        "symfony/browser-kit": "^6.4 || ^7.1",
+        "symfony/debug-bundle": "^6.4 || ^7.1",
+        "symfony/dotenv": "^6.4 || ^7.1",
+        "symfony/flex": "^2.4",
+        "symfony/intl": "^6.4 || ^7.1",
+        "symfony/web-profiler-bundle": "^6.4 || ^7.1",
+        "nyholm/psr7": "^1.8"
     },
     "config": {
         "sort-packages": true,
         "allow-plugins": {
-            "dealerdirect/phpcodesniffer-composer-installer": false,
+            "dealerdirect/phpcodesniffer-composer-installer": true,
+            "php-http/discovery": true,
             "phpstan/extension-installer": true,
             "symfony/flex": true
         }
     },
     "extra": {
-        "branch-alias": {
-            "dev-master": "1.12-dev"
-        },
         "symfony": {
-            "require": "^5.4 || ^6.0"
+            "require": "^6.4 || ^7.1"
         }
     },
     "autoload": {
         "psr-4": {
-            "BitBag\\SyliusImojePlugin\\": "src/",
-            "Tests\\BitBag\\SyliusImojePlugin\\": "tests/"
+            "BitBag\\SyliusImojePlugin\\": "src/"
         }
     },
     "autoload-dev": {
-        "classmap": [
-            "tests/Application/Kernel.php"
-        ]
+        "psr-4": {
+            "Tests\\BitBag\\SyliusImojePlugin\\": [
+                "tests/",
+                "tests/Application/src"
+            ]
+        },
+        "classmap": ["tests/Application/Kernel.php"]
     },
     "scripts": {
         "post-install-cmd": [

config/config.yaml

@@ -0,0 +1,3 @@
+imports:
+    - { resource: services.yaml }
+    - { resource: twig_hooks.yaml }

config/services.yaml

@@ -0,0 +1,2 @@
+imports:
+    - { resource: services/*.yaml }

config/services/command_handlers.yaml

@@ -0,0 +1,32 @@
+services:
+    bitbag.sylius.command_handlers.imoje_paywall.capture:
+        class: BitBag\SyliusImojePlugin\CommandHandler\CapturePaymentRequestHandler
+        arguments:
+            - '@sylius.provider.payment_request'
+            - '@sylius_abstraction.state_machine'
+            - '@bitbag.imoje_plugin.resolver.signature_resolver'
+            - '@sylius_shop.provider.order_pay.payment_request_pay_url'
+        tags:
+            - name: messenger.message_handler
+              bus: sylius.payment_request.command_bus
+
+    bitbag.sylius.command_handlers.imoje_paywall.capture_end:
+        class: BitBag\SyliusImojePlugin\CommandHandler\CaptureEndPaymentRequestHandler
+        arguments:
+            - '@sylius.provider.payment_request'
+            - '@sylius_abstraction.state_machine'
+            - '@bitbag.sylius_imoje_plugin.processor.payment_transition'
+        tags:
+            -   name: messenger.message_handler
+                bus: sylius.payment_request.command_bus
+
+    bitbag.sylius.command_handlers.imoje_paywall.status:
+        class: BitBag\SyliusImojePlugin\CommandHandler\StatusPaymentRequestHandler
+        arguments:
+            - '@sylius.provider.payment_request'
+            - '@sylius_abstraction.state_machine'
+            - '@bitbag.sylius_imoje_plugin.processor.payment_transition'
+        tags:
+            -   name: messenger.message_handler
+                bus: sylius.payment_request.command_bus
+                handles: BitBag\SyliusImojePlugin\Command\StatusPaymentRequest