Skip to content

Commit a263455

Browse files
committed
Merge branch '2.8' into 3.2
* 2.8: Using FQ name for PHP_VERSION_ID [Form] Fix \IntlDateFormatter timezone parameter usage to bypass PHP bug #66323 Harden the debugging of Twig filters and functions bumped Symfony version to 2.8.22 updated VERSION for 2.8.21 updated CHANGELOG for 2.8.21 bumped Symfony version to 2.7.29 updated VERSION for 2.7.28 update CONTRIBUTORS for 2.7.28 updated CHANGELOG for 2.7.28
2 parents 81ea578 + 4f4e848 commit a263455

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Iterator/FilterIterator.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ abstract class FilterIterator extends \FilterIterator
2929
*/
3030
public function rewind()
3131
{
32-
if (PHP_VERSION_ID > 50607 || (PHP_VERSION_ID > 50523 && PHP_VERSION_ID < 50600)) {
32+
if (\PHP_VERSION_ID > 50607 || (\PHP_VERSION_ID > 50523 && \PHP_VERSION_ID < 50600)) {
3333
parent::rewind();
3434

3535
return;

Iterator/RecursiveDirectoryIterator.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ public function rewind()
119119
}
120120

121121
// @see https://bugs.php.net/68557
122-
if (PHP_VERSION_ID < 50523 || PHP_VERSION_ID >= 50600 && PHP_VERSION_ID < 50607) {
122+
if (\PHP_VERSION_ID < 50523 || \PHP_VERSION_ID >= 50600 && \PHP_VERSION_ID < 50607) {
123123
parent::next();
124124
}
125125

0 commit comments

Comments
 (0)