diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2015-10-27 21:17:44 -0700 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2015-10-27 21:17:44 -0700 |
| commit | 7e5230e1f69cac148b9f883cbdb8a0bdd40925eb (patch) | |
| tree | b1ad15ce2d0153735751db53555bd3ac81ea74d3 | |
| parent | 1473342e7bb5d3d3080f78b196f528b4acf34db2 (diff) | |
| parent | 8cfc54a7e51b07ef335012065881a65e437304f0 (diff) | |
| download | symfony-security-7e5230e1f69cac148b9f883cbdb8a0bdd40925eb.zip symfony-security-7e5230e1f69cac148b9f883cbdb8a0bdd40925eb.tar.gz symfony-security-7e5230e1f69cac148b9f883cbdb8a0bdd40925eb.tar.bz2 | |
Merge branch '2.7' into 2.8
* 2.7:
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 beb2f88..11b68d4 100644 --- a/composer.json +++ b/composer.json @@ -45,6 +45,11 @@ "symfony/expression-language": "~2.6|~3.0.0", "symfony/ldap": "~2.8|~3.0.0" }, + "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", |