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

Fix inconsistent parameter names in inheritance trees

pull/10629/head
Jordi Boggiano 2022-03-16 10:05:07 +01:00
parent 38813e10f7
commit 20e410f3a2
No known key found for this signature in database
GPG Key ID: 7BBD42C429EC80BC
5 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Composer/Downloader/FileDownloader.php
View File

@ -476,7 +476,7 @@ class FileDownloader implements DownloaderInterface, ChangeReportInterface
* @inheritDoc * @inheritDoc
* @throws \RuntimeException * @throws \RuntimeException
*/ */
public function getLocalChanges(PackageInterface $package, string $targetDir): ?string public function getLocalChanges(PackageInterface $package, string $path): ?string
{ {
$prevIO = $this->io; $prevIO = $this->io;
@ -485,7 +485,7 @@ class FileDownloader implements DownloaderInterface, ChangeReportInterface
$e = null; $e = null;
$output = ''; $output = '';
$targetDir = Filesystem::trimTrailingSlash($targetDir); $targetDir = Filesystem::trimTrailingSlash($path);
try { try {
if (is_dir($targetDir.'_compare')) { if (is_dir($targetDir.'_compare')) {
$this->filesystem->removeDirectory($targetDir.'_compare'); $this->filesystem->removeDirectory($targetDir.'_compare');

12
src/Composer/Package/RootAliasPackage.php
View File

@ -91,21 +91,21 @@ class RootAliasPackage extends CompleteAliasPackage implements RootPackageInterf
/** /**
* @inheritDoc * @inheritDoc
*/ */
public function setRequires(array $require): void public function setRequires(array $requires): void
{ {
$this->requires = $this->replaceSelfVersionDependencies($require, Link::TYPE_REQUIRE); $this->requires = $this->replaceSelfVersionDependencies($requires, Link::TYPE_REQUIRE);
$this->aliasOf->setRequires($require); $this->aliasOf->setRequires($requires);
} }
/** /**
* @inheritDoc * @inheritDoc
*/ */
public function setDevRequires(array $devRequire): void public function setDevRequires(array $devRequires): void
{ {
$this->devRequires = $this->replaceSelfVersionDependencies($devRequire, Link::TYPE_DEV_REQUIRE); $this->devRequires = $this->replaceSelfVersionDependencies($devRequires, Link::TYPE_DEV_REQUIRE);
$this->aliasOf->setDevRequires($devRequire); $this->aliasOf->setDevRequires($devRequires);
} }
/** /**

6
src/Composer/Repository/ArrayRepository.php
View File

@ -57,16 +57,16 @@ class ArrayRepository implements RepositoryInterface
/** /**
* @inheritDoc * @inheritDoc
*/ */
public function loadPackages(array $packageMap, array $acceptableStabilities, array $stabilityFlags, array $alreadyLoaded = array()) public function loadPackages(array $packageNameMap, array $acceptableStabilities, array $stabilityFlags, array $alreadyLoaded = array())
{ {
$packages = $this->getPackages(); $packages = $this->getPackages();
$result = array(); $result = array();
$namesFound = array(); $namesFound = array();
foreach ($packages as $package) { foreach ($packages as $package) {
if (array_key_exists($package->getName(), $packageMap)) { if (array_key_exists($package->getName(), $packageNameMap)) {
if ( if (
(!$packageMap[$package->getName()] || $packageMap[$package->getName()]->matches(new Constraint('==', $package->getVersion()))) (!$packageNameMap[$package->getName()] || $packageNameMap[$package->getName()]->matches(new Constraint('==', $package->getVersion())))
&& StabilityFilter::isPackageAcceptable($acceptableStabilities, $stabilityFlags, $package->getNames(), $package->getStability()) && StabilityFilter::isPackageAcceptable($acceptableStabilities, $stabilityFlags, $package->getNames(), $package->getStability())
&& !isset($alreadyLoaded[$package->getName()][$package->getVersion()]) && !isset($alreadyLoaded[$package->getName()][$package->getVersion()])
) { ) {

4
src/Composer/Repository/CompositeRepository.php
View File

@ -105,13 +105,13 @@ class CompositeRepository implements RepositoryInterface
/** /**
* @inheritDoc * @inheritDoc
*/ */
public function loadPackages(array $packageMap, array $acceptableStabilities, array $stabilityFlags, array $alreadyLoaded = array()): array public function loadPackages(array $packageNameMap, array $acceptableStabilities, array $stabilityFlags, array $alreadyLoaded = array()): array
{ {
$packages = array(); $packages = array();
$namesFound = array(); $namesFound = array();
foreach ($this->repositories as $repository) { foreach ($this->repositories as $repository) {
/* @var $repository RepositoryInterface */ /* @var $repository RepositoryInterface */
$result = $repository->loadPackages($packageMap, $acceptableStabilities, $stabilityFlags, $alreadyLoaded); $result = $repository->loadPackages($packageNameMap, $acceptableStabilities, $stabilityFlags, $alreadyLoaded);
$packages[] = $result['packages']; $packages[] = $result['packages'];
$namesFound[] = $result['namesFound']; $namesFound[] = $result['namesFound'];
} }

10
src/Composer/Repository/FilterRepository.php
View File

@ -112,19 +112,19 @@ class FilterRepository implements RepositoryInterface
/** /**
* @inheritDoc * @inheritDoc
*/ */
public function loadPackages(array $packageMap, array $acceptableStabilities, array $stabilityFlags, array $alreadyLoaded = array()): array public function loadPackages(array $packageNameMap, array $acceptableStabilities, array $stabilityFlags, array $alreadyLoaded = array()): array
{ {
foreach ($packageMap as $name => $constraint) { foreach ($packageNameMap as $name => $constraint) {
if (!$this->isAllowed($name)) { if (!$this->isAllowed($name)) {
unset($packageMap[$name]); unset($packageNameMap[$name]);
} }
} }
if (!$packageMap) { if (!$packageNameMap) {
return array('namesFound' => array(), 'packages' => array()); return array('namesFound' => array(), 'packages' => array());
} }
$result = $this->repo->loadPackages($packageMap, $acceptableStabilities, $stabilityFlags, $alreadyLoaded); $result = $this->repo->loadPackages($packageNameMap, $acceptableStabilities, $stabilityFlags, $alreadyLoaded);
if (!$this->canonical) { if (!$this->canonical) {
$result['namesFound'] = array(); $result['namesFound'] = array();
} }