Skip to content

Commit fd26bdb

Browse files
committed
Merge branch '2.7' into 2.8
* 2.7: fixed CS fixed CS fixed CS Fix WebProfilerBundle compatiblity with HttpKernel < 2.7 [Validator] Deprecated PHP7-incompatible constraints and related validators [DebugBundle] Allow alternative destination for dumps [DebugBundle] Use output mechanism of dumpers instead of echoing [DebugBundle] Always collect dumps [FrameworkBundle] Applied new styles to the config:debug & config:dump-reference commands Fix tests in HHVM CS: Pre incrementation/decrementation should be used if possible Conflicts: src/Symfony/Bundle/FrameworkBundle/composer.json
2 parents 53a2e6d + ccb8ed8 commit fd26bdb

File tree

4 files changed

+5
-6
lines changed

4 files changed

+5
-6
lines changed

Glob.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public static function toRegex($glob, $strictLeadingDot = true, $strictWildcardS
5252
$inCurlies = 0;
5353
$regex = '';
5454
$sizeGlob = strlen($glob);
55-
for ($i = 0; $i < $sizeGlob; $i++) {
55+
for ($i = 0; $i < $sizeGlob; ++$i) {
5656
$car = $glob[$i];
5757
if ($firstByte) {
5858
if ($strictLeadingDot && '.' !== $car) {

Tests/FinderTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -475,7 +475,7 @@ public function testCountDirectories()
475475
$i = 0;
476476

477477
foreach ($directory as $dir) {
478-
$i++;
478+
++$i;
479479
}
480480

481481
$this->assertCount($i, $directory);
@@ -487,7 +487,7 @@ public function testCountFiles()
487487
$i = 0;
488488

489489
foreach ($files as $file) {
490-
$i++;
490+
++$i;
491491
}
492492

493493
$this->assertCount($i, $files);

Tests/GlobTest.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,4 @@ public function testGlobToRegexDelimiters()
2222
$this->assertEquals(Glob::toRegex('.*', true, true, ''), '^\.[^/]*$');
2323
$this->assertEquals(Glob::toRegex('.*', true, true, '/'), '/^\.[^/]*$/');
2424
}
25-
2625
}

Tests/Iterator/FilterIteratorTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public function testFilterFilesystemIterators()
3131

3232
$c = 0;
3333
foreach ($i as $item) {
34-
$c++;
34+
++$c;
3535
}
3636

3737
$this->assertEquals(1, $c);
@@ -40,7 +40,7 @@ public function testFilterFilesystemIterators()
4040

4141
$c = 0;
4242
foreach ($i as $item) {
43-
$c++;
43+
++$c;
4444
}
4545

4646
// This would fail with \FilterIterator but works with Symfony\Component\Finder\Iterator\FilterIterator

0 commit comments

Comments
 (0)