Skip to content

Commit

Permalink
minor #34 Add support for symfony 5 and remove support for < 4.4 ()
Browse files Browse the repository at this point in the history
This PR was merged into the 1.6-dev branch.

Discussion
----------

Should be rebased after merging the other PR's

Commits
-------

751f925 Add support for symfony 5 and remove support for < 4.4
  • Loading branch information
pamil authored Jan 2, 2020
2 parents a7ee6ba + 751f925 commit 8bf3d2d
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 14 deletions.
9 changes: 7 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,14 @@ php:
- 7.4

env:
- SYMFONY_VERSION=3.4.*
- SYMFONY_VERSION=4.3.*
- SYMFONY_VERSION=4.4.*
- SYMFONY_VERSION=5.0.*

jobs:
fast_finish: true
allow_failures:
-
env: SYMFONY_VERSION=5.0.*

cache:
directories:
Expand Down
20 changes: 10 additions & 10 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@
"php": "^7.2",

"sylius/registry": "^1.1",
"symfony/config": "^3.4|^4.3",
"symfony/dependency-injection": "^3.4|^4.3",
"symfony/event-dispatcher": "^3.4|^4.3",
"symfony/form": "^3.4|^4.3",
"symfony/framework-bundle": "^3.4|^4.3",
"symfony/http-kernel": "^3.4|^4.3",
"symfony/options-resolver": "^3.4|^4.3",
"symfony/property-access": "^3.4|^4.3"
"symfony/config": "^4.4|^5.0",
"symfony/dependency-injection": "^4.4|^5.0",
"symfony/event-dispatcher": "^4.4|^5.0",
"symfony/form": "^4.4|^5.0",
"symfony/framework-bundle": "^4.4|^5.0",
"symfony/http-kernel": "^4.4|^5.0",
"symfony/options-resolver": "^4.4|^5.0",
"symfony/property-access": "^4.4|^5.0"
},
"require-dev": {
"doctrine/doctrine-bundle": "^1.3",
Expand All @@ -50,8 +50,8 @@
"phpunit/phpunit": "^7.0",
"sylius-labs/coding-standard": "^3.0",
"sylius/currency-bundle": "^1.1",
"symfony/console": "^3.4|^4.3",
"symfony/twig-bundle": "^3.4|^4.3",
"symfony/console": "^4.4|^5.0",
"symfony/twig-bundle": "^4.4|^5.0",
"twig/twig": "^2.12|^3.0",
"vimeo/psalm": "^3.5"
},
Expand Down
4 changes: 2 additions & 2 deletions src/Component/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@
"php": "^7.2",

"sylius/registry": "^1.2",
"symfony/event-dispatcher": "^3.4|^4.3",
"symfony/event-dispatcher": "^4.4|^5.0",
"webmozart/assert": "^1.1"
},
"require-dev": {
"phpspec/phpspec": "^6.1",
"symfony/property-access": "^3.4|^4.1.1"
"symfony/property-access": "^4.4|^5.0"
},
"autoload": {
"psr-4": { "Sylius\\Component\\Grid\\": "" }
Expand Down

0 comments on commit 8bf3d2d

Please sign in to comment.