Update dependencies.

This commit is contained in:
Tim Schumacher 2015-03-29 19:39:46 +02:00
parent 2027b94179
commit 0987c7c99c
2 changed files with 374 additions and 240 deletions

View file

@ -533,7 +533,7 @@ class SymfonyRequirements extends RequirementCollection
if (extension_loaded('mbstring')) { if (extension_loaded('mbstring')) {
$this->addPhpIniRequirement( $this->addPhpIniRequirement(
'mbstring.func_overload', 'mbstring.func_overload',
create_function('$cfgValue', 'return (int) $cfgValue !== 0;'), create_function('$cfgValue', 'return (int) $cfgValue === 0;'),
true, true,
'string functions should not be overloaded', 'string functions should not be overloaded',
'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.' '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.'
@ -590,8 +590,8 @@ class SymfonyRequirements extends RequirementCollection
$this->addRecommendation( $this->addRecommendation(
class_exists('DomDocument'), class_exists('DomDocument'),
'PHP-XML module should be installed', 'PHP-DOM and PHP-XML modules should be installed',
'Install and enable the <strong>PHP-XML</strong> module.' 'Install and enable the <strong>PHP-DOM</strong> and the <strong>PHP-XML</strong> modules.'
); );
$this->addRecommendation( $this->addRecommendation(
@ -682,10 +682,8 @@ class SymfonyRequirements extends RequirementCollection
); );
if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') { if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
$this->addPhpIniRecommendation( $this->addRecommendation(
'realpath_cache_size', $this->getRealpathCacheSize() > 1000,
create_function('$cfgValue', 'return (int) $cfgValue > 1000;'),
false,
'realpath_cache_size should be above 1024 in php.ini', 'realpath_cache_size should be above 1024 in php.ini',
'Set "<strong>realpath_cache_size</strong>" to e.g. "<strong>1024</strong>" in php.ini<a href="#phpini">*</a> to improve performance on windows.' 'Set "<strong>realpath_cache_size</strong>" to e.g. "<strong>1024</strong>" in php.ini<a href="#phpini">*</a> to improve performance on windows.'
); );
@ -714,4 +712,28 @@ class SymfonyRequirements extends RequirementCollection
); );
} }
} }
/**
* Loads realpath_cache_size from php.ini and converts it to int.
*
* (e.g. 16k is converted to 16384 int)
*
* @return int
*/
protected function getRealpathCacheSize()
{
$size = ini_get('realpath_cache_size');
$size = trim($size);
$unit = strtolower(substr($size, -1, 1));
switch ($unit) {
case 'g':
return $size * 1024 * 1024 * 1024;
case 'm':
return $size * 1024 * 1024;
case 'k':
return $size * 1024;
default:
return (int) $size;
}
}
} }

528
composer.lock generated

File diff suppressed because it is too large Load diff