Skip to content

Commit 557dce6

Browse files
committed
Merge branch '2.5' into 2.6
* 2.5: [Config] adds missing « use » statement for InvalidTypeException type hint in documentation. [Config] fixes broken unit test on ArrayNode class. fixed CS [Security] Delete old session on auth strategy migrate update required minimum TwigBridge version Very minor grammar fix in error message [Tests] Silenced all deprecations in tests for 2.3 BinaryFileResponse - add missing newline fixed CS add a limit and a test to FlattenExceptionTest. CS: There should be no empty lines following phpdocs [FrameworkBundle] fix cache:clear command [2.3] Docblocks should not be followed by a blank line Fix return phpdoc [PropertyAccess] Added test to verify #5775 is fixed
2 parents f0a8d04 + 649adad commit 557dce6

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

DependencyInjection/SecurityExtension.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,6 @@ private function configureDbalAclProvider(array $config, ContainerBuilder $conta
165165
* @param array $config An array of configuration settings
166166
* @param ContainerBuilder $container A ContainerBuilder instance
167167
*/
168-
169168
private function createRoleHierarchy($config, ContainerBuilder $container)
170169
{
171170
if (!isset($config['role_hierarchy'])) {

phpunit.xml.dist

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,10 @@
66
colors="true"
77
bootstrap="vendor/autoload.php"
88
>
9-
9+
<php>
10+
<!-- Silence E_USER_DEPRECATED (-16385 == -1 & ~E_USER_DEPRECATED) -->
11+
<ini name="error_reporting" value="-16385"/>
12+
</php>
1013
<testsuites>
1114
<testsuite name="Symfony SecurityBundle Test Suite">
1215
<directory>./Tests/</directory>

0 commit comments

Comments
 (0)