diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2015-10-27 21:15:55 -0700 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2015-10-27 21:15:55 -0700 |
| commit | 8cfc54a7e51b07ef335012065881a65e437304f0 (patch) | |
| tree | 07a1e0130d2d60f40247cb026abeb305360e9b22 | |
| parent | ec02cc7427caf4067eab3c86f1659215f9f8440e (diff) | |
| parent | 7d1514eafc10e2083e8de969439a38708ebfe47f (diff) | |
| download | symfony-security-8cfc54a7e51b07ef335012065881a65e437304f0.zip symfony-security-8cfc54a7e51b07ef335012065881a65e437304f0.tar.gz symfony-security-8cfc54a7e51b07ef335012065881a65e437304f0.tar.bz2 | |
Merge branch '2.3' into 2.7
* 2.3:
added missing quotes in YAML files
[HttpKernel] Add `@group time-sensitive` on some transient tests
[DoctrineBridge] Fix issue which prevent the profiler to explain a query
Use mb_detect_encoding with $strict = true
don't allow to install the split Security packages
bumped Symfony version to 2.3.35
updated VERSION for 2.3.34
update CONTRIBUTORS for 2.3.34
updated CHANGELOG for 2.3.34
| -rw-r--r-- | composer.json | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/composer.json b/composer.json index f2c4e13..3796529 100644 --- a/composer.json +++ b/composer.json @@ -39,6 +39,11 @@ "ircmaxell/password-compat": "~1.0", "symfony/expression-language": "~2.6" }, + "replace": { + "symfony/security-acl": "self.version", + "symfony/security-core": "self.version", + "symfony/security-http": "self.version" + }, "suggest": { "symfony/class-loader": "For using the ACL generateSql script", "symfony/finder": "For using the ACL generateSql script", |