Skip to content
This repository was archived by the owner on Aug 5, 2024. It is now read-only.

Commit 04a2585

Browse files
authored
Merge pull request #3 from em411/feature/sylius-1.10
Update to 1.10
2 parents b8a5e12 + 6e0b6c2 commit 04a2585

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+611
-14085
lines changed

.github/workflows/build.yml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,14 @@ jobs:
2121
strategy:
2222
fail-fast: false
2323
matrix:
24-
php: ["8.0", "7.4"]
24+
php: ["7.4"]
2525
symfony: ["^4.4", "^5.2"]
26-
sylius: ["~1.9.0", "~1.10.0"]
26+
sylius: ["~1.9.6", "~1.10.0"]
2727
node: ["10.x"]
2828
mysql: ["8.0"]
2929

3030
exclude:
31-
- sylius: ~1.9.0
32-
php: 8.0
33-
34-
- sylius: ~1.10.0
31+
- sylius: 1.10.0
3532
symfony: 4.4
3633

3734
env:

behat.yml.dist

Lines changed: 9 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4,35 +4,25 @@ imports:
44

55
default:
66
extensions:
7-
Lakion\Behat\MinkDebugExtension:
7+
DMore\ChromeExtension\Behat\ServiceContainer\ChromeExtension: ~
8+
9+
FriendsOfBehat\MinkDebugExtension:
810
directory: etc/build
911
clean_start: false
1012
screenshot: true
1113

1214
Behat\MinkExtension:
1315
files_path: "%paths.base%/vendor/sylius/sylius/src/Sylius/Behat/Resources/fixtures/"
14-
base_url: "http://localhost:8080/"
16+
base_url: "https://127.0.0.1:8080/"
1517
default_session: symfony
16-
javascript_session: chrome
18+
javascript_session: chrome_headless
1719
sessions:
1820
symfony:
1921
symfony: ~
20-
chrome:
21-
selenium2:
22-
browser: chrome
23-
capabilities:
24-
browserName: chrome
25-
browser: chrome
26-
version: ""
27-
marionette: null # https://github.com/Behat/MinkExtension/pull/311
28-
chrome:
29-
switches:
30-
- "start-fullscreen"
31-
- "start-maximized"
32-
- "no-sandbox"
33-
firefox:
34-
selenium2:
35-
browser: firefox
22+
chrome_headless:
23+
chrome:
24+
api_url: http://127.0.0.1:9222
25+
validate_certificate: false
3626
show_auto: false
3727

3828
FriendsOfBehat\SymfonyExtension:

composer.json

Lines changed: 28 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -5,36 +5,40 @@
55
"description": "Coinbase payment plugin for Sylius applications.",
66
"license": "MIT",
77
"require": {
8-
"php": "^7.2",
9-
10-
"sylius/sylius": "^1.4.0",
8+
"php": "^7.3 || ^7.4",
9+
"sylius/sylius": "~1.9.0 || ~1.10.0",
1110
"coinbase/coinbase-commerce": "^1.0",
1211
"ext-json": "*"
1312
},
1413
"require-dev": {
15-
"behat/behat": "^3.4",
16-
"behat/mink": "^1.7@dev",
17-
"behat/mink-browserkit-driver": "^1.3",
18-
"behat/mink-extension": "^2.2",
19-
"behat/mink-selenium2-driver": "^1.3",
14+
"behat/behat": "^3.6.1",
15+
"behat/mink-selenium2-driver": "^1.4",
16+
"dmore/behat-chrome-extension": "^1.3",
17+
"dmore/chrome-mink-driver": "^2.7",
18+
"friends-of-behat/mink": "^1.8",
19+
"friends-of-behat/mink-browserkit-driver": "^1.4",
20+
"friends-of-behat/mink-debug-extension": "^2.0.0",
21+
"friends-of-behat/mink-extension": "^2.4",
2022
"friends-of-behat/page-object-extension": "^0.3",
2123
"friends-of-behat/suite-settings-extension": "^1.0",
22-
"friends-of-behat/symfony-extension": "^2.0",
23-
"friends-of-behat/variadic-extension": "^1.1",
24-
"lakion/mink-debug-extension": "^1.2.3",
25-
"phpspec/phpspec": "^5.0",
26-
"phpstan/phpstan-doctrine": "^0.10",
27-
"phpstan/phpstan-shim": "^0.10",
28-
"phpstan/phpstan-webmozart-assert": "^0.10",
29-
"phpunit/phpunit": "^6.5",
30-
"sensiolabs/security-checker": "^5.0",
31-
"sylius-labs/coding-standard": "^2.0",
32-
"symfony/browser-kit": "^3.4|^4.1",
33-
"symfony/debug-bundle": "^3.4|^4.1",
34-
"symfony/dotenv": "^4.2",
35-
"symfony/intl": "^3.4|^4.1",
36-
"symfony/web-profiler-bundle": "^3.4|^4.1",
37-
"symfony/web-server-bundle": "^3.4|^4.1"
24+
"friends-of-behat/symfony-extension": "^2.1",
25+
"friends-of-behat/variadic-extension": "^1.3",
26+
"friendsofsymfony/oauth-server-bundle": "^1.6 || >2.0.0-alpha.0 ^2.0@dev",
27+
"phpspec/phpspec": "^7.0",
28+
"phpstan/extension-installer": "^1.0",
29+
"phpstan/phpstan": "0.12.85",
30+
"phpstan/phpstan-doctrine": "0.12.33",
31+
"phpstan/phpstan-strict-rules": "^0.12.0",
32+
"phpstan/phpstan-webmozart-assert": "0.12.12",
33+
"phpunit/phpunit": "^9.5",
34+
"sensiolabs/security-checker": "^6.0",
35+
"sylius-labs/coding-standard": "^4.0",
36+
"symfony/browser-kit": "^4.4 || ^5.2",
37+
"symfony/debug-bundle": "^4.4 || ^5.2",
38+
"symfony/dotenv": "^4.4 || ^5.2",
39+
"symfony/intl": "^4.4 || ^5.2",
40+
"symfony/web-profiler-bundle": "^4.4 || ^5.2",
41+
"vimeo/psalm": "4.7.1"
3842
},
3943
"conflict": {
4044
"symfony/symfony": "4.1.8",

0 commit comments

Comments
 (0)