diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 225a00a02b..30eb16b30e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -27,14 +27,10 @@ jobs: strategy: fail-fast: false matrix: - php: ["8.0", "8.1"] + php: ["8.1", "8.2"] symfony: ["^5.4", "^6.4"] - node: ["16.x"] - mysql: ["5.7", "8.0"] - exclude: - - - php: "8.0" - symfony: "^6.4" + node: ["18.x"] + mysql: ["8.0"] env: APP_ENV: test_cached diff --git a/composer.json b/composer.json index 54530b57c3..b24c9c06a4 100644 --- a/composer.json +++ b/composer.json @@ -24,12 +24,13 @@ } ], "require": { - "php": "^8.0", - "sylius/paypal-plugin": "^1.5.2", + "php": "^8.1", + "sylius/paypal-plugin": "^1.6", + "sylius/state-machine-abstraction": "~1.13.0", "sylius/sylius": "~1.12.17", "symfony/dotenv": "^5.4 || ^6.4", - "symfony/runtime": "^5.4 || ^6.4", - "symfony/flex": "^2.4" + "symfony/flex": "^2.4", + "symfony/runtime": "^5.4 || ^6.4" }, "require-dev": { "behat/behat": "^3.7", @@ -46,6 +47,7 @@ "friends-of-behat/symfony-extension": "^2.1", "friends-of-behat/variadic-extension": "^1.3", "lchrusciel/api-test-case": "^5.0", + "nyholm/psr7": "^1.8", "phpspec/phpspec": "^7.0", "phpstan/extension-installer": "^1.0", "phpstan/phpstan": "^1.8.4", @@ -59,6 +61,7 @@ "sylius/sylius-rector": "^2.0", "symfony/browser-kit": "^5.4 || ^6.4", "symfony/debug-bundle": "^5.4 || ^6.4", + "symfony/http-client": "^5.4 || ^6.4", "symfony/intl": "^5.4 || ^6.4", "symfony/web-profiler-bundle": "^5.4 || ^6.4" }, @@ -74,7 +77,7 @@ "allow-plugins": { "symfony/flex": true, "dealerdirect/phpcodesniffer-composer-installer": false, - "php-http/discovery": true, + "php-http/discovery": false, "phpstan/extension-installer": false, "symfony/thanks": false, "symfony/runtime": true diff --git a/config/bundles.php b/config/bundles.php index 08f9762a40..bec7472278 100644 --- a/config/bundles.php +++ b/config/bundles.php @@ -6,6 +6,7 @@ Symfony\Bundle\SecurityBundle\SecurityBundle::class => ['all' => true], Symfony\Bundle\TwigBundle\TwigBundle::class => ['all' => true], Doctrine\Bundle\DoctrineBundle\DoctrineBundle::class => ['all' => true], + Sylius\Abstraction\StateMachine\SyliusStateMachineAbstractionBundle::class => ['all' => true], Sylius\Calendar\SyliusCalendarBundle::class => ['all' => true], Sylius\Bundle\OrderBundle\SyliusOrderBundle::class => ['all' => true], Sylius\Bundle\MoneyBundle\SyliusMoneyBundle::class => ['all' => true], diff --git a/config/packages/http_discovery.yaml b/config/packages/http_discovery.yaml new file mode 100644 index 0000000000..2a789e73c9 --- /dev/null +++ b/config/packages/http_discovery.yaml @@ -0,0 +1,10 @@ +services: + Psr\Http\Message\RequestFactoryInterface: '@http_discovery.psr17_factory' + Psr\Http\Message\ResponseFactoryInterface: '@http_discovery.psr17_factory' + Psr\Http\Message\ServerRequestFactoryInterface: '@http_discovery.psr17_factory' + Psr\Http\Message\StreamFactoryInterface: '@http_discovery.psr17_factory' + Psr\Http\Message\UploadedFileFactoryInterface: '@http_discovery.psr17_factory' + Psr\Http\Message\UriFactoryInterface: '@http_discovery.psr17_factory' + + http_discovery.psr17_factory: + class: Http\Discovery\Psr17Factory diff --git a/config/packages/workflow.yaml b/config/packages/workflow.yaml new file mode 100644 index 0000000000..855df59cda --- /dev/null +++ b/config/packages/workflow.yaml @@ -0,0 +1,2 @@ +framework: + workflows: null diff --git a/symfony.lock b/symfony.lock index 38466de000..a03cd337ad 100644 --- a/symfony.lock +++ b/symfony.lock @@ -320,6 +320,18 @@ "phar-io/version": { "version": "1.0.1" }, + "php-http/discovery": { + "version": "1.19", + "recipe": { + "repo": "github.com/symfony/recipes", + "branch": "main", + "version": "1.18", + "ref": "f45b5dd173a27873ab19f5e3180b2f661c21de02" + }, + "files": [ + "config/packages/http_discovery.yaml" + ] + }, "php-http/guzzle6-adapter": { "version": "v1.1.1" }, @@ -536,6 +548,15 @@ "sylius/resource-bundle": { "version": "v1.4.4" }, + "sylius/state-machine-abstraction": { + "version": "1.13", + "recipe": { + "repo": "github.com/Sylius/SyliusRecipes", + "branch": "main", + "version": "1.13", + "ref": "d538f7c966e2d796543c3be72cb65072bf74504e" + } + }, "sylius/sylius": { "version": "v1.3.6" }, @@ -689,6 +710,15 @@ "symfony/options-resolver": { "version": "v4.1.3" }, + "symfony/panther": { + "version": "2.1", + "recipe": { + "repo": "github.com/symfony/recipes", + "branch": "main", + "version": "1.0", + "ref": "673836afb0eac2b0ec36c44f2ff0379e5a4b2177" + } + }, "symfony/password-hasher": { "version": "v5.3.2" }, @@ -831,6 +861,18 @@ "webpack.config.js" ] }, + "symfony/workflow": { + "version": "6.4", + "recipe": { + "repo": "github.com/symfony/recipes", + "branch": "main", + "version": "3.3", + "ref": "3b2f8ca32a07fcb00f899649053943fa3d8bbfb6" + }, + "files": [ + "config/packages/workflow.yaml" + ] + }, "symfony/yaml": { "version": "v4.1.3" },