Skip to content

Commit acf9797

Browse files
lruozzi9lruozzi9
committed
Upgrade for Sylius 1.13
1 parent 69cba0e commit acf9797

File tree

4 files changed

+48
-33
lines changed

4 files changed

+48
-33
lines changed

‎.github/workflows/build.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ jobs:
2121
strategy:
2222
fail-fast: false
2323
matrix:
24-
php: ["8.0", "8.1"]
25-
symfony: ["5.4.*", "^6.0"]
26-
sylius: ["^1.12"]
24+
php: ["8.1", "8.2", "8.3"]
25+
symfony: ["5.4.*", "^6.4"]
26+
sylius: ["^1.12.0", "^1.13.1"]
2727
node: ["18.x"]
28-
mysql: ["5.7", "8.0"]
28+
mysql: ["8.0"]
2929

3030
env:
3131
APP_ENV: test
@@ -46,7 +46,7 @@ jobs:
4646

4747
-
4848
name: Setup Node
49-
uses: actions/setup-node@v1
49+
uses: actions/setup-node@v4
5050
with:
5151
node-version: "${{ matrix.node }}"
5252

@@ -84,7 +84,7 @@ jobs:
8484

8585
-
8686
name: Cache Composer
87-
uses: actions/cache@v2
87+
uses: actions/cache@v4
8888
with:
8989
path: ${{ steps.composer-cache.outputs.dir }}
9090
key: ${{ runner.os }}-php-${{ matrix.php }}-composer-${{ hashFiles('**/composer.json **/composer.lock') }}
@@ -121,7 +121,7 @@ jobs:
121121

122122
-
123123
name: Cache Yarn
124-
uses: actions/cache@v2
124+
uses: actions/cache@v4
125125
with:
126126
path: ${{ steps.yarn-cache.outputs.dir }}
127127
key: ${{ runner.os }}-node-${{ matrix.node }}-yarn-${{ hashFiles('**/package.json **/yarn.lock') }}

‎behat.yml.dist

Lines changed: 26 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,15 @@ imports:
33
- tests/Behat/Resources/suites.yml
44

55
default:
6+
formatters:
7+
pretty:
8+
verbose: true
9+
paths: false
10+
snippets: false
11+
612
extensions:
713
DMore\ChromeExtension\Behat\ServiceContainer\ChromeExtension: ~
14+
Robertfausk\Behat\PantherExtension: ~
815

916
FriendsOfBehat\MinkDebugExtension:
1017
directory: etc/build
@@ -15,32 +22,30 @@ default:
1522
files_path: "%paths.base%/tests/Behat/Resources/fixtures/"
1623
base_url: "https://127.0.0.1:8080/"
1724
default_session: symfony
18-
javascript_session: chrome_headless
25+
javascript_session: chromedriver
1926
sessions:
2027
symfony:
2128
symfony: ~
22-
chrome_headless:
29+
chromedriver:
2330
chrome:
2431
api_url: http://127.0.0.1:9222
2532
validate_certificate: false
26-
chrome:
27-
selenium2:
28-
browser: chrome
29-
capabilities:
30-
browserName: chrome
31-
browser: chrome
32-
version: ""
33-
marionette: null # https://github.com/Behat/MinkExtension/pull/311
34-
chrome:
35-
switches:
36-
- "start-fullscreen"
37-
- "start-maximized"
38-
- "no-sandbox"
39-
extra_capabilities:
33+
chrome_headless_second_session:
34+
chrome:
35+
api_url: http://127.0.0.1:9222
36+
validate_certificate: false
37+
panther:
38+
panther:
39+
manager_options:
40+
connection_timeout_in_ms: 5000
41+
request_timeout_in_ms: 120000
42+
chromedriver_arguments:
43+
- --log-path=etc/build/chromedriver.log
44+
- --verbose
45+
capabilities:
46+
acceptSslCerts: true
47+
acceptInsecureCerts: true
4048
unexpectedAlertBehaviour: accept
41-
firefox:
42-
selenium2:
43-
browser: firefox
4449
show_auto: false
4550

4651
FriendsOfBehat\SymfonyExtension:
@@ -53,3 +58,5 @@ default:
5358
FriendsOfBehat\SuiteSettingsExtension:
5459
paths:
5560
- "features"
61+
62+
SyliusLabs\SuiteTagsExtension: ~

‎composer.json

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,17 @@
99
],
1010
"license": "MIT",
1111
"require": {
12-
"php": "^8.0",
13-
"sylius/sylius": "^1.12",
12+
"php": "^8.1",
1413
"ext-json": "*",
14+
"sylius/sylius": "^1.12",
1515
"symfony/serializer": "^5.0 || ^6.0",
16-
"sylius/mailer-bundle": "^1.8 || ^2.0@beta",
1716
"symfony/lock": "^5.4 || ^6.0",
1817
"symfony/webpack-encore-bundle": "^1.15"
1918
},
2019
"require-dev": {
2120
"behat/behat": "^3.6.1",
22-
"behat/mink-selenium2-driver": "^1.4",
21+
"behat/mink-selenium2-driver": "^1.6",
22+
"dbrekelmans/bdi": "^1.1",
2323
"dmore/behat-chrome-extension": "^1.3",
2424
"dmore/chrome-mink-driver": "^2.7",
2525
"flow/jsonpath": "^0.5.0",
@@ -37,16 +37,19 @@
3737
"phpstan/phpstan-doctrine": "1.3.16",
3838
"phpstan/phpstan-strict-rules": "^1.3.0",
3939
"phpstan/phpstan-webmozart-assert": "^1.2.0",
40-
"phpunit/phpunit": "^9.5",
40+
"phpunit/phpunit": "^9.6 || ^10.5",
4141
"polishsymfonycommunity/symfony-mocker-container": "^1.0",
42+
"rector/rector": "^0.15.0",
43+
"robertfausk/behat-panther-extension": "^1.1",
4244
"sylius-labs/coding-standard": "^4.2",
45+
"sylius-labs/suite-tags-extension": "^0.2",
4346
"symfony/browser-kit": "^5.4 || ^6.0",
4447
"symfony/debug-bundle": "^5.4 || ^6.0",
4548
"symfony/dotenv": "^5.4 || ^6.0",
4649
"symfony/flex": "^2.2.2",
4750
"symfony/intl": "^5.4 || ^6.0",
4851
"symfony/web-profiler-bundle": "^5.4 || ^6.0",
49-
"vimeo/psalm": "4.27.0"
52+
"vimeo/psalm": "^4.27"
5053
},
5154
"config": {
5255
"sort-packages": true,

‎tests/Application/config/bundles.php

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22

3-
return [
3+
$bundles = [
44
Symfony\Bundle\FrameworkBundle\FrameworkBundle::class => ['all' => true],
55
Symfony\Bundle\MonologBundle\MonologBundle::class => ['all' => true],
66
Symfony\Bundle\SecurityBundle\SecurityBundle::class => ['all' => true],
@@ -59,3 +59,8 @@
5959
Symfony\WebpackEncoreBundle\WebpackEncoreBundle::class => ['all' => true],
6060
League\FlysystemBundle\FlysystemBundle::class => ['all' => true],
6161
];
62+
if (class_exists(Sylius\Abstraction\StateMachine\SyliusStateMachineAbstractionBundle::class)) {
63+
$bundles[Sylius\Abstraction\StateMachine\SyliusStateMachineAbstractionBundle::class] = ['all' => true];
64+
}
65+
66+
return $bundles;

0 commit comments

Comments
 (0)