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

added the actual phpversion into the error message when phpversion doesn satisfy the requirement

pull/3977/head
Markus Staab 2015-04-29 18:21:18 +02:00
parent 1cb427ff5c
commit c9bdf3a07a
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

@ -97,7 +97,7 @@ class Problem
return $msg . 'you are running this with PHP and not HHVM.'; return $msg . 'you are running this with PHP and not HHVM.';
} }
return $msg . 'your PHP version does not satisfy that requirement.'; return $msg . 'your PHP version ('. phpversion().') does not satisfy that requirement.';
} }
// handle php extensions // handle php extensions

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

@ -223,7 +223,7 @@ class Rule
} elseif ($targetName === 'hhvm') { } elseif ($targetName === 'hhvm') {
$text .= ' -> you are running this with PHP and not HHVM.'; $text .= ' -> you are running this with PHP and not HHVM.';
} else { } else {
$text .= ' -> your PHP version does not satisfy that requirement.'; $text .= ' -> your PHP version ('. phpversion().') does not satisfy that requirement.';
} }
} elseif (0 === strpos($targetName, 'ext-')) { } elseif (0 === strpos($targetName, 'ext-')) {
$ext = substr($targetName, 4); $ext = substr($targetName, 4);