Skip to content

Commit 435d817

Browse files
committed
Merge branch '2.6' into 2.7
* 2.6: CS: fixes Translator component has default domain for null implemented no need to have default translation domain logic in 3 different places [Form] [TwigBridge] Bootstrap layout whitespace control [travis] Kill tests when a new commit has been pushed fixed CS Change behavior to mirror hash_equals() returning early if there is a length mismatch CS fixing Prevent modifying secrets as much as possible Update StringUtils.php Whitespace Update StringUtils.php StringUtils::equals() arguments in RememberMe Cookie based implementation are confused CS: general fixes [SecurityBundle] removed a duplicated service definition and simplified others. Conflicts: src/Symfony/Bundle/SecurityBundle/Resources/config/security_listeners.xml
2 parents 4ceb3c1 + 3dd874e commit 435d817

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

Tests/Iterator/FilePathsIteratorTest.php

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,23 +36,26 @@ public function getSubPathData()
3636
return array(
3737
array(
3838
$tmpDir,
39-
array( // paths
39+
array(
40+
// paths
4041
$tmpDir.DIRECTORY_SEPARATOR.'.git' => $tmpDir.DIRECTORY_SEPARATOR.'.git',
4142
$tmpDir.DIRECTORY_SEPARATOR.'test.py' => $tmpDir.DIRECTORY_SEPARATOR.'test.py',
4243
$tmpDir.DIRECTORY_SEPARATOR.'foo' => $tmpDir.DIRECTORY_SEPARATOR.'foo',
4344
$tmpDir.DIRECTORY_SEPARATOR.'foo'.DIRECTORY_SEPARATOR.'bar.tmp' => $tmpDir.DIRECTORY_SEPARATOR.'foo'.DIRECTORY_SEPARATOR.'bar.tmp',
4445
$tmpDir.DIRECTORY_SEPARATOR.'test.php' => $tmpDir.DIRECTORY_SEPARATOR.'test.php',
4546
$tmpDir.DIRECTORY_SEPARATOR.'toto' => $tmpDir.DIRECTORY_SEPARATOR.'toto',
4647
),
47-
array( // subPaths
48+
array(
49+
// subPaths
4850
$tmpDir.DIRECTORY_SEPARATOR.'.git' => '',
4951
$tmpDir.DIRECTORY_SEPARATOR.'test.py' => '',
5052
$tmpDir.DIRECTORY_SEPARATOR.'foo' => '',
5153
$tmpDir.DIRECTORY_SEPARATOR.'foo'.DIRECTORY_SEPARATOR.'bar.tmp' => 'foo',
5254
$tmpDir.DIRECTORY_SEPARATOR.'test.php' => '',
5355
$tmpDir.DIRECTORY_SEPARATOR.'toto' => '',
5456
),
55-
array( // subPathnames
57+
array(
58+
// subPathnames
5659
$tmpDir.DIRECTORY_SEPARATOR.'.git' => '.git',
5760
$tmpDir.DIRECTORY_SEPARATOR.'test.py' => 'test.py',
5861
$tmpDir.DIRECTORY_SEPARATOR.'foo' => 'foo',

0 commit comments

Comments
 (0)