1
0
Fork 0
pull/4207/merge
Jordi Boggiano 2016-02-29 15:04:05 +00:00
parent 6825c04a62
commit 0ed5b541a9
9 changed files with 17 additions and 13 deletions

View File

@ -88,8 +88,9 @@ EOT
continue;
}
foreach ($package['suggest'] as $suggestion => $reason) {
if (false === strpos('/', $suggestion) && !is_null($platform->findPackage($suggestion, '*')))
if (false === strpos('/', $suggestion) && !is_null($platform->findPackage($suggestion, '*'))) {
continue;
}
if (!isset($installed[$suggestion])) {
$suggesters[$packageName][$suggestion] = $reason;
$suggested[$suggestion][$packageName] = $reason;
@ -114,6 +115,7 @@ EOT
foreach (array_keys($suggested) as $suggestion) {
$io->write(sprintf('<info>%s</info>', $suggestion));
}
return;
}

View File

@ -12,7 +12,6 @@
namespace Composer\Downloader;
use Composer\Config;
use Composer\Package\PackageInterface;
use Composer\IO\IOInterface;
use Composer\Util\Filesystem;
@ -313,6 +312,7 @@ class DownloadManager
if ('dist' === $preference || (!$package->isDev() && 'auto' === $preference)) {
return 'dist';
}
return 'source';
}
}

View File

@ -88,12 +88,12 @@ class RootPackageLoader extends ArrayLoader
$config['source'] = array(
'type' => '',
'url' => '',
'reference' => $commit
'reference' => $commit,
);
$config['dist'] = array(
'type' => '',
'url' => '',
'reference' => $commit
'reference' => $commit,
);
}
}

View File

@ -136,8 +136,8 @@ class VersionGuesser
return $this->versionParser->normalize(trim($output));
} catch (\Exception $e) {
}
}
return null;
}
@ -236,9 +236,9 @@ class VersionGuesser
}
$version = $this->versionParser->normalize(trim($matches[1]));
return array('version' => $version, 'commit' => '');
}
}
}
}

View File

@ -639,6 +639,7 @@ class Filesystem
* #define _S_IFREG 0x8000
*/
$stat = lstat($junction);
return !($stat['mode'] & 0xC000);
}

View File

@ -244,6 +244,7 @@ class Perforce
return $value;
}
}
return null;
} else {
$command = 'echo $' . $name;