Merge branch '3.2' into 3.3

* 3.2: Fix optional cache warmers are always instantiated whereas they should be lazy-loaded add some \ on PHP_VERSION_ID for 2.8 [PropertyInfo][DoctrineBridge] The bigint Doctrine's type must be converted to string
2026-03-24 17:22:11 +01:00 · 2017-06-02 11:51:43 +02:00 · 2017-06-01 14:01:25 -07: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 3 additions and 3 deletions
--- a/ClassCollectionLoader.php
+++ b/ClassCollectionLoader.php
@@ -11,7 +11,7 @@

 namespace Symfony\Component\ClassLoader;

-if (PHP_VERSION_ID >= 70000) {
+if (\PHP_VERSION_ID >= 70000) {
    @trigger_error('The '.__NAMESPACE__.'\ClassCollectionLoader class is deprecated since version 3.3 and will be removed in 4.0.', E_USER_DEPRECATED);
 }

@@ -262,7 +262,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
@@ -68,7 +68,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();
            }
Author	SHA1	Message	Date
Nicolas Grekas	386a294d62	Merge branch '3.2' into 3.3 * 3.2: Fix optional cache warmers are always instantiated whereas they should be lazy-loaded add some \ on PHP_VERSION_ID for 2.8 [PropertyInfo][DoctrineBridge] The bigint Doctrine's type must be converted to string	2017-06-02 11:51:43 +02:00
Fabien Potencier	168245af83	Merge branch '3.2' into 3.3 * 3.2: 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 3.2.10 updated VERSION for 3.2.9 updated CHANGELOG for 3.2.9 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	2017-06-01 14:01:25 -07:00
Fabien Potencier	e192d96b15	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	2017-06-01 14:00:24 -07:00
Fabien Potencier	48b96f2fa9	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	2017-06-01 13:52:29 -07:00
Fabien Potencier	8bfdaa2e7a	Using FQ name for PHP_VERSION_ID	2017-06-01 13:44:56 -07:00