Skip to content

Commit 4c7cfb5

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 a6d0a35 + d428588 commit 4c7cfb5

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Loader/AnnotationFileLoader.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public function load($file, $type = null)
6464
$collection->addResource(new FileResource($path));
6565
$collection->addCollection($this->loader->load($class, $type));
6666
}
67-
if (PHP_VERSION_ID >= 70000) {
67+
if (\PHP_VERSION_ID >= 70000) {
6868
// PHP 7 memory manager will not release after token_get_all(), see https://bugs.php.net/70098
6969
gc_mem_caches();
7070
}

0 commit comments

Comments
 (0)