Merge branch '2.7' into 2.8

fabpot · fabpot · commit 14db4cc1172a · 2017-06-01T13:52:29.000-07:00
* 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
diff --git a/Tests/Dumper/JsonFileDumperTest.php b/Tests/Dumper/JsonFileDumperTest.php
@@ -19,7 +19,7 @@ class JsonFileDumperTest extends TestCase
 {
     public function testFormatCatalogue()
     {
-        if (PHP_VERSION_ID < 50400) {
+        if (\PHP_VERSION_ID < 50400) {
             $this->markTestIncomplete('PHP below 5.4 doesn\'t support JSON pretty printing');
         }
 

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ class JsonFileDumperTest extends TestCase`
`19`	`19`	`{`
`20`	`20`	`public function testFormatCatalogue()`
`21`	`21`	`{`
`22`		`- if (PHP_VERSION_ID < 50400) {`
	`22`	`+ if (\PHP_VERSION_ID < 50400) {`
`23`	`23`	`$this->markTestIncomplete('PHP below 5.4 doesn\'t support JSON pretty printing');`
`24`	`24`	`}`
`25`	`25`