Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Dependencies] Enable Symfony 4.0 support #1010

Merged
merged 3 commits into from Nov 24, 2017
Merged

[Dependencies] Enable Symfony 4.0 support #1010

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7261d53
add changes to composer.json for Symfony4 support
llaakkkk Nov 18, 2017
a55dc7b
remove sllh/php-cs-fixer-styleci-bridge because it doesn"t support Sy…
llaakkkk Nov 18, 2017
d4a4c6b
add new version to friendsofphp/php-cs-fixer for Symfony 4 support
llaakkkk Nov 18, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions .travis.yml
View file
Open in desktop
Expand Up @@ -21,6 +21,7 @@ matrix:
include:
- env: SYMFONY_VERSION=3.3.x-dev
- env: SYMFONY_VERSION=3.4.x-dev
- env: SYMFONY_VERSION=4.0.x-dev
allow_failures:
- php: nightly
fast_finish: true
Expand Down
33 changes: 16 additions & 17 deletions composer.json
View file
Open in desktop
Expand Up @@ -20,14 +20,14 @@
"require": {
"php": "~7.1",
"imagine/Imagine": "^0.6.3,<0.7",
"symfony/asset": "~3.0",
"symfony/filesystem": "~3.0",
"symfony/finder": "~3.0",
"symfony/framework-bundle": "~3.0",
"symfony/options-resolver": "~3.0",
"symfony/process": "~3.0",
"symfony/templating": "~3.0",
"symfony/translation": "~3.0"
"symfony/asset": "~3.0|^4.0",
"symfony/filesystem": "~3.0|^4.0",
"symfony/finder": "~3.0|^4.0",
"symfony/framework-bundle": "~3.0|^4.0",
"symfony/options-resolver": "~3.0|^4.0",
"symfony/process": "~3.0|^4.0",
"symfony/templating": "~3.0|^4.0",
"symfony/translation": "~3.0|^4.0"
},
"require-dev": {
"ext-gd": "*",
Expand All @@ -36,19 +36,18 @@
"doctrine/cache": "~1.1",
"doctrine/orm": "~2.3",
"enqueue/enqueue-bundle": "^0.7",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IIRC for versions below 1.0, we need to explicitly allow minor versions .. so I think this needs to be “^0.7|^0.8” in order to be able to pull in the 0.89 version which provides Symfony compatibility

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed via c5e26d6

"friendsofphp/php-cs-fixer": "~1.0",
"friendsofphp/php-cs-fixer": "~1.0|~2.0",
"league/flysystem": "~1.0",
"phpunit/phpunit": "~5.0",
"psr/log": "~1.0",
"satooshi/php-coveralls": "~1.0",
"sllh/php-cs-fixer-styleci-bridge": "~2.1",
"symfony/browser-kit": "~3.0",
"symfony/console": "~3.0",
"symfony/dependency-injection": "~3.0",
"symfony/form": "~3.0",
"symfony/phpunit-bridge": "~3.0",
"symfony/validator": "~3.0",
"symfony/yaml": "~3.0",
"symfony/browser-kit": "~3.0|^4.0",
"symfony/console": "~3.0|^4.0",
"symfony/dependency-injection": "~3.0|^4.0",
"symfony/form": "~3.0|^4.0",
"symfony/phpunit-bridge": "~3.0|^4.0",
"symfony/validator": "~3.0|^4.0",
"symfony/yaml": "~3.0|^4.0",
"twig/twig": "~1.12|~2.0"
},
"suggest": {
Expand Down