diff options
author | Nicolas Grekas <nicolas.grekas@gmail.com> | 2016-07-05 13:11:18 +0200 |
---|---|---|
committer | Nicolas Grekas <nicolas.grekas@gmail.com> | 2016-07-05 13:11:18 +0200 |
commit | e19b443bf25d87a51644c3eecad862ab394f3322 (patch) | |
tree | 978adc5a918baff1b7827a84c26aa0e9218494c3 /Core | |
parent | f7d4e3bf10b580b5766b94a97be8409d7dbcd842 (diff) | |
parent | 6ec5bf655ebcc0f27900cc99d36294de71dbca03 (diff) | |
download | symfony-security-e19b443bf25d87a51644c3eecad862ab394f3322.zip symfony-security-e19b443bf25d87a51644c3eecad862ab394f3322.tar.gz symfony-security-e19b443bf25d87a51644c3eecad862ab394f3322.tar.bz2 |
Merge branch '3.1'
* 3.1:
[VarDumper] Fix indentation trimming in ExceptionCaster
[HttpKernel] Clarify deprecation of non-scalar values in surrogate renderer
removed @since
[Security] fixed DebugAccessDecisionManager::setVoters()
Remove and change unrelevant comments in Validator and Security components.
[Validator] add missing interface use statement for phpdoc block return type.
[Validator] UuidValidator must accept a Uuid constraint.
[Validator] make UuidValidator class formatting consistent.
Conflicts:
src/Symfony/Component/Validator/Tests/Constraints/AbstractConstraintValidatorTest.php
Diffstat (limited to 'Core')
-rw-r--r-- | Core/Authorization/DebugAccessDecisionManager.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Core/Authorization/DebugAccessDecisionManager.php b/Core/Authorization/DebugAccessDecisionManager.php index 1a04bc1..aa15443 100644 --- a/Core/Authorization/DebugAccessDecisionManager.php +++ b/Core/Authorization/DebugAccessDecisionManager.php @@ -62,7 +62,7 @@ class DebugAccessDecisionManager implements AccessDecisionManagerInterface */ public function setVoters(array $voters) { - if (!$this->manager instanceof AccessDecisionManager) { + if (!method_exists($this->manager, 'setVoters')) { return; } |