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

Report ICU failures as the intl extension being missing, refs #1939

pull/1947/head
Jordi Boggiano 2013-05-28 18:15:04 +02:00
parent b38db73611
commit 7449162aa4
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Composer/DependencyResolver/Problem.php
View File

@ -90,9 +90,13 @@ class Problem
// handle linked libs // handle linked libs
if (0 === stripos($job['packageName'], 'lib-')) { if (0 === stripos($job['packageName'], 'lib-')) {
$lib = substr($job['packageName'], 4); if (strtolower($job['packageName']) === 'lib-icu') {
$error = extension_loaded('intl') ? 'has the wrong version installed, try upgrading the intl extension.' : 'is missing from your system, make sure the intl extension is loaded.';
return "\n - The requested linked library ".$job['packageName'].$this->constraintToText($job['constraint']).' has the wrong version installed or is missing from your system, make sure to have the extension providing it.'; return "\n - The requested linked library ".$job['packageName'].$this->constraintToText($job['constraint']).' '.$error;
}
return "\n - The requested linked library ".$job['packageName'].$this->constraintToText($job['constraint']).' has the wrong version installed or is missing from your system, make sure to load the extension providing it.';
} }
if (!preg_match('{^[A-Za-z0-9_./-]+$}', $job['packageName'])) { if (!preg_match('{^[A-Za-z0-9_./-]+$}', $job['packageName'])) {