Browse Source

Merge pull request #3977 from staabm/phpvers

added the actual phpversion into the error message when phpversion doesn...
Jordi Boggiano 10 years ago
parent
commit
ddfa8ed5f2

+ 1 - 1
src/Composer/DependencyResolver/Problem.php

@@ -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

+ 1 - 1
src/Composer/DependencyResolver/Rule.php

@@ -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);