Skip to content

Commit 3a2a0ad

Browse files
feature #22820 Remove PHP < 7.1.3 code (ogizanagi)
This PR was squashed before being merged into the 4.0-dev branch (closes #22820). Discussion ---------- Remove PHP < 7.1.3 code | Q | A | ------------- | --- | Branch? | master | Bug fix? | no | New feature? | no | BC breaks? | yes | Deprecations? | no <!-- don't forget updating UPGRADE-*.md files --> | Tests pass? | yes | Fixed tickets | symfony/symfony#22733 | License | MIT | Doc PR | N/A Commits ------- 54adaf8 Remove PHP < 7.1.3 code
2 parents 8d82fb8 + 54adaf8 commit 3a2a0ad

11 files changed

+8
-125
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ CHANGELOG
55
-----
66

77
* removed `ExceptionInterface`
8+
* removed `Symfony\Component\Finder\Iterator\FilterIterator`
89

910
3.4.0
1011
-----

Iterator/CustomFilterIterator.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
*
2020
* @author Fabien Potencier <fabien@symfony.com>
2121
*/
22-
class CustomFilterIterator extends FilterIterator
22+
class CustomFilterIterator extends \FilterIterator
2323
{
2424
private $filters = array();
2525

Iterator/DateRangeFilterIterator.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
*
1919
* @author Fabien Potencier <fabien@symfony.com>
2020
*/
21-
class DateRangeFilterIterator extends FilterIterator
21+
class DateRangeFilterIterator extends \FilterIterator
2222
{
2323
private $comparators = array();
2424

Iterator/DepthRangeFilterIterator.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
*
1717
* @author Fabien Potencier <fabien@symfony.com>
1818
*/
19-
class DepthRangeFilterIterator extends FilterIterator
19+
class DepthRangeFilterIterator extends \FilterIterator
2020
{
2121
private $minDepth = 0;
2222

Iterator/ExcludeDirectoryFilterIterator.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
*
1717
* @author Fabien Potencier <fabien@symfony.com>
1818
*/
19-
class ExcludeDirectoryFilterIterator extends FilterIterator implements \RecursiveIterator
19+
class ExcludeDirectoryFilterIterator extends \FilterIterator implements \RecursiveIterator
2020
{
2121
private $iterator;
2222
private $isRecursive;

Iterator/FileTypeFilterIterator.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
*
1717
* @author Fabien Potencier <fabien@symfony.com>
1818
*/
19-
class FileTypeFilterIterator extends FilterIterator
19+
class FileTypeFilterIterator extends \FilterIterator
2020
{
2121
const ONLY_FILES = 1;
2222
const ONLY_DIRECTORIES = 2;

Iterator/FilterIterator.php

Lines changed: 0 additions & 60 deletions
This file was deleted.

Iterator/MultiplePcreFilterIterator.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
*
1717
* @author Fabien Potencier <fabien@symfony.com>
1818
*/
19-
abstract class MultiplePcreFilterIterator extends FilterIterator
19+
abstract class MultiplePcreFilterIterator extends \FilterIterator
2020
{
2121
protected $matchRegexps = array();
2222
protected $noMatchRegexps = array();

Iterator/RecursiveDirectoryIterator.php

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -118,11 +118,6 @@ public function rewind()
118118
return;
119119
}
120120

121-
// @see https://bugs.php.net/68557
122-
if (PHP_VERSION_ID < 50523 || PHP_VERSION_ID >= 50600 && PHP_VERSION_ID < 50607) {
123-
parent::next();
124-
}
125-
126121
parent::rewind();
127122
}
128123

Iterator/SizeRangeFilterIterator.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
*
1919
* @author Fabien Potencier <fabien@symfony.com>
2020
*/
21-
class SizeRangeFilterIterator extends FilterIterator
21+
class SizeRangeFilterIterator extends \FilterIterator
2222
{
2323
private $comparators = array();
2424

0 commit comments

Comments
 (0)