Skip to content

Commit af9dda5

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 cebbad3 + 4560faf commit af9dda5

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

Command/ServerCommand.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ abstract class ServerCommand extends ContainerAwareCommand
2323
*/
2424
public function isEnabled()
2525
{
26-
if (PHP_VERSION_ID < 50400 || defined('HHVM_VERSION')) {
26+
if (\PHP_VERSION_ID < 50400 || defined('HHVM_VERSION')) {
2727
return false;
2828
}
2929

Templating/Helper/CodeHelper.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ public function fileExcerpt($file, $line)
154154
*/
155155
public function formatFile($file, $line, $text = null)
156156
{
157-
if (PHP_VERSION_ID >= 50400) {
157+
if (\PHP_VERSION_ID >= 50400) {
158158
$flags = ENT_QUOTES | ENT_SUBSTITUTE;
159159
} else {
160160
$flags = ENT_QUOTES;

Translation/PhpExtractor.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ public function extract($resource, MessageCatalogue $catalog)
8585
foreach ($files as $file) {
8686
$this->parseTokens(token_get_all(file_get_contents($file)), $catalog);
8787

88-
if (PHP_VERSION_ID >= 70000) {
88+
if (\PHP_VERSION_ID >= 70000) {
8989
// PHP 7 memory manager will not release after token_get_all(), see https://bugs.php.net/70098
9090
gc_mem_caches();
9191
}

0 commit comments

Comments
 (0)