Skip to content

Commit

Permalink
Support Sylius 2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
stefandoorn committed Dec 18, 2024
1 parent b8dfe61 commit 538d72a
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 39 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ jobs:
strategy:
fail-fast: false
matrix:
php: ["8.1", "8.2", "8.3"]
symfony: ["^5.4", "^6.4"]
sylius: ["~1.13.0", "~1.14.0"]
php: ["8.2", "8.3"]
symfony: ["^6.4"]
sylius: ["~2.0.0"]
node: ["14.x"]
mysql: ["8.0"]

env:
APP_ENV: test
DATABASE_URL: "mysql://root:[email protected]/sylius?serverVersion=${{ matrix.mysql }}"
Expand Down
35 changes: 17 additions & 18 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,14 @@
"sylius-plugin"
],
"license": "MIT",
"conflict": {
"twig/twig": "<2.9"
},
"require": {
"php": "^7.4 || ^8.1",
"sylius/sylius": "~1.9.0 || ~1.10.0 || ~1.11.0 || ~1.12.0 || ~1.13.0 || ~1.14.0"
"php": "^8.2",
"sylius/sylius": "~2.0.0"
},
"require-dev": {
"api-platform/core": "~2.5.0 || ~2.6.0 || ~2.7.0",
"api-platform/core": "^2.7.0",
"lchrusciel/api-test-case": "^5.1",
"league/flysystem-bundle": "^2.0 || ^3.0",
"league/flysystem-bundle": "^3.0",
"matthiasnoback/symfony-dependency-injection-test": "^4.3",
"phpspec/phpspec": "^7.0",
"phpstan/extension-installer": "^1.0",
Expand All @@ -29,15 +26,16 @@
"phpunit/phpunit": "^9.5",
"sylius-labs/coding-standard": "^4.0",
"sylius/calendar": "^0.5.0",
"sylius/state-machine-abstraction": "^1.0",
"symfony/browser-kit": "^4.4 || ^5.4 || ^6.4",
"symfony/debug-bundle": "^4.4 || ^5.4 || ^6.4",
"symfony/dotenv": "^4.4 || ^5.4 || ^6.4",
"symfony/intl": "^4.4 || ^5.4 || ^6.4",
"symfony/runtime": "^4.4 || ^5.4 || ^6.4 || ^7.0",
"symfony/web-profiler-bundle": "^4.4 || ^5.4 || ^6.4",
"symfony/webpack-encore-bundle": "^1.15",
"vimeo/psalm": "4.23.0"
"sylius/twig-hooks": "^0.5.1",
"symfony/browser-kit": "^6.4",
"symfony/debug-bundle": "^6.4",
"symfony/dotenv": "^6.4",
"symfony/intl": "^6.4",
"symfony/runtime": "^6.4 || ^7.0",
"symfony/ux-icons": "^2.22",
"symfony/web-profiler-bundle": "^6.4",
"symfony/webpack-encore-bundle": "^1.15 || ^2.2",
"vimeo/psalm": "^4.0"
},
"config": {
"sort-packages": true,
Expand All @@ -46,12 +44,13 @@
"dealerdirect/phpcodesniffer-composer-installer": true,
"symfony/thanks": true,
"phpstan/extension-installer": true,
"symfony/runtime": true
"symfony/runtime": true,
"php-http/discovery": true
}
},
"extra": {
"branch-alias": {
"dev-master": "2.0-dev"
"dev-master": "3.0-dev"
}
},
"autoload": {
Expand Down
9 changes: 3 additions & 6 deletions tests/Application/config/bundles.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,6 @@
Sylius\Bundle\CoreBundle\SyliusCoreBundle::class => ['all' => true],
Sylius\Bundle\ResourceBundle\SyliusResourceBundle::class => ['all' => true],
Sylius\Bundle\GridBundle\SyliusGridBundle::class => ['all' => true],
winzou\Bundle\StateMachineBundle\winzouStateMachineBundle::class => ['all' => true],
Sonata\BlockBundle\SonataBlockBundle::class => ['all' => true],
Bazinga\Bundle\HateoasBundle\BazingaHateoasBundle::class => ['all' => true],
JMS\SerializerBundle\JMSSerializerBundle::class => ['all' => true],
FOS\RestBundle\FOSRestBundle::class => ['all' => true],
Knp\Bundle\GaufretteBundle\KnpGaufretteBundle::class => ['all' => true],
Knp\Bundle\MenuBundle\KnpMenuBundle::class => ['all' => true],
Liip\ImagineBundle\LiipImagineBundle::class => ['all' => true],
Expand All @@ -57,4 +52,6 @@
League\FlysystemBundle\FlysystemBundle::class => ['all' => true],
Sylius\Abstraction\StateMachine\SyliusStateMachineAbstractionBundle::class => ['all' => true],
Sylius\Calendar\SyliusCalendarBundle::class => ['all' => true],
];
Sylius\TwigHooks\SyliusTwigHooksBundle::class => ['all' => true],
Symfony\UX\Icons\UXIconsBundle::class => ['all' => true],
];
11 changes: 0 additions & 11 deletions tests/Application/config/packages/fos_rest.yaml

This file was deleted.

0 comments on commit 538d72a

Please sign in to comment.