Skip to content

Commit d428588

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 a8f328c + 6de57ec commit d428588

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)