diff options
| author | Nicolas Grekas <nicolas.grekas@gmail.com> | 2015-11-03 15:29:13 +0100 |
|---|---|---|
| committer | Nicolas Grekas <nicolas.grekas@gmail.com> | 2015-11-03 15:29:13 +0100 |
| commit | 969128c31e439d0d56ff99322806e9d56923149a (patch) | |
| tree | 7cded2974fbd020bd50904e467b28fe78295fbbd | |
| parent | 3ebe37fa9b133e4b9b0d784de95124e2af66f820 (diff) | |
| parent | f55a6fe9007b58469670ecd74c1b8121a31c94c5 (diff) | |
| download | symfony-security-969128c31e439d0d56ff99322806e9d56923149a.zip symfony-security-969128c31e439d0d56ff99322806e9d56923149a.tar.gz symfony-security-969128c31e439d0d56ff99322806e9d56923149a.tar.bz2 | |
Merge branch '2.8'
* 2.8:
[Security] Clean deps
[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 | 1 | ||||
| -rw-r--r-- | composer.json | 5 |
2 files changed, 0 insertions, 6 deletions
diff --git a/Core/composer.json b/Core/composer.json index 502a6de..8e7931e 100644 --- a/Core/composer.json +++ b/Core/composer.json @@ -25,7 +25,6 @@ "symfony/expression-language": "~2.8|~3.0", "symfony/http-foundation": "~2.8|~3.0", "symfony/ldap": "~2.8|~3.0", - "symfony/translation": "~2.8|~3.0", "symfony/validator": "~2.8|~3.0", "psr/log": "~1.0" }, diff --git a/composer.json b/composer.json index 8803e72..e4aff16 100644 --- a/composer.json +++ b/composer.json @@ -35,17 +35,12 @@ "symfony/finder": "~2.8|~3.0", "symfony/polyfill-intl-icu": "~1.0", "symfony/routing": "~2.8|~3.0", - "symfony/translation": "~2.8|~3.0", "symfony/validator": "~2.8|~3.0", "symfony/expression-language": "~2.8|~3.0", "symfony/ldap": "~2.8|~3.0", - "doctrine/common": "~2.2", - "doctrine/dbal": "~2.2", "psr/log": "~1.0" }, "suggest": { - "symfony/class-loader": "For using the ACL generateSql script", - "symfony/finder": "For using the ACL generateSql script", "symfony/form": "", "symfony/validator": "For using the user password constraint", "symfony/routing": "For using the HttpUtils class to create sub-requests, redirect the user, and match URLs", |