Skip to content

Commit

Permalink
Fix lowest deps requirements
Browse files Browse the repository at this point in the history
  • Loading branch information
soullivaneuh committed Jun 11, 2015
1 parent 97ebe5c commit d953a48
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ env:
matrix:
fast_finish: true
include:
- php: 5.3.3
- php: 5.3
env: COMPOSER_FLAGS="--prefer-lowest"
- php: 5.6
env: SYMFONY_VERSION=2.3.*
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
test:
phpunit
php vendor/bin/phpunit -c phpunit.xml.dist
cd Resources/doc && sphinx-build -W -b html -d _build/doctrees . _build/html
8 changes: 6 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
],
"require": {
"symfony/http-foundation": "~2.3",
"symfony/form": "~2.3",
"symfony/form": "^2.3.5",
"symfony/security": "~2.3",
"symfony/console": "~2.3",
"sonata-project/core-bundle": "^2.3.1",
"sonata-project/core-bundle": "^2.3.2",
"sonata-project/admin-bundle": "~2.3",
"friendsofsymfony/user-bundle": "~1.3",
"sonata-project/doctrine-extensions": "~1.0",
Expand All @@ -36,8 +36,12 @@
"require-dev": {
"doctrine/orm": "^2.2.3",
"sonata-project/seo-bundle": "~1.1",
"phpunit/phpunit": "~4.7",
"symfony/phpunit-bridge": "~2.7|~3.0"
},
"conflict": {
"jms/serializer": "<0.13"
},
"suggest": {
"sonata-project/doctrine-orm-admin-bundle": "~2.3",
"sonata-project/seo-bundle": "~1.1"
Expand Down

0 comments on commit d953a48

Please sign in to comment.