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

symfony 4 upgrade #16

Merged
merged 4 commits into from
Dec 13, 2017
Merged

symfony 4 upgrade #16

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
52464e8
symfony 4 upgrade
tibineogen Nov 18, 2017
f463ee7
symfony v4
tibineogen Dec 11, 2017
4430726
implemented suggested modifications
tibineogen Dec 11, 2017
98fdb78
implemented suggested modifications
tibineogen Dec 13, 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
4 changes: 4 additions & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ matrix:
env: SYMFONY_VERSION='3.3.*'
- php: 5.6
env: SYMFONY_VERSION='3.4.*' MIN_STABILITY='dev'
- php: 7.1
env: SYMFONY_VERSION='4.*' DEPENDENCIES='beta'
allow_failures:
- env: SYMFONY_VERSION='3.4.*' MIN_STABILITY='dev'
Copy link
Owner

Choose a reason for hiding this comment

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

Please make it look like this:

    - php: 5.6
      env: SYMFONY_VERSION='3.4.*'
    - php: 7.1
      env: SYMFONY_VERSION='4.0.*'
    - php: 7.1
      env: SYMFONY_VERSION='4.1.*' MIN_STABILITY='dev'
  allow_failures:
    - env: SYMFONY_VERSION='4.1.*' MIN_STABILITY='dev'

fast_finish: true
Expand All @@ -36,6 +38,8 @@ services:
- postgresql

install:
# suport for symfony 4.0
- if [ "$DEPENDENCIES" = "beta" ]; then composer config minimum-stability beta; fi;
Copy link
Owner

Choose a reason for hiding this comment

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

This change can be removed as MIN_STABILITY is used (and handled) already. There's no reason to introduce DEPENDENCIES.

# disable Xdebug for better Composer performance
- if [ "${TRAVIS_PHP_VERSION}" != 'hhvm' ]; then phpenv config-rm xdebug.ini; fi;
# set unlimited memory_limit
Expand Down
6 changes: 3 additions & 3 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@
"php": "^5.3.9|~7.0",
"doctrine/doctrine-bundle": "~1.3",
"doctrine/orm": "~2.3",
"symfony/framework-bundle": "~2.7|~3.0"
"symfony/framework-bundle": "~2.7|~3.0|~4.0"
},
"require-dev": {
"doctrine/data-fixtures": "~1.0",
"phpunit/phpunit": "^4.8.35|~5.7|~6.0",
"symfony/phpunit-bridge": "~3.2",
"symfony/symfony": "~2.7|~3.0"
"symfony/phpunit-bridge": "~3.2|~4.0",
"symfony/symfony": "~2.7|~3.0|~4.0"
},
"suggest": {
"doctrine/data-fixtures": "*"
Expand Down