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

Changes after excellent feedback from Jordi

pull/822/head
Christian Riesen 2012-06-22 17:16:07 +02:00
parent 432815df67
commit 70e7194b07
1 changed files with 6 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/Composer/Repository/PlatformRepository.php
View File

@ -43,20 +43,13 @@ class PlatformRepository extends ArrayRepository
// Extensions scanning // Extensions scanning
foreach ($loadedExtensions as $name) { foreach ($loadedExtensions as $name) {
switch ($name) { if (in_array($name, array('standard', 'Core'))) {
// Skipped "extensions"
case 'standard':
case 'Core':
continue; continue;
// All normal cases for standard extensions
default:
$reflExt = new \ReflectionExtension($name);
$prettyVersion = $reflExt->getVersion();
break;
} }
$reflExt = new \ReflectionExtension($name);
try { try {
$prettyVersion = $reflExt->getVersion();
$version = $versionParser->normalize($prettyVersion); $version = $versionParser->normalize($prettyVersion);
} catch (\UnexpectedValueException $e) { } catch (\UnexpectedValueException $e) {
$prettyVersion = '0'; $prettyVersion = '0';
@ -73,11 +66,6 @@ class PlatformRepository extends ArrayRepository
// relying on them. // relying on them.
foreach ($loadedExtensions as $name) { foreach ($loadedExtensions as $name) {
switch ($name) { switch ($name) {
// Skipped "extensions"
case 'standard':
case 'Core':
continue;
case 'curl': case 'curl':
$curlVersion = curl_version(); $curlVersion = curl_version();
$prettyVersion = $curlVersion['version']; $prettyVersion = $curlVersion['version'];
@ -96,11 +84,6 @@ class PlatformRepository extends ArrayRepository
$prettyVersion = trim($prettyVersion); $prettyVersion = trim($prettyVersion);
break; break;
case 'mysqli':
// not so pretty version
$prettyVersion = mysqli_get_client_version();
break;
case 'pcre': case 'pcre':
$prettyVersion = PCRE_VERSION; $prettyVersion = PCRE_VERSION;
break; break;
@ -121,8 +104,7 @@ class PlatformRepository extends ArrayRepository
try { try {
$version = $versionParser->normalize($prettyVersion); $version = $versionParser->normalize($prettyVersion);
} catch (\UnexpectedValueException $e) { } catch (\UnexpectedValueException $e) {
$prettyVersion = '0'; continue;
$version = $versionParser->normalize($prettyVersion);
} }
$ext = new MemoryPackage('lib-'.$name, $version, $prettyVersion); $ext = new MemoryPackage('lib-'.$name, $version, $prettyVersion);