Merge pull request #12 from SzymonKostrubiec/op-268

op-268 Integration fix
BitBagCommerce · May 7, 2024 · a20a35b · a20a35b
2 parents c04ae2a + 0926e4e
commit a20a35b
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 7 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -23,7 +23,7 @@ jobs:
             matrix:
                 php: [ "8.1" ]
                 symfony: [ "5.4.*", "^6.0" ]
-                sylius: [ "^1.12" ]
+                sylius: ["~1.12.0", "1.13.0"]
                 node: [ "14.x" ]
                 mysql: [ "8.0" ]
 
@@ -154,6 +154,7 @@ jobs:
 
             -
                 name: Validate composer.json
+                if: ${{ matrix.sylius != '1.13.0' }}
                 run: composer validate --ansi --strict
 
             -

diff --git a/composer.json b/composer.json
@@ -9,7 +9,7 @@
     "license": "MIT",
     "require": {
         "php": "^8.1",
-        "sylius/sylius": "^1.12",
+        "sylius/sylius": ">=1.12.13 || ~1.13.0",
         "sylius/mailer-bundle":  "^1.8 || ^2.0@beta",
         "symfony/webpack-encore-bundle": "^1.15"
     },
@@ -44,7 +44,8 @@
         "vimeo/psalm": "5.12.0"
     },
     "conflict": {
-        "symfony/framework-bundle": "6.2.8"
+        "symfony/framework-bundle": "6.2.8",
+        "symfony/validator": "6.4.7"
     },
     "config": {
         "sort-packages": true,

diff --git a/config/services/action.xml b/config/services/action.xml
@@ -11,17 +11,17 @@
             <tag name="payum.action" factory="imoje" alias="payum.action.capture"/>
         </service>
 
-        <service id="bitbag.payu_plugin.action.status" class="BitBag\SyliusImojePlugin\Action\StatusAction">
+        <service id="bitbag.imoje_plugin.action.status" class="BitBag\SyliusImojePlugin\Action\StatusAction">
             <tag name="payum.action" factory="imoje" alias="payum.action.status"/>
         </service>
 
-        <service id="bitbag.payu_plugin.action.notify" class="BitBag\SyliusImojePlugin\Action\NotifyAction">
+        <service id="bitbag.imoje_plugin.action.notify" class="BitBag\SyliusImojePlugin\Action\NotifyAction">
             <argument type="service" id="request_stack"/>
             <argument type="service" id="bitbag.imoje_plugin.resolver.signature_resolver"/>
             <tag name="payum.action" factory="imoje" alias="payum.action.notify"/>
         </service>
 
-        <service id="bitbag.payu_plugin.action.convert_payment" class="BitBag\SyliusImojePlugin\Action\ConvertPaymentAction">
+        <service id="bitbag.imoje_plugin.action.convert_payment" class="BitBag\SyliusImojePlugin\Action\ConvertPaymentAction">
             <tag name="payum.action" factory="imoje" alias="payum.action.convert_payment"/>
         </service>
     </services>

diff --git a/tests/Application/config/bundles.php b/tests/Application/config/bundles.php
@@ -1,6 +1,8 @@
 <?php
 
-return [
+use Sylius\Bundle\CoreBundle\SyliusCoreBundle;
+
+$bundles = [
     Symfony\Bundle\FrameworkBundle\FrameworkBundle::class => ['all' => true],
     Symfony\Bundle\MonologBundle\MonologBundle::class => ['all' => true],
     Symfony\Bundle\SecurityBundle\SecurityBundle::class => ['all' => true],
@@ -59,3 +61,9 @@
     Symfony\WebpackEncoreBundle\WebpackEncoreBundle::class => ['all' => true],
     League\FlysystemBundle\FlysystemBundle::class => ['all' => true],
 ];
+
+if ( defined(SyliusCoreBundle::class.'::VERSION_ID') && SyliusCoreBundle::VERSION_ID >= '11300') {
+    $bundles[Sylius\Abstraction\StateMachine\SyliusStateMachineAbstractionBundle::class] = ['all' => true];
+}
+
+return $bundles;