diff options
| author | Nicolas Grekas <nicolas.grekas@gmail.com> | 2014-12-16 21:28:45 +0100 |
|---|---|---|
| committer | Nicolas Grekas <nicolas.grekas@gmail.com> | 2014-12-16 21:28:45 +0100 |
| commit | 2059726995834fd81e780b80991efcfe7c27ef1f (patch) | |
| tree | 130ef271226e652da21e4af2b00131bc5b2bfdc3 | |
| parent | a4210450cdb42fecab92ebaf933a3e2bf1cb699b (diff) | |
| parent | 24211b9e8e8061626ef0ee0490790a99af306a45 (diff) | |
| download | symfony-security-2059726995834fd81e780b80991efcfe7c27ef1f.zip symfony-security-2059726995834fd81e780b80991efcfe7c27ef1f.tar.gz symfony-security-2059726995834fd81e780b80991efcfe7c27ef1f.tar.bz2 | |
Merge branch '2.6' into 2.7
* 2.6:
[2.6] Test lowest versions of dependencies
Test lowest versions of dependencies
Fix placeholder date format
Test components using their lowest possible deps
| -rw-r--r-- | Core/composer.json | 5 | ||||
| -rw-r--r-- | Http/composer.json | 2 | ||||
| -rw-r--r-- | composer.json | 8 |
3 files changed, 9 insertions, 6 deletions
diff --git a/Core/composer.json b/Core/composer.json index 5182a71..2fc50f4 100644 --- a/Core/composer.json +++ b/Core/composer.json @@ -20,9 +20,10 @@ }, "require-dev": { "symfony/event-dispatcher": "~2.1", - "symfony/expression-language": "~2.4", + "symfony/expression-language": "~2.6", "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/Http/composer.json b/Http/composer.json index 625353e..58f443d 100644 --- a/Http/composer.json +++ b/Http/composer.json @@ -17,7 +17,7 @@ ], "require": { "php": ">=5.3.3", - "symfony/security-core": "~2.4", + "symfony/security-core": "~2.6", "symfony/event-dispatcher": "~2.1", "symfony/http-foundation": "~2.4", "symfony/http-kernel": "~2.4" diff --git a/composer.json b/composer.json index 8381635..f1abdb3 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,13 +28,15 @@ "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", "ircmaxell/password-compat": "~1.0", - "symfony/expression-language": "~2.4" + "symfony/expression-language": "~2.6" }, "suggest": { "symfony/class-loader": "For using the ACL generateSql script", |