Skip to content

Commit 5f8825f

Browse files
committed
Upgrade to Sylius 1.11
1 parent ce1237a commit 5f8825f

34 files changed

Lines changed: 57 additions & 574 deletions

.github/workflows/build.yml

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,18 +21,12 @@ jobs:
2121
strategy:
2222
fail-fast: false
2323
matrix:
24-
php: ["8.0", "7.4"]
25-
symfony: ["^4.4", "^5.2"]
26-
sylius: ["~1.9.0", "~1.10.0@alpha"]
27-
node: ["10.x"]
24+
php: ["8.0"]
25+
symfony: ["5.4.*"]
26+
sylius: ["^1.11.2"]
27+
node: ["14.x"]
2828
mysql: ["8.0"]
2929

30-
exclude:
31-
-
32-
php: "8.0"
33-
sylius: "~1.9.0"
34-
35-
3630
env:
3731
APP_ENV: test
3832
DATABASE_URL: "mysql://root:root@127.0.0.1/sylius?serverVersion=${{ matrix.mysql }}"

UPGRADE.md

Lines changed: 0 additions & 122 deletions
This file was deleted.

composer.json

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
],
99
"license": "MIT",
1010
"require": {
11-
"php": "^7.4 || ^8.0",
11+
"php": "^8.0",
1212
"sandwich/vies-bundle": "^2.1",
13-
"sylius/sylius": "~1.9.0 || ~1.10.0@beta",
13+
"sylius/sylius": "^1.11.2",
1414
"webmozart/assert": "^1.9"
1515
},
1616
"require-dev": {
@@ -29,19 +29,20 @@
2929
"friendsofsymfony/oauth-server-bundle": "^1.6 || >2.0.0-alpha.0 ^2.0@dev",
3030
"phpspec/phpspec": "^7.0",
3131
"phpstan/extension-installer": "^1.0",
32-
"phpstan/phpstan": "0.12.85",
32+
"phpstan/phpstan": "0.12.99",
3333
"phpstan/phpstan-doctrine": "0.12.33",
3434
"phpstan/phpstan-strict-rules": "^0.12.0",
3535
"phpstan/phpstan-webmozart-assert": "0.12.12",
3636
"phpunit/phpunit": "^9.5",
3737
"sensiolabs/security-checker": "^6.0",
3838
"sylius-labs/coding-standard": "^4.0",
39-
"symfony/browser-kit": "^4.4 || ^5.2",
40-
"symfony/debug-bundle": "^4.4 || ^5.2",
41-
"symfony/dotenv": "^4.4 || ^5.2",
42-
"symfony/intl": "^4.4 || ^5.2",
43-
"symfony/web-profiler-bundle": "^4.4 || ^5.2",
44-
"vimeo/psalm": "4.7.1"
39+
"symfony/browser-kit": "^5.4",
40+
"symfony/debug-bundle": "^5.4",
41+
"symfony/dotenv": "^5.4",
42+
"symfony/intl": "^5.4",
43+
"symfony/web-profiler-bundle": "^5.4",
44+
"vimeo/psalm": "4.7.1",
45+
"polishsymfonycommunity/symfony-mocker-container": "^1.0"
4546
},
4647
"config": {
4748
"sort-packages": true,
@@ -53,7 +54,7 @@
5354
},
5455
"extra": {
5556
"branch-alias": {
56-
"dev-master": "1.10-dev"
57+
"dev-master": "1.11-dev"
5758
}
5859
},
5960
"autoload": {

tests/Application/.env

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,10 @@ JWT_PASSPHRASE=acme_plugin_development
2727
# Delivery is disabled by default via "null://localhost"
2828
MAILER_URL=smtp://localhost
2929
###< symfony/swiftmailer-bundle ###
30+
31+
###> symfony/messenger ###
32+
# Choose one of the transports below
33+
# MESSENGER_TRANSPORT_DSN=amqp://guest:guest@localhost:5672/%2f/messages
34+
MESSENGER_TRANSPORT_DSN=doctrine://default
35+
# MESSENGER_TRANSPORT_DSN=redis://localhost:6379/messages
36+
###< symfony/messenger ###

tests/Application/Kernel.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ protected function configureRoutes(RouteCollectionBuilder $routes): void
6767

6868
protected function getContainerBaseClass(): string
6969
{
70-
if ($this->isTestEnvironment()) {
70+
if ($this->isTestEnvironment() && class_exists(MockerContainer::class)) {
7171
return MockerContainer::class;
7272
}
7373

tests/Application/config/api_platform/.gitignore

Whitespace-only changes.

tests/Application/config/bundles.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,4 +55,7 @@
5555
SyliusLabs\DoctrineMigrationsExtraBundle\SyliusLabsDoctrineMigrationsExtraBundle::class => ['all' => true],
5656
Sandwich\ViesBundle\SandwichViesBundle::class => ['all' => true],
5757
Webgriffe\SyliusItalianInvoiceableOrderPlugin\WebgriffeSyliusItalianInvoiceableOrderPlugin::class => ['all' => true],
58+
BabDev\PagerfantaBundle\BabDevPagerfantaBundle::class => ['all' => true],
59+
SyliusLabs\Polyfill\Symfony\Security\Bundle\SyliusLabsPolyfillSymfonySecurityBundle::class => ['all' => true],
60+
Sylius\Calendar\SyliusCalendarBundle::class => ['all' => true],
5861
];

tests/Application/config/packages/_sylius.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@ sylius_shop:
1414
product_grid:
1515
include_all_descendants: true
1616

17+
sylius_api:
18+
enabled: true
19+
1720
sylius_addressing:
1821
resources:
1922
address:
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
api_platform:
2+
mapping:
3+
paths:
4+
- '%kernel.project_dir%/../../vendor/sylius/sylius/src/Sylius/Bundle/ApiBundle/Resources/config/api_resources'
5+
- '%kernel.project_dir%/config/api_platform'
6+
- '%kernel.project_dir%/src/Entity'
7+
patch_formats:
8+
json: ['application/merge-patch+json']
9+
swagger:
10+
versions: [3]

tests/Application/config/sylius/1.10/packages/dev/jms_serializer.yaml renamed to tests/Application/config/packages/dev/jms_serializer.yaml

File renamed without changes.

0 commit comments

Comments
 (0)