Skip to content

Commit a337421

Browse files
committed
Merge branch '2.7'
* 2.7: feature symfony#728 Added a new AppBundle to comply with Symfony Best Practices (javiereguiluz) fixed Symfony version dep updated VENDORS for 2.6.0-BETA2
2 parents 9a383da + c17f12a commit a337421

File tree

2 files changed

+13
-3
lines changed

2 files changed

+13
-3
lines changed

app/SymfonyRequirements.php

+12-2
Original file line numberDiff line numberDiff line change
@@ -440,8 +440,8 @@ public function __construct()
440440
}
441441

442442
$this->addRequirement(
443-
isset($timezones[date_default_timezone_get()]),
444-
sprintf('Configured default timezone "%s" must be supported by your installation of PHP', date_default_timezone_get()),
443+
isset($timezones[@date_default_timezone_get()]),
444+
sprintf('Configured default timezone "%s" must be supported by your installation of PHP', @date_default_timezone_get()),
445445
'Your default timezone is not supported by PHP. Check for typos in your <strong>php.ini</strong> file and have a look at the list of deprecated timezones at <a href="http://php.net/manual/en/timezones.others.php">http://php.net/manual/en/timezones.others.php</a>.'
446446
);
447447
}
@@ -530,6 +530,16 @@ function_exists('simplexml_import_dom'),
530530
'Install the <strong>PCRE</strong> extension (version 8.0+).'
531531
);
532532

533+
if (extension_loaded('mbstring')) {
534+
$this->addPhpIniRequirement(
535+
'mbstring.func_overload',
536+
create_function('$cfgValue', 'return (int) $cfgValue === 0;'),
537+
true,
538+
'string functions should not be overloaded',
539+
'Set "<strong>mbstring.func_overload</strong>" to <strong>0</strong> in php.ini<a href="#phpini">*</a> to disable function overloading by the mbstring extension.'
540+
);
541+
}
542+
533543
/* optional recommendations follow */
534544

535545
$this->addRecommendation(

app/check.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ function echo_style($style, $message)
110110
);
111111
$supports = has_color_support();
112112

113-
echo ($supports ? $styles[$style] : '').$message.($supports ? $styles['reset'] : '');
113+
echo($supports ? $styles[$style] : '').$message.($supports ? $styles['reset'] : '');
114114
}
115115

116116
function echo_block($style, $title, $message)

0 commit comments

Comments
 (0)