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
Merge branch '2.7' into 2.8
2026-03-24 17:22:11 +01:00 · 2017-06-01 14:00:24 -07:00 · 2017-06-01 13:52:29 -07:00 · 2017-06-01 13:44:56 -07:00
2 changed files with 2 additions and 2 deletions
--- a/ClassCollectionLoader.php
+++ b/ClassCollectionLoader.php
@@ -256,7 +256,7 @@ REGEX;

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

-        if (PHP_VERSION_ID >= 70000) {
+        if (\PHP_VERSION_ID >= 70000) {
            // PHP 7 memory manager will not release after token_get_all(), see https://bugs.php.net/70098
            unset($tokens, $rawChunk);
            gc_mem_caches();
--- a/ClassMapGenerator.php
+++ b/ClassMapGenerator.php
@@ -64,7 +64,7 @@ class ClassMapGenerator

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

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