1
0
Fork 0
mirror of https://github.com/composer/composer synced 2025-05-11 01:22:54 +00:00

Merge branch 'test'

Conflicts:
	src/Composer/Downloader/FileDownloader.php
	src/Composer/Repository/Vcs/HgBitbucketDriver.php
This commit is contained in:
François Pluchino 2012-01-12 12:19:13 +01:00
commit f65b34860f
12 changed files with 7 additions and 14 deletions

0
bin/compile Executable file → Normal file
View file

0
bin/composer Executable file → Normal file
View file

View file

@ -63,7 +63,6 @@ EOT
$needle = $input->getArgument('package'); $needle = $input->getArgument('package');
$references = array(); $references = array();
$recommendedDependencies = array();
// check if we have a local installation so we can grab the right package/version // check if we have a local installation so we can grab the right package/version
$repos = array_merge( $repos = array_merge(

View file

@ -53,9 +53,8 @@ EOT
protected function execute(InputInterface $input, OutputInterface $output) protected function execute(InputInterface $input, OutputInterface $output)
{ {
$composer = $this->getComposer();
$installCommand = $this->getApplication()->find('install'); $installCommand = $this->getApplication()->find('install');
return $installCommand->install($input, $output, true); return $installCommand->install($input, $output, true);
} }
} }

View file

@ -1078,9 +1078,7 @@ class Solver
protected function createTransaction() protected function createTransaction()
{ {
$transaction = array(); $transaction = array();
$installMeansUpdateMap = array(); $installMeansUpdateMap = array();
$ignoreRemoveMap = array();
foreach ($this->decisionQueue as $i => $literal) { foreach ($this->decisionQueue as $i => $literal) {
$package = $literal->getPackage(); $package = $literal->getPackage();
@ -1739,7 +1737,7 @@ class Solver
$level = 1; $level = 1;
$systemLevel = $level + 1; $systemLevel = $level + 1;
$minimizationsteps = 0; $minimizationSteps = 0;
$installedPos = 0; $installedPos = 0;
$this->installedPackages = $this->installed->getPackages(); $this->installedPackages = $this->installed->getPackages();
@ -1930,7 +1928,7 @@ class Solver
$installedPos = 0; $installedPos = 0;
} }
$systemlevel = $level + 1; $systemLevel = $level + 1;
if ($pass < 2) { if ($pass < 2) {
// had trouble => retry // had trouble => retry

View file

@ -44,7 +44,6 @@ class RootPackageLoader extends ArrayLoader
$package = parent::load($config); $package = parent::load($config);
if (isset($config['repositories'])) { if (isset($config['repositories'])) {
$repositories = array();
foreach ($config['repositories'] as $repoName => $repo) { foreach ($config['repositories'] as $repoName => $repo) {
if (false === $repo && 'packagist' === $repoName) { if (false === $repo && 'packagist' === $repoName) {
continue; continue;

View file

@ -112,7 +112,7 @@ class VersionParser
if (count($constraints) > 1) { if (count($constraints) > 1) {
$constraintObjects = array(); $constraintObjects = array();
foreach ($constraints as $key => $constraint) { foreach ($constraints as $constraint) {
$constraintObjects = array_merge($constraintObjects, $this->parseConstraint($constraint)); $constraintObjects = array_merge($constraintObjects, $this->parseConstraint($constraint));
} }
} else { } else {

View file

@ -102,7 +102,6 @@ class PearRepository extends ArrayRepository
} }
$deps = unserialize($deps); $deps = unserialize($deps);
if (isset($deps['required']['package'])) { if (isset($deps['required']['package'])) {
$requires = array();
if (isset($deps['required']['package']['name'])) { if (isset($deps['required']['package']['name'])) {
$deps['required']['package'] = array($deps['required']['package']); $deps['required']['package'] = array($deps['required']['package']);

View file

@ -160,6 +160,6 @@ class GitBitbucketDriver extends VcsDriver implements VcsDriverInterface
*/ */
public static function supports($url, $deep = false) public static function supports($url, $deep = false)
{ {
return preg_match('#^https://bitbucket\.org/([^/]+)/(.+?)\.git$#', $url, $match); return preg_match('#^https://bitbucket\.org/([^/]+)/(.+?)\.git$#', $url);
} }
} }

View file

@ -150,6 +150,6 @@ class GitHubDriver extends VcsDriver implements VcsDriverInterface
*/ */
public static function supports($url, $deep = false) public static function supports($url, $deep = false)
{ {
return extension_loaded('openssl') && preg_match('#^(?:https?|git)://github\.com/([^/]+)/(.+?)(?:\.git)?$#', $url, $match); return extension_loaded('openssl') && preg_match('#^(?:https?|git)://github\.com/([^/]+)/(.+?)(?:\.git)?$#', $url);
} }
} }

View file

@ -160,6 +160,6 @@ class HgBitbucketDriver extends VcsDriver implements VcsDriverInterface
*/ */
public static function supports($url, $deep = false) public static function supports($url, $deep = false)
{ {
return preg_match('#^(?:https?|http)://bitbucket\.org/([^/]+)/([^/]+)/?$#', $url, $match); return preg_match('#^https://bitbucket\.org/([^/]+)/([^/]+)/?$#', $url);
} }
} }

View file

@ -74,7 +74,6 @@ class VcsRepository extends ArrayRepository
$versionParser = new VersionParser; $versionParser = new VersionParser;
$loader = new ArrayLoader(); $loader = new ArrayLoader();
$versions = array();
if ($driver->hasComposerFile($driver->getRootIdentifier())) { if ($driver->hasComposerFile($driver->getRootIdentifier())) {
$data = $driver->getComposerInformation($driver->getRootIdentifier()); $data = $driver->getComposerInformation($driver->getRootIdentifier());