Skip to content

Commit

Permalink
Fix 1.13
Browse files Browse the repository at this point in the history
  • Loading branch information
leszczuu committed Mar 14, 2024
1 parent 9ab11fd commit 80d4a90
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 7 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:[email protected]/sylius?serverVersion=${{ matrix.mysql }}"
Expand Down Expand Up @@ -149,6 +149,7 @@ jobs:

-
name: Validate composer.json
if: ${{ matrix.sylius != '1.13.x-dev' }}
run: composer validate --ansi --strict

-
Expand Down
8 changes: 6 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down Expand Up @@ -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"
}
}
12 changes: 9 additions & 3 deletions tests/Application/config/bundles.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?php

use Sylius\Bundle\CoreBundle\Application\Kernel;
use Sylius\Bundle\CoreBundle\SyliusCoreBundle;

$bundles = [
Symfony\Bundle\FrameworkBundle\FrameworkBundle::class => ['all' => true],
Expand Down Expand Up @@ -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;

0 comments on commit 80d4a90

Please sign in to comment.