Merge branch '2.8' into 3.2

fabpot · fabpot · commit b7fe49a65759 · 2017-06-01T14:00:24.000-07:00
* 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
diff --git a/Translation/PhpExtractor.php b/Translation/PhpExtractor.php
@@ -85,7 +85,7 @@ public function extract($resource, MessageCatalogue $catalog)
         foreach ($files as $file) {
             $this->parseTokens(token_get_all(file_get_contents($file)), $catalog);
 
-            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();
             }

Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ public function extract($resource, MessageCatalogue $catalog)`
`85`	`85`	`foreach ($files as $file) {`
`86`	`86`	`$this->parseTokens(token_get_all(file_get_contents($file)), $catalog);`
`87`	`87`
`88`		`- if (PHP_VERSION_ID >= 70000) {`
	`88`	`+ if (\PHP_VERSION_ID >= 70000) {`
`89`	`89`	`// PHP 7 memory manager will not release after token_get_all(), see https://bugs.php.net/70098`
`90`	`90`	`gc_mem_caches();`
`91`	`91`	`}`