Updated composer.lock

Had to restrict scheb/two-factor-bundle to ~1.4.0 because of a circular service reference.
See https://github.com/scheb/two-factor-bundle/issues/33.

Also updated php version requirement to 5.5.0.
This commit is contained in:
Bertrand Dunogier 2015-12-23 16:45:24 +01:00
parent da2240f9d4
commit d4aa174367
3 changed files with 262 additions and 239 deletions

View File

@ -16,7 +16,6 @@ cache:
- $HOME/.composer/cache
php:
- 5.4
- 5.5
- 5.6
- 7.0

View File

@ -28,7 +28,7 @@
"issues": "https://github.com/wallabag/wallabag/issues"
},
"require": {
"php": ">=5.3.3",
"php": ">=5.5.0",
"symfony/symfony": "~2.7.0",
"doctrine/orm": "~2.3",
"doctrine/doctrine-bundle": "1.5.2",
@ -55,7 +55,7 @@
"j0k3r/graby": "~1.0",
"friendsofsymfony/user-bundle": "dev-master",
"friendsofsymfony/oauth-server-bundle": "^1.4@dev",
"scheb/two-factor-bundle": "~1.4",
"scheb/two-factor-bundle": "~1.4.0",
"grandt/phpepub": "~4.0",
"wallabag/php-mobi": "~1.0.0",
"kphoen/rulerz-bundle": "~0.10"

496
composer.lock generated

File diff suppressed because it is too large Load Diff