From 80d4a902a2026494d1fbbd9467f68f2af1bb269e Mon Sep 17 00:00:00 2001
From: Mateusz Deszert-Klosowski <mateusz.deszert-klosowski@bitbag.pl>
Date: Thu, 14 Mar 2024 16:37:25 +0100
Subject: [PATCH] Fix 1.13

---
 .github/workflows/build.yml          |  5 +++--
 composer.json                        |  8 ++++++--
 tests/Application/config/bundles.php | 12 +++++++++---
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 53fe8f2a..1afb251a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -19,11 +19,11 @@ jobs:
         strategy:
             fail-fast: false
             matrix:
-                php: ["8.0", "8.1"]
+                php: ["8.1", "8.2"]
                 node: ["16.x"]
                 mysql: ["5.7", "8.0"]
                 symfony: ["^5.4", "^6.0"]
-                sylius: ["~1.12.0"]
+                sylius: ["~1.12.0", "1.13.x-dev"]
         env:
             APP_ENV: test
             DATABASE_URL: "mysql://root:root@127.0.0.1/sylius?serverVersion=${{ matrix.mysql }}"
@@ -149,6 +149,7 @@ jobs:
 
             -
                 name: Validate composer.json
+                if: ${{ matrix.sylius != '1.13.x-dev' }}
                 run: composer validate --ansi --strict
 
             -
diff --git a/composer.json b/composer.json
index 2bd8f17f..0043af1f 100644
--- a/composer.json
+++ b/composer.json
@@ -8,9 +8,10 @@
         "php": "^8.0",
         "doctrine/doctrine-migrations-bundle": "^3.0",
         "phpseclib/phpseclib": "^2.0",
+        "psr/http-client": "^1.0",
         "polishsymfonycommunity/symfony-mocker-container": "^1.0",
         "sylius-labs/doctrine-migrations-extra-bundle": "^0.1.4 || ^0.2",
-        "sylius/sylius": "~1.12.0",
+        "sylius/sylius": "~1.12.0 || 1.13.x-dev",
         "symfony/mailer": "^5.4 || ^6.0"
     },
     "require-dev": {
@@ -77,5 +78,8 @@
         ]
     },
     "prefer-stable": true,
-    "minimum-stability": "dev"
+    "minimum-stability": "dev",
+    "suggest": {
+        "php-http/guzzle6-adapter ":"Required to use this package on 32bit PHP"
+    }
 }
diff --git a/tests/Application/config/bundles.php b/tests/Application/config/bundles.php
index d260b314..4f4da692 100644
--- a/tests/Application/config/bundles.php
+++ b/tests/Application/config/bundles.php
@@ -1,6 +1,7 @@
 <?php
 
 use Sylius\Bundle\CoreBundle\Application\Kernel;
+use Sylius\Bundle\CoreBundle\SyliusCoreBundle;
 
 $bundles = [
     Symfony\Bundle\FrameworkBundle\FrameworkBundle::class => ['all' => true],
@@ -62,10 +63,15 @@
     Sylius\Calendar\SyliusCalendarBundle::class => ['all' => true],
 ];
 
-if (Kernel::MINOR_VERSION < 12) {
-    $bundles[Symfony\Bundle\SwiftmailerBundle\SwiftmailerBundle::class] = ['all' => true];
-} else {
+if (defined(SyliusCoreBundle::class.'::VERSION_ID') && SyliusCoreBundle::VERSION_ID >= '11200') {
     $bundles[League\FlysystemBundle\FlysystemBundle::class] = ['all' => true];
+} else {
+    $bundles[Symfony\Bundle\SwiftmailerBundle\SwiftmailerBundle::class] = ['all' => true];
+}
+
+
+if ( defined(SyliusCoreBundle::class.'::VERSION_ID') && SyliusCoreBundle::VERSION_ID >= '11300') {
+    $bundles[Sylius\Abstraction\StateMachine\SyliusStateMachineAbstractionBundle::class] = ['all' => true];
 }
 
 return $bundles;