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

Fix RepositorySet constructor calls to use new signature

pull/7936/head
Nils Adermann 2019-11-07 21:56:17 +01:00
parent 26da52227e
commit bf99f1a341
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Composer/Command/CreateProjectCommand.php
View File

@ -293,7 +293,7 @@ EOT
throw new \InvalidArgumentException('Invalid stability provided ('.$stability.'), must be one of: '.implode(', ', array_keys(BasePackage::$stabilities))); throw new \InvalidArgumentException('Invalid stability provided ('.$stability.'), must be one of: '.implode(', ', array_keys(BasePackage::$stabilities)));
} }
$repositorySet = new RepositorySet(array(), $stability); $repositorySet = new RepositorySet(array(), array(), $stability);
$repositorySet->addRepository($sourceRepo); $repositorySet->addRepository($sourceRepo);
$phpVersion = null; $phpVersion = null;

2
src/Composer/Command/InitCommand.php
View File

@ -666,7 +666,7 @@ EOT
$key = $minimumStability ?: 'default'; $key = $minimumStability ?: 'default';
if (!isset($this->repositorySets[$key])) { if (!isset($this->repositorySets[$key])) {
$this->repositorySets[$key] = $repositorySet = new RepositorySet(array(), $minimumStability ?: $this->getMinimumStability($input)); $this->repositorySets[$key] = $repositorySet = new RepositorySet(array(), array(), $minimumStability ?: $this->getMinimumStability($input));
$repositorySet->addRepository($this->getRepos()); $repositorySet->addRepository($this->getRepos());
} }

4
src/Composer/Command/ShowCommand.php
View File

@ -538,7 +538,7 @@ EOT
$constraint = is_string($version) ? $this->versionParser->parseConstraints($version) : $version; $constraint = is_string($version) ? $this->versionParser->parseConstraints($version) : $version;
$policy = new DefaultPolicy(); $policy = new DefaultPolicy();
$repositorySet = new RepositorySet(array(), 'dev'); $repositorySet = new RepositorySet(array(), array(), 'dev');
$repositorySet->addRepository($repos); $repositorySet->addRepository($repos);
$matchedPackage = null; $matchedPackage = null;
@ -1002,7 +1002,7 @@ EOT
private function getRepositorySet(Composer $composer) private function getRepositorySet(Composer $composer)
{ {
if (!$this->repositorySet) { if (!$this->repositorySet) {
$this->repositorySet = new RepositorySet(array(), $composer->getPackage()->getMinimumStability(), $composer->getPackage()->getStabilityFlags()); $this->repositorySet = new RepositorySet(array(), array(), $composer->getPackage()->getMinimumStability(), $composer->getPackage()->getStabilityFlags());
$this->repositorySet->addRepository(new CompositeRepository($composer->getRepositoryManager()->getRepositories())); $this->repositorySet->addRepository(new CompositeRepository($composer->getRepositoryManager()->getRepositories()));
} }