Skip to content

Commit

Permalink
bug #114 Fix Travis failure for PHP 5.6 (bocharsky-bw)
Browse files Browse the repository at this point in the history
This PR was squashed before being merged into the master branch (closes #114).

Discussion
----------

Fix Travis failure for PHP 5.6

Commits
-------

a4a2a72 Fix Travis failure for PHP 5.6
  • Loading branch information
javiereguiluz committed Jul 24, 2015
2 parents 3aaa9cc + a4a2a72 commit 3d085ba
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 74 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Expand Up @@ -32,6 +32,7 @@ matrix:
- env: SYMFONY_VERSION="2.8.x-dev"

before_install:
- composer self-update
- if [ "$SYMFONY_VERSION" != "" ]; then composer require --dev --no-update symfony/symfony:$SYMFONY_VERSION; fi

install:
Expand Down
9 changes: 6 additions & 3 deletions composer.json
Expand Up @@ -7,11 +7,11 @@
"psr-0": { "": "src/", "SymfonyStandard": "app/" }
},
"require": {
"php" : ">=5.3.3",
"php" : ">=5.3.9",
"ext-pdo_sqlite" : "*",
"doctrine/doctrine-bundle" : "~1.5",
"doctrine/doctrine-fixtures-bundle" : "~2.2",
"doctrine/orm" : "~2.5",
"doctrine/orm" : "~2.4",
"erusev/parsedown" : "~1.5",
"incenteev/composer-parameter-handler" : "~2.1",
"ircmaxell/password-compat" : "~1.0",
Expand Down Expand Up @@ -47,7 +47,10 @@
]
},
"config": {
"bin-dir": "bin"
"bin-dir": "bin",
"platform": {
"php": "5.3.9"
}
},
"extra": {
"symfony-app-dir": "app",
Expand Down
87 changes: 16 additions & 71 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 3d085ba

Please sign in to comment.