Skip to content

Commit ec3162d

Browse files
Merge branch '4.4' into 5.2
* 4.4: [SecurityBundle] role_names variable instead of roles [PhpUnitBridge] fix reporting deprecations when they come from DebugClassLoader [ErrorHandler] fix parsing return types in DebugClassLoader [ErrorHandler] fix handling messages with null bytes from anonymous classes Restore priority for eventSubscribers
2 parents 51854aa + 55a84ce commit ec3162d

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

CacheWarmer/ExpressionCacheWarmer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public function isOptional()
4040
public function warmUp(string $cacheDir)
4141
{
4242
foreach ($this->expressions as $expression) {
43-
$this->expressionLanguage->parse($expression, ['token', 'user', 'object', 'subject', 'roles', 'request', 'trust_resolver']);
43+
$this->expressionLanguage->parse($expression, ['token', 'user', 'object', 'subject', 'role_names', 'request', 'trust_resolver']);
4444
}
4545

4646
return [];

Tests/CacheWarmer/ExpressionCacheWarmerTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ public function testWarmUp()
2626
$expressionLang->expects($this->exactly(2))
2727
->method('parse')
2828
->withConsecutive(
29-
[$expressions[0], ['token', 'user', 'object', 'subject', 'roles', 'request', 'trust_resolver']],
30-
[$expressions[1], ['token', 'user', 'object', 'subject', 'roles', 'request', 'trust_resolver']]
29+
[$expressions[0], ['token', 'user', 'object', 'subject', 'role_names', 'request', 'trust_resolver']],
30+
[$expressions[1], ['token', 'user', 'object', 'subject', 'role_names', 'request', 'trust_resolver']]
3131
);
3232

3333
(new ExpressionCacheWarmer($expressions, $expressionLang))->warmUp('');

0 commit comments

Comments
 (0)