Merge pull request #58 from tomkalon/OP-556

OP-556 - Adding Sylius 2.0 support

Author: senghe

.github/workflows/build.yml

@@ -20,19 +20,12 @@ 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" ]
+                php: [ "8.2", "8.3" ]
+                symfony: ["^6.4", "^7.1" ]
+                sylius: [ "~2.0.0" ]
+                node: [ "20.x", "22.x" ]
                 mysql: [ "8.0" ]
 
-                exclude:
-                    - sylius: ^1.13
-                      php: 8.0
-                    - sylius: ^1.12
-                      php: 8.0
-                      symfony: ^6.4
-
         env:
             APP_ENV: test
             DATABASE_URL: "mysql://root:root@127.0.0.1/sylius?serverVersion=${{ matrix.mysql }}"

.github/workflows/coding_standard.yml

@@ -18,17 +18,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" ]
-
-        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.0" ]
+          node: [ "20.x", "22.x" ]
+          mysql: [ "8.0" ]
 
     steps:
       - uses: actions/checkout@v3

README.md

@@ -80,12 +80,12 @@ For the full installation guide, please go [here](doc/installation.md).
 
 We work on stable, supported and up-to-date versions of packages. We recommend you to do the same.
 
-| Package       | Version         |
-|---------------|-----------------|
-| PHP           | \>=8.0          |
-| sylius/sylius | 1.12.x - 1.13.x |
-| MySQL         | \>= 5.7         |
-| NodeJS        | \>= 18.x        |
+| Package       | Version       |
+|---------------|---------------|
+| PHP           | 8.2, 8.3      |
+| sylius/sylius | 2.0.x         |
+| MySQL         | \>= 8.0       |
+| NodeJS        | \>=20.x, 22.x |
 
 ----
 

composer.json

