Skip to content
This repository was archived by the owner on Dec 5, 2022. It is now read-only.

Commit 48b96f2

Browse files
committed
Merge branch '2.7' into 2.8
* 2.7: 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.7.29 updated VERSION for 2.7.28 update CONTRIBUTORS for 2.7.28 updated CHANGELOG for 2.7.28
2 parents 6789dc8 + 8bfdaa2 commit 48b96f2

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

ClassCollectionLoader.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ public static function fixNamespaceDeclarations($source)
232232

233233
$output .= self::compressCode($rawChunk);
234234

235-
if (PHP_VERSION_ID >= 70000) {
235+
if (\PHP_VERSION_ID >= 70000) {
236236
// PHP 7 memory manager will not release after token_get_all(), see https://bugs.php.net/70098
237237
unset($tokens, $rawChunk);
238238
gc_mem_caches();

ClassMapGenerator.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
namespace Symfony\Component\ClassLoader;
1313

1414
if (!defined('SYMFONY_TRAIT')) {
15-
if (PHP_VERSION_ID >= 50400) {
15+
if (\PHP_VERSION_ID >= 50400) {
1616
define('SYMFONY_TRAIT', T_TRAIT);
1717
} else {
1818
define('SYMFONY_TRAIT', 0);
@@ -72,7 +72,7 @@ public static function createMap($dir)
7272

7373
$classes = self::findClasses($path);
7474

75-
if (PHP_VERSION_ID >= 70000) {
75+
if (\PHP_VERSION_ID >= 70000) {
7676
// PHP 7 memory manager will not release after token_get_all(), see https://bugs.php.net/70098
7777
gc_mem_caches();
7878
}

Tests/ClassMapGeneratorTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ public function getTestCreateMapTests()
108108
)),
109109
);
110110

111-
if (PHP_VERSION_ID >= 50400) {
111+
if (\PHP_VERSION_ID >= 50400) {
112112
$data[] = array(__DIR__.'/Fixtures/php5.4', array(
113113
'TFoo' => __DIR__.'/Fixtures/php5.4/traits.php',
114114
'CFoo' => __DIR__.'/Fixtures/php5.4/traits.php',
@@ -119,7 +119,7 @@ public function getTestCreateMapTests()
119119
));
120120
}
121121

122-
if (PHP_VERSION_ID >= 50500) {
122+
if (\PHP_VERSION_ID >= 50500) {
123123
$data[] = array(__DIR__.'/Fixtures/php5.5', array(
124124
'ClassCons\\Foo' => __DIR__.'/Fixtures/php5.5/class_cons.php',
125125
));

0 commit comments

Comments
 (0)