Skip to content

Commit

Permalink
Merge pull request #27 from tomkalon/feature/OP-374
Browse files Browse the repository at this point in the history
Feature/op 374 # Added Sylius 1.13 support
  • Loading branch information
senghe authored Sep 1, 2024
2 parents 5dbb29d + 2d2bb39 commit 1f0dc58
Show file tree
Hide file tree
Showing 84 changed files with 797 additions and 400 deletions.
22 changes: 11 additions & 11 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,23 +21,23 @@ jobs:
strategy:
fail-fast: false
matrix:
php: [ "8.0" ]
php: [ "8.0", "8.1", "8.2", "8.3" ]
symfony: [ "^5.4", "^6.0" ]
sylius: [ "~1.11.0", "~1.12.0" ]
node: [ "^14.17.x" ]
sylius: [ "~1.12.0", "~1.13.0" ]
node: [ "^18.x", "20.x" ]
mysql: [ "8.0" ]

exclude:
- sylius: ~1.11.0
symfony: "^6.0"

- sylius: "~1.13.0"
php: "8.0"
env:
APP_ENV: test
DATABASE_URL: "mysql://root:[email protected]/sylius?serverVersion=${{ matrix.mysql }}"

steps:
-
uses: actions/checkout@v2
uses: actions/checkout@v3

-
name: Setup PHP
Expand All @@ -50,14 +50,14 @@ jobs:

-
name: Setup Node
uses: actions/setup-node@v1
uses: actions/setup-node@v4
with:
node-version: "${{ matrix.node }}"

-
name: Shutdown default MySQL
run: sudo service mysql stop

-
name: Setup MySQL
uses: mirromutth/[email protected]
Expand Down Expand Up @@ -180,7 +180,7 @@ jobs:
path: etc/build/
if-no-files-found: ignore

-
-
name: Failed build Slack notification
uses: rtCamp/action-slack-notify@v2
if: ${{ failure() && (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master') }}
Expand Down
26 changes: 12 additions & 14 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@
"require": {
"php": "^8.0",
"bitbag/shipping-export-plugin": "^3.0",
"sylius/sylius": "~1.11.0 || ~1.12.0"
"sylius/sylius": "~1.12.0 || ~1.13.0"
},
"require-dev": {
"behat/behat": "^3.6.1",
"behat/mink-selenium2-driver": "^1.4",
"bitbag/coding-standard": "^1.0.0 || ^2.0.0 ",
"behat/behat": "^3.7",
"behat/mink-selenium2-driver": "~1.6",
"bitbag/coding-standard": "^3.0.0",
"dmore/behat-chrome-extension": "^1.3",
"dmore/chrome-mink-driver": "^2.7",
"friends-of-behat/mink": "^1.8",
Expand All @@ -29,12 +29,14 @@
"friends-of-behat/variadic-extension": "^1.3",
"phpspec/phpspec": "^7.0",
"phpstan/extension-installer": "^1.0",
"phpstan/phpstan": "0.12.85",
"phpstan/phpstan-doctrine": "0.12.33",
"phpstan/phpstan-strict-rules": "^0.12.0",
"phpstan/phpstan-webmozart-assert": "0.12.12",
"phpstan/phpstan": "^1.8.1",
"phpstan/phpstan-doctrine": "1.3.69",
"phpstan/phpstan-strict-rules": "^1.3.0",
"phpstan/phpstan-webmozart-assert": "^1.2.0",
"phpunit/phpunit": "^9.5",
"polishsymfonycommunity/symfony-mocker-container": "^1.0",
"nyholm/psr7": "^1.8",
"symfony/http-client": "^5.4 || ^6.0",
"symfony/browser-kit": "^5.4 || ^6.0",
"symfony/debug-bundle": "^5.4 || ^6.0",
"symfony/dotenv": "^5.4 || ^6.0",
Expand All @@ -46,12 +48,8 @@
"twig/twig": "^2.10.0"
},
"conflict": {
"symfony/symfony": "4.1.8",
"symfony/browser-kit": "4.1.8",
"symfony/dom-crawler": "4.1.8",
"symfony/routing": "4.1.8",
"symfony/doctrine-bridge": "4.4.16",
"behat/mink-selenium2-driver": ">=1.7.0"
"behat/mink-selenium2-driver": ">=1.7.0",
"doctrine/persistence": "<3.0"
},
"config": {
"sort-packages": true,
Expand Down
Loading

0 comments on commit 1f0dc58

Please sign in to comment.