Skip to content

Commit c6ccf71

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 dee868b + 08e4637 commit c6ccf71

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Encoder/JsonDecode.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ public function decode($data, $format, array $context = array())
101101
$recursionDepth = $context['json_decode_recursion_depth'];
102102
$options = $context['json_decode_options'];
103103

104-
if (PHP_VERSION_ID >= 50400) {
104+
if (\PHP_VERSION_ID >= 50400) {
105105
$decodedData = json_decode($data, $associative, $recursionDepth, $options);
106106
} else {
107107
$decodedData = json_decode($data, $associative, $recursionDepth);

0 commit comments

Comments
 (0)