Skip to content

Commit 42b3e96

Browse files
Merge branch '2.7' into 2.8
* 2.7: [Locale] Add missing @group legacy annotations Fix security-acl deps Fix doctrine mapping validation type error Remove skipping of tests based on ICU data version whenever possible Fix the handling of null as locale in the stub intl classes do not dump leading backslashes in class names fix issue #15377 Skip ::class constant [Config] type specific check for emptiness Conflicts: src/Symfony/Bridge/Twig/composer.json src/Symfony/Bundle/SecurityBundle/composer.json src/Symfony/Component/DependencyInjection/Dumper/GraphvizDumper.php src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTypeTest.php src/Symfony/Component/Form/Tests/Extension/Core/Type/TimeTypeTest.php
2 parents f1c46df + 25a6d4f commit 42b3e96

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

DataCollector/SecurityDataCollector.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public function collect(Request $request, Response $response, \Exception $except
7171
if (null !== $this->roleHierarchy) {
7272
$allRoles = $this->roleHierarchy->getReachableRoles($assignedRoles);
7373
foreach ($allRoles as $role) {
74-
if (!in_array($role, $assignedRoles)) {
74+
if (!in_array($role, $assignedRoles, true)) {
7575
$inheritedRoles[] = $role;
7676
}
7777
}

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
"require": {
1919
"php": ">=5.3.9",
2020
"symfony/security": "~2.8|~3.0.0",
21-
"symfony/http-kernel": "~2.2|~3.0.0",
22-
"symfony/security-acl": "~2.8|~3.0.0"
21+
"symfony/security-acl": "~2.8|~3.0.0",
22+
"symfony/http-kernel": "~2.2|~3.0.0"
2323
},
2424
"require-dev": {
2525
"symfony/phpunit-bridge": "~2.7|~3.0.0",

0 commit comments

Comments
 (0)