1
0
Fork 0

adjust message, skip test

currently we have no way to put dynamic values or wildcards in EXPECT-OUTPUT
pull/4881/head
Rob Bast 2016-02-05 13:21:30 +01:00
parent 94daeca57b
commit baabc612f6
3 changed files with 25 additions and 9 deletions

View File

@ -12,6 +12,8 @@
namespace Composer\DependencyResolver; namespace Composer\DependencyResolver;
use Composer\Package\CompletePackage;
/** /**
* @author Nils Adermann <naderman@naderman.de> * @author Nils Adermann <naderman@naderman.de>
*/ */
@ -203,27 +205,40 @@ class Rule
if ($targetName === 'php' || $targetName === 'php-64bit' || $targetName === 'hhvm') { if ($targetName === 'php' || $targetName === 'php-64bit' || $targetName === 'hhvm') {
// handle php/hhvm // handle php/hhvm
if (defined('HHVM_VERSION')) { if (defined('HHVM_VERSION')) {
$text .= ' -> your HHVM version does not satisfy that requirement.'; return $text . ' -> your HHVM version does not satisfy that requirement.';
} elseif ($targetName === 'hhvm') { } elseif ($targetName === 'hhvm') {
$text .= ' -> you are running this with PHP and not HHVM.'; return $text . ' -> you are running this with PHP and not HHVM.';
} else { } else {
$available = $pool->whatProvides($targetName); $packages = $pool->whatProvides($targetName);
$version = count($available) ? $available[0]->getPrettyVersion() : phpversion(); $package = count($packages) ? current($packages) : phpversion();
$text .= ' -> your PHP version or "config.platform.php" value ('.$version.') does not satisfy that requirement.';
if (!($package instanceof CompletePackage)) {
return $text . ' -> your PHP version ('.phpversion().') does not satisfy that requirement.';
}
$extra = $package->getExtra();
if (!empty($extra['config.platform'])) {
$text .= ' -> your PHP version ('.phpversion().') overriden by "config.platform.php" version ('.$package->getPrettyVersion().') does not satisfy that requirement.';
} else {
$text .= ' -> your PHP version ('.$package->getPrettyVersion().') does not satisfy that requirement.';
}
return $text;
} }
} elseif (0 === strpos($targetName, 'ext-')) { } elseif (0 === strpos($targetName, 'ext-')) {
// handle php extensions // handle php extensions
$ext = substr($targetName, 4); $ext = substr($targetName, 4);
$error = extension_loaded($ext) ? 'has the wrong version ('.(phpversion($ext) ?: '0').') 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.'.'; return $text . ' -> the requested PHP extension '.$ext.' '.$error.'.';
} elseif (0 === strpos($targetName, 'lib-')) { } elseif (0 === strpos($targetName, 'lib-')) {
// handle linked libs // handle linked libs
$lib = substr($targetName, 4); $lib = substr($targetName, 4);
$text .= ' -> the requested linked library '.$lib.' has the wrong version installed or is missing from your system, make sure to have the extension providing it.'; return $text . ' -> the requested linked library '.$lib.' has the wrong version installed or is missing from your system, make sure to have the extension providing it.';
} else { } else {
$text .= ' -> no matching package found.'; return $text . ' -> no matching package found.';
} }
} }

View File

@ -59,6 +59,7 @@ class PlatformRepository extends ArrayRepository
$version = $versionParser->normalize($override['version']); $version = $versionParser->normalize($override['version']);
$package = new CompletePackage($override['name'], $version, $override['version']); $package = new CompletePackage($override['name'], $version, $override['version']);
$package->setDescription('Package overridden via config.platform'); $package->setDescription('Package overridden via config.platform');
$package->setExtra(array('config.platform' => true));
parent::addPackage($package); parent::addPackage($package);
} }

View File

@ -37,7 +37,7 @@ Your requirements could not be resolved to an installable set of packages.
Problem 1 Problem 1
- Installation request for a ~1.0 -> satisfiable by a[1.0.0]. - Installation request for a ~1.0 -> satisfiable by a[1.0.0].
- a 1.0.0 requires php 5.5 -> your PHP version or "config.platform.php" value (5.3) does not satisfy that requirement. - a 1.0.0 requires php 5.5 -> your PHP version (5.6.17) overriden by "config.platform.php" version (5.3) does not satisfy that requirement.
--EXPECT-- --EXPECT--