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

Show defaulted version if phpversion() returns nothing, fixes #2313

pull/2315/head
Jordi Boggiano 2013-10-09 19:44:33 -03:00
parent 3da05c68f9
commit cc37e4b0b8
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -84,7 +84,7 @@ class Problem
// handle php extensions // handle php extensions
if (0 === stripos($job['packageName'], 'ext-')) { if (0 === stripos($job['packageName'], 'ext-')) {
$ext = substr($job['packageName'], 4); $ext = substr($job['packageName'], 4);
$error = extension_loaded($ext) ? 'has the wrong version ('.phpversion($ext).') installed' : 'is missing from your system'; $error = extension_loaded($ext) ? 'has the wrong version ('.(phpversion($ext) ?: '0').') installed' : 'is missing from your system';
return "\n - The requested PHP extension ".$job['packageName'].$this->constraintToText($job['constraint']).' '.$error.'.'; return "\n - The requested PHP extension ".$job['packageName'].$this->constraintToText($job['constraint']).' '.$error.'.';
} }

2
src/Composer/DependencyResolver/Rule.php
View File

@ -215,7 +215,7 @@ class Rule
// handle php extensions // handle php extensions
if (0 === strpos($targetName, 'ext-')) { if (0 === strpos($targetName, 'ext-')) {
$ext = substr($targetName, 4); $ext = substr($targetName, 4);
$error = extension_loaded($ext) ? 'has the wrong version ('.phpversion($ext).') installed' : 'is missing from your system'; $error = extension_loaded($ext) ? 'has the wrong version ('.(phpversion($ext) ?: '0').') installed' : 'is missing from your system';
$text .= ' -> the requested PHP extension '.$ext.' '.$error.'.'; $text .= ' -> the requested PHP extension '.$ext.' '.$error.'.';
} elseif (0 === strpos($targetName, 'lib-')) { } elseif (0 === strpos($targetName, 'lib-')) {