diff options
| author | Nicolas Grekas <nicolas.grekas@gmail.com> | 2014-12-16 16:44:55 +0100 |
|---|---|---|
| committer | Nicolas Grekas <nicolas.grekas@gmail.com> | 2014-12-16 16:44:55 +0100 |
| commit | 7a6b4843db8551c85b73d5ca4c5158585f9de072 (patch) | |
| tree | 1340dc133bc689f0ca3c4dcbd6d74d73a9ec98ab | |
| parent | 89deef8fb9e2d53ca9cc6cdef277052db4c9587d (diff) | |
| parent | cf1120d6fa64c92837f3e94c1ed779a2a05296cb (diff) | |
| download | symfony-security-7a6b4843db8551c85b73d5ca4c5158585f9de072.zip symfony-security-7a6b4843db8551c85b73d5ca4c5158585f9de072.tar.gz symfony-security-7a6b4843db8551c85b73d5ca4c5158585f9de072.tar.bz2 | |
Merge remote-tracking branch 'symfony/2.5' into lowest-26
* symfony/2.5:
Test lowest versions of dependencies
Test components using their lowest possible deps
Conflicts:
src/Symfony/Bridge/Twig/composer.json
src/Symfony/Bundle/FrameworkBundle/composer.json
src/Symfony/Bundle/SecurityBundle/composer.json
src/Symfony/Component/EventDispatcher/composer.json
src/Symfony/Component/HttpKernel/composer.json
src/Symfony/Component/Security/composer.json
| -rw-r--r-- | Core/composer.json | 3 | ||||
| -rw-r--r-- | composer.json | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/Core/composer.json b/Core/composer.json index ca270ad..c888b23 100644 --- a/Core/composer.json +++ b/Core/composer.json @@ -22,7 +22,8 @@ "symfony/event-dispatcher": "~2.1", "symfony/expression-language": "~2.4", "symfony/http-foundation": "~2.4", - "symfony/validator": "~2.5", + "symfony/translation": "~2.0,>=2.0.5", + "symfony/validator": "~2.5,>=2.5.5", "psr/log": "~1.0", "ircmaxell/password-compat": "1.0.*" }, diff --git a/composer.json b/composer.json index feebb3e..d1aed56 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,7 @@ ], "require": { "php": ">=5.3.3", - "symfony/event-dispatcher": "~2.1", + "symfony/event-dispatcher": "~2.2", "symfony/http-foundation": "~2.1", "symfony/http-kernel": "~2.4" }, @@ -28,8 +28,10 @@ "symfony/security-http": "self.version" }, "require-dev": { + "symfony/locale": "~2.0,>=2.0.5", "symfony/routing": "~2.2", - "symfony/validator": "~2.5", + "symfony/translation": "~2.0,>=2.0.5", + "symfony/validator": "~2.5,>=2.5.5", "doctrine/common": "~2.2", "doctrine/dbal": "~2.2", "psr/log": "~1.0", |