diff options
| author | Nicolas Grekas <nicolas.grekas@gmail.com> | 2015-11-03 15:28:10 +0100 |
|---|---|---|
| committer | Nicolas Grekas <nicolas.grekas@gmail.com> | 2015-11-03 15:28:10 +0100 |
| commit | f55a6fe9007b58469670ecd74c1b8121a31c94c5 (patch) | |
| tree | 2cb6abc0884a36925e4012abe5f4393788a0a386 | |
| parent | aa593444fb4e3acc09351939cf0dca50d0e92522 (diff) | |
| parent | b56511b65e2fb12a0415863bc829d0ae98fe3e5b (diff) | |
| download | symfony-security-f55a6fe9007b58469670ecd74c1b8121a31c94c5.zip symfony-security-f55a6fe9007b58469670ecd74c1b8121a31c94c5.tar.gz symfony-security-f55a6fe9007b58469670ecd74c1b8121a31c94c5.tar.bz2 | |
Merge branch '2.7' into 2.8
* 2.7:
[Security][2.7] Clean deps
[HttpKernel] Fix time-sensitive test case
[travis] Fail early when an invalid composer.json is found
Conflicts:
src/Symfony/Component/Security/Core/composer.json
src/Symfony/Component/Security/composer.json
| -rw-r--r-- | Core/composer.json | 3 | ||||
| -rw-r--r-- | composer.json | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/Core/composer.json b/Core/composer.json index e89fb8d..3362971 100644 --- a/Core/composer.json +++ b/Core/composer.json @@ -27,8 +27,7 @@ "symfony/expression-language": "~2.6|~3.0.0", "symfony/http-foundation": "~2.4|~3.0.0", "symfony/ldap": "~2.8|~3.0.0", - "symfony/translation": "~2.0,>=2.0.5|~3.0.0", - "symfony/validator": "~2.5,>=2.5.5|~3.0.0", + "symfony/validator": "~2.5,>=2.5.9|~3.0.0", "psr/log": "~1.0" }, "suggest": { diff --git a/composer.json b/composer.json index d89c4a9..8764ce6 100644 --- a/composer.json +++ b/composer.json @@ -37,8 +37,7 @@ "symfony/finder": "~2.3|~3.0.0", "symfony/polyfill-intl-icu": "~1.0", "symfony/routing": "~2.2|~3.0.0", - "symfony/translation": "~2.0,>=2.0.5|~3.0.0", - "symfony/validator": "~2.5,>=2.5.5|~3.0.0", + "symfony/validator": "~2.5,>=2.5.9|~3.0.0", "psr/log": "~1.0", "symfony/expression-language": "~2.6|~3.0.0", "symfony/ldap": "~2.8|~3.0.0" |