public-mirrors
/
composer
mirror of https://github.com/composer/composer
1
0
Fork 0
Code

Add mbstring/iconv check, fixes #4929

pull/4933/head
Jordi Boggiano 2016-02-17 15:42:58 +00:00
parent dfd61a53d0
commit 1716a346e6
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Composer/Command/DiagnoseCommand.php
View File

@ -433,6 +433,10 @@ EOT
$errors['hash'] = true; $errors['hash'] = true;
} }
if (!extension_loaded('iconv') && !extension_loaded('mbstring')) {
$errors['iconv_mbstring'] = true;
}
if (!ini_get('allow_url_fopen')) { if (!ini_get('allow_url_fopen')) {
$errors['allow_url_fopen'] = true; $errors['allow_url_fopen'] = true;
} }
@ -505,6 +509,11 @@ EOT
$text .= "Install it or recompile php without --disable-hash"; $text .= "Install it or recompile php without --disable-hash";
break; break;
case 'iconv_mbstring':
$text = PHP_EOL."The iconv OR mbstring extension is required and both are missing.".PHP_EOL;
$text .= "Install either of them or recompile php without --disable-iconv";
break;
case 'unicode': case 'unicode':
$text = PHP_EOL."The detect_unicode setting must be disabled.".PHP_EOL; $text = PHP_EOL."The detect_unicode setting must be disabled.".PHP_EOL;
$text .= "Add the following to the end of your `php.ini`:".PHP_EOL; $text .= "Add the following to the end of your `php.ini`:".PHP_EOL;