@@ -4,50 +4,59 @@
     "description": "Shipping data export environment for Sylius platform applications",
     "license": "MIT",
     "require": {
-        "php": "^8.0",
-        "doctrine/dbal": "^2.7 || ^3.0",
-        "sylius/sylius": "~1.12.0 || ~1.13.0"
+        "php": "^8.2",
+        "sylius/sylius": "~2.0.0",
+        "dompdf/dompdf": "^2.0",
+        "sylius/twig-hooks": "^0.5",
+        "sylius/twig-extra": "^0.5",
+        "symfony/ux-autocomplete": "^2.17",
+        "symfony/ux-live-component": "^2.20",
+        "symfony/ux-twig-component": "^2.20",
+        "symfony/webpack-encore-bundle": "^2.1",
+        "symfony/stimulus-bundle": "^2.12"
     },
     "require-dev": {
-        "behat/behat": "^3.7",
+        "behat/behat": "^3.14",
         "behat/mink-selenium2-driver": "~1.6.0",
-        "symfony/webpack-encore-bundle": "^1.15",
-        "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",
-        "friends-of-behat/mink-extension": "^2.4",
+        "bitbag/coding-standard": "^3.0.0",
+        "dmore/behat-chrome-extension": "^1.4",
+        "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",
+        "friends-of-behat/suite-settings-extension": "^1.1",
+        "friends-of-behat/symfony-extension": "^2.6",
+        "friends-of-behat/variadic-extension": "^1.6",
+        "gedmo/doctrine-extensions": "^3.9",
+        "lchrusciel/api-test-case": "^4.1 || ^5.0",
+        "league/flysystem-bundle": "^3.3",
+        "nelmio/alice": "^3.10",
+        "nyholm/psr7": "^1.8",
         "phpspec/phpspec": "^7.0",
-        "phpstan/extension-installer": "^1.0",
-        "phpstan/phpstan": "^1.8.1",
-        "phpstan/phpstan-doctrine": "1.3.69",
-        "phpstan/phpstan-strict-rules": "^1.3.0",
-        "phpstan/phpstan-webmozart-assert": "^1.2.0",
         "phpunit/phpunit": "^9.5",
-        "sylius-labs/coding-standard": "^4.0",
-        "symfony/browser-kit": "^5.4 || ^6.0",
-        "symfony/debug-bundle": "^5.4 || ^6.0",
-        "symfony/dotenv": "^5.4 || ^6.0",
-        "symfony/intl": "^5.4 || ^6.0",
-        "symfony/web-profiler-bundle": "^5.4 || ^6.0",
-        "polishsymfonycommunity/symfony-mocker-container": "^1.0"
-    },
-    "conflict": {
-      "doctrine/persistence": "<3.0"
+        "polishsymfonycommunity/symfony-mocker-container": "^1.0",
+        "robertfausk/behat-panther-extension": "^1.1",
+        "sylius-labs/coding-standard": "^4.4",
+        "sylius-labs/suite-tags-extension": "~0.2",
+        "sylius/mailer-bundle": "^1.8 || ^2.0@beta",
+        "sylius/sylius-rector": "^2.0",
+        "symfony/browser-kit": "^6.4 || ^7.1",
+        "symfony/debug-bundle": "^6.4 || ^7.1",
+        "symfony/dependency-injection": "^6.4 || ^7.1",
+        "symfony/dotenv": "^6.4 || ^7.1",
+        "symfony/http-client": "^6.4 || ^7.1",
+        "symfony/intl": "^6.4 || ^7.1",
+        "symfony/web-profiler-bundle": "^6.4 || ^7.1"
     },
     "config": {
         "sort-packages": true,
         "allow-plugins": {
             "symfony/thanks": true,
             "composer/package-versions-deprecated": true,
             "dealerdirect/phpcodesniffer-composer-installer": true,
-            "phpstan/extension-installer": true
+            "phpstan/extension-installer": true,
+            "php-http/discovery": true
         }
     },
     "autoload": {

doc/installation.md

@@ -13,12 +13,12 @@ ADDITIONAL
 ## Requirements:
 We work on stable, supported and up-to-date versions of packages. We recommend you to do the same.
 
-| Package       | Version         |
-|---------------|-----------------|
-| PHP           | \>=8.0          |
-| sylius/sylius | 1.12.x - 1.13.x |
-| MySQL         | \>= 5.7         |
-| NodeJS        | \>= 18.x        |
+| Package       | Version       |
+|---------------|---------------|
+| PHP           | 8.2, 8.3      |
+| sylius/sylius | 2.0.x         |
+| MySQL         | \>= 8.0       |
+| NodeJS        | \>=20.x, 22.x |
 
 ## Composer:
 ```bash

phpstan.neon

@@ -4,6 +4,9 @@ parameters:
     paths:
         - src
 
+    reportUnmatchedIgnoredErrors: false
+    treatPhpDocTypesAsCertain: false
+
     excludePaths:
         # Makes PHPStan crash
         - 'src/DependencyInjection/Configuration.php'

src/EventListener/Grid/AdminShippingGatewayGridEventListener.php

@@ -37,7 +37,7 @@ public function editActionLinks(GridDefinitionConverterEvent $event): void
         foreach ($this->shippingGateways as $shippingGatewayType => $shippingGatewayLabel) {
             $options['links'][$shippingGatewayType] = [
                 'label' => $shippingGatewayLabel,
-                'icon' => 'plus',
+                'icon' => 'tabler:plus',
                 'route' => 'bitbag_admin_shipping_gateway_create',
                 'parameters' => [
                     'code' => $shippingGatewayType,

src/Repository/ShippingGatewayRepositoryInterface.php

@@ -19,7 +19,6 @@
 
 /**
  * @template T of ResourceInterface
- * @extends RepositoryInterface<T>
  */
 interface ShippingGatewayRepositoryInterface extends RepositoryInterface
 {

src/Resources/config/config.yml

@@ -2,3 +2,4 @@ imports:
     - { resource: "resource/**/*.yml" }
     - { resource: "grids/**/*.yml" }
     - { resource: "services.yml" }
+    - { resource: "@BitBagSyliusShippingExportPlugin/Resources/config/twig_hooks/twig_hooks.yaml" }

src/Resources/config/grids/bitbag_shipping_gateway.yml

@@ -29,9 +29,9 @@ sylius_grid:
                         label: sylius.ui.create
                         options:
                             class: primary
-                            icon: plus
+                            icon: "tabler:plus"
                             header:
-                                icon: cube
+                                icon: "tabler:cube"
                                 label: sylius.ui.type
                             links:
                 item: