diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2015-11-30 13:36:17 +0100 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2015-11-30 13:36:17 +0100 |
| commit | 82f83d99b1756d085746aa0c4dae800d9c6ef37d (patch) | |
| tree | 79fb54f39eca35c8e394cd4a55e32f35a396690c | |
| parent | 40457cde075728371efbc0c5427a6b7b96647655 (diff) | |
| parent | ec823fe7b451623020e4ac752f190654ae58c8a0 (diff) | |
| download | symfony-security-82f83d99b1756d085746aa0c4dae800d9c6ef37d.zip symfony-security-82f83d99b1756d085746aa0c4dae800d9c6ef37d.tar.gz symfony-security-82f83d99b1756d085746aa0c4dae800d9c6ef37d.tar.bz2 | |
Merge branch '2.8'v3.0.0
* 2.8:
add subject variable to expression context
[Process] Fix signaling/stopping logic on Windows
Forward compatibility with AbstractLayout* 2.8 tests
[Yaml] minor CS cleaning
[Console] do not encode backslashes in console default description
| -rw-r--r-- | Core/Authorization/Voter/ExpressionVoter.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Core/Authorization/Voter/ExpressionVoter.php b/Core/Authorization/Voter/ExpressionVoter.php index c85ad9c..5fd8b83 100644 --- a/Core/Authorization/Voter/ExpressionVoter.php +++ b/Core/Authorization/Voter/ExpressionVoter.php @@ -86,6 +86,7 @@ class ExpressionVoter implements VoterInterface 'token' => $token, 'user' => $token->getUser(), 'object' => $subject, + 'subject' => $subject, 'roles' => array_map(function ($role) { return $role->getRole(); }, $roles), 'trust_resolver' => $this->trustResolver, ); |