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

ComposerRepository: add a warning if the packages key doesn't match the package name (#10735)

pull/10737/head
Stephan 2022-04-14 15:53:18 +01:00 committed by GitHub
parent 2d153f2371
commit b1828ef653
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Composer/Repository/ComposerRepository.php
View File

@ -105,6 +105,8 @@ class ComposerRepository extends ArrayRepository implements ConfigurableReposito
private $hasPartialPackages = false; private $hasPartialPackages = false;
/** @var ?array<string, mixed[]> */ /** @var ?array<string, mixed[]> */
private $partialPackagesByName = null; private $partialPackagesByName = null;
/** @var bool */
private $displayedWarningAboutNonMatchingPackageIndex = false;
/** /**
* @var array list of package names which are fresh and can be loaded from the cache directly in case loadPackage is called several times * @var array list of package names which are fresh and can be loaded from the cache directly in case loadPackage is called several times
@ -1235,8 +1237,13 @@ class ComposerRepository extends ArrayRepository implements ConfigurableReposito
if (isset($data['packages'])) { if (isset($data['packages'])) {
foreach ($data['packages'] as $package => $versions) { foreach ($data['packages'] as $package => $versions) {
$packageName = strtolower((string) $package);
foreach ($versions as $version => $metadata) { foreach ($versions as $version => $metadata) {
$packages[] = $metadata; $packages[] = $metadata;
if (!$this->displayedWarningAboutNonMatchingPackageIndex && $packageName !== strtolower((string) ($metadata['name'] ?? ''))) {
$this->displayedWarningAboutNonMatchingPackageIndex = true;
$this->io->writeError(sprintf("<warning>Warning: the packages key '%s' doesn't match the name defined in the package metadata '%s' in repository %s</warning>", $package, $metadata['name'] ?? '', $this->baseUrl));
}
} }
} }
} }
@ -1588,7 +1595,12 @@ class ComposerRepository extends ArrayRepository implements ConfigurableReposito
$this->partialPackagesByName = array(); $this->partialPackagesByName = array();
foreach ($rootData['packages'] as $package => $versions) { foreach ($rootData['packages'] as $package => $versions) {
foreach ($versions as $version) { foreach ($versions as $version) {
$this->partialPackagesByName[strtolower($version['name'])][] = $version; $versionPackageName = strtolower((string) ($version['name'] ?? ''));
$this->partialPackagesByName[$versionPackageName][] = $version;
if (!$this->displayedWarningAboutNonMatchingPackageIndex && $versionPackageName !== strtolower($package)) {
$this->io->writeError(sprintf("<warning>Warning: the packages key '%s' doesn't match the name defined in the package metadata '%s' in repository %s</warning>", $package, $version['name'] ?? '', $this->baseUrl));
$this->displayedWarningAboutNonMatchingPackageIndex = true;
}
} }
} }