Skip to content

Commit 4c29dec

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 93ccdde + dee17ff commit 4c29dec

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

Exception/ParseException.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ private function updateRepr()
123123
}
124124

125125
if (null !== $this->parsedFile) {
126-
if (PHP_VERSION_ID >= 50400) {
126+
if (\PHP_VERSION_ID >= 50400) {
127127
$jsonOptions = JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE;
128128
} else {
129129
$jsonOptions = 0;

Tests/ParseExceptionTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class ParseExceptionTest extends TestCase
1919
public function testGetMessage()
2020
{
2121
$exception = new ParseException('Error message', 42, 'foo: bar', '/var/www/app/config.yml');
22-
if (PHP_VERSION_ID >= 50400) {
22+
if (\PHP_VERSION_ID >= 50400) {
2323
$message = 'Error message in "/var/www/app/config.yml" at line 42 (near "foo: bar")';
2424
} else {
2525
$message = 'Error message in "\\/var\\/www\\/app\\/config.yml" at line 42 (near "foo: bar")';
@@ -31,7 +31,7 @@ public function testGetMessage()
3131
public function testGetMessageWithUnicodeInFilename()
3232
{
3333
$exception = new ParseException('Error message', 42, 'foo: bar', 'äöü.yml');
34-
if (PHP_VERSION_ID >= 50400) {
34+
if (\PHP_VERSION_ID >= 50400) {
3535
$message = 'Error message in "äöü.yml" at line 42 (near "foo: bar")';
3636
} else {
3737
$message = 'Error message in "\u00e4\u00f6\u00fc.yml" at line 42 (near "foo: bar")';

0 commit comments

Comments
 (0)