Skip to content

Commit 107c8ff

Browse files
Merge branch '4.4' into 5.4
* 4.4: CS fixes Bump Symfony version to 4.4.44 Update VERSION for 4.4.43 Update CONTRIBUTORS for 4.4.43 Update CHANGELOG for 4.4.43
2 parents 9b630f3 + 52c556d commit 107c8ff

File tree

4 files changed

+13
-13
lines changed

4 files changed

+13
-13
lines changed

Tests/FinderTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1338,12 +1338,12 @@ public function getTestPathData()
13381338
],
13391339
['A/B', 'foobar',
13401340
[
1341-
//dirs
1341+
// dirs
13421342
'A'.\DIRECTORY_SEPARATOR.'B',
13431343
'A'.\DIRECTORY_SEPARATOR.'B'.\DIRECTORY_SEPARATOR.'C',
13441344
'copy'.\DIRECTORY_SEPARATOR.'A'.\DIRECTORY_SEPARATOR.'B',
13451345
'copy'.\DIRECTORY_SEPARATOR.'A'.\DIRECTORY_SEPARATOR.'B'.\DIRECTORY_SEPARATOR.'C',
1346-
//files
1346+
// files
13471347
'A'.\DIRECTORY_SEPARATOR.'B'.\DIRECTORY_SEPARATOR.'ab.dat',
13481348
'A'.\DIRECTORY_SEPARATOR.'B'.\DIRECTORY_SEPARATOR.'C'.\DIRECTORY_SEPARATOR.'abc.dat',
13491349
'copy'.\DIRECTORY_SEPARATOR.'A'.\DIRECTORY_SEPARATOR.'B'.\DIRECTORY_SEPARATOR.'ab.dat.copy',

Tests/GitignoreTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,7 @@ public function provider(): array
349349
'logs/',
350350
'!logs/important.log',
351351
],
352-
['logs/debug.log'/* must be pruned on traversal 'logs/important.log'*/],
352+
['logs/debug.log'/* must be pruned on traversal 'logs/important.log' */],
353353
[],
354354
],
355355
[
@@ -823,7 +823,7 @@ public function provideNegatedPatternsCases(): iterable
823823
'!logs/important.log',
824824
],
825825
[],
826-
['logs/debug.log'/* must be pruned on traversal 'logs/important.log'*/],
826+
['logs/debug.log'/* must be pruned on traversal 'logs/important.log' */],
827827
];
828828

829829
yield [

Tests/Iterator/PathFilterIteratorTest.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,37 +28,37 @@ public function getTestFilterData()
2828
{
2929
$inner = new MockFileListIterator();
3030

31-
//PATH: A/B/C/abc.dat
31+
// PATH: A/B/C/abc.dat
3232
$inner[] = new MockSplFileInfo([
3333
'name' => 'abc.dat',
3434
'relativePathname' => 'A'.\DIRECTORY_SEPARATOR.'B'.\DIRECTORY_SEPARATOR.'C'.\DIRECTORY_SEPARATOR.'abc.dat',
3535
]);
3636

37-
//PATH: A/B/ab.dat
37+
// PATH: A/B/ab.dat
3838
$inner[] = new MockSplFileInfo([
3939
'name' => 'ab.dat',
4040
'relativePathname' => 'A'.\DIRECTORY_SEPARATOR.'B'.\DIRECTORY_SEPARATOR.'ab.dat',
4141
]);
4242

43-
//PATH: A/a.dat
43+
// PATH: A/a.dat
4444
$inner[] = new MockSplFileInfo([
4545
'name' => 'a.dat',
4646
'relativePathname' => 'A'.\DIRECTORY_SEPARATOR.'a.dat',
4747
]);
4848

49-
//PATH: copy/A/B/C/abc.dat.copy
49+
// PATH: copy/A/B/C/abc.dat.copy
5050
$inner[] = new MockSplFileInfo([
5151
'name' => 'abc.dat.copy',
5252
'relativePathname' => 'copy'.\DIRECTORY_SEPARATOR.'A'.\DIRECTORY_SEPARATOR.'B'.\DIRECTORY_SEPARATOR.'C'.\DIRECTORY_SEPARATOR.'abc.dat',
5353
]);
5454

55-
//PATH: copy/A/B/ab.dat.copy
55+
// PATH: copy/A/B/ab.dat.copy
5656
$inner[] = new MockSplFileInfo([
5757
'name' => 'ab.dat.copy',
5858
'relativePathname' => 'copy'.\DIRECTORY_SEPARATOR.'A'.\DIRECTORY_SEPARATOR.'B'.\DIRECTORY_SEPARATOR.'ab.dat',
5959
]);
6060

61-
//PATH: copy/A/a.dat.copy
61+
// PATH: copy/A/a.dat.copy
6262
$inner[] = new MockSplFileInfo([
6363
'name' => 'a.dat.copy',
6464
'relativePathname' => 'copy'.\DIRECTORY_SEPARATOR.'A'.\DIRECTORY_SEPARATOR.'a.dat',

Tests/Iterator/RealIteratorTestCase.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,9 @@ public static function setUpBeforeClass(): void
7070
public static function tearDownAfterClass(): void
7171
{
7272
$paths = new \RecursiveIteratorIterator(
73-
new \RecursiveDirectoryIterator(self::$tmpDir, \RecursiveDirectoryIterator::SKIP_DOTS),
74-
\RecursiveIteratorIterator::CHILD_FIRST
75-
);
73+
new \RecursiveDirectoryIterator(self::$tmpDir, \RecursiveDirectoryIterator::SKIP_DOTS),
74+
\RecursiveIteratorIterator::CHILD_FIRST
75+
);
7676

7777
foreach ($paths as $path) {
7878
if ($path->isDir()) {

0 commit comments

Comments
 (0)