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

Reuse devPackageNames if available instead of filtering the dev packages out by looping through all requirements

pull/9465/head
Jordi Boggiano 2020-11-12 10:35:42 +01:00
parent b574f10d9d
commit b78b2df5bb
No known key found for this signature in database
GPG Key ID: 7BBD42C429EC80BC
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/Composer/Autoload/AutoloadGenerator.php
View File

@ -195,7 +195,14 @@ EOF;
// Collect information from all packages. // Collect information from all packages.
$devPackageNames = $localRepo->getDevPackageNames(); $devPackageNames = $localRepo->getDevPackageNames();
$packageMap = $this->buildPackageMap($installationManager, $rootPackage, $localRepo->getCanonicalPackages()); $packageMap = $this->buildPackageMap($installationManager, $rootPackage, $localRepo->getCanonicalPackages());
$autoloads = $this->parseAutoloads($packageMap, $rootPackage, $this->devMode === false); if ($this->devMode) {
// if dev mode is enabled, then we do not filter any dev packages out so disable this entirely
$filteredDevPackages = false;
} else {
// if the list of dev package names is available we use that straight, otherwise pass true which means use legacy algo to figure them out
$filteredDevPackages = $devPackageNames ?: true;
}
$autoloads = $this->parseAutoloads($packageMap, $rootPackage, $filteredDevPackages);
// Process the 'psr-0' base directories. // Process the 'psr-0' base directories.
foreach ($autoloads['psr-0'] as $namespace => $paths) { foreach ($autoloads['psr-0'] as $namespace => $paths) {
@ -446,13 +453,17 @@ EOF;
* *
* @param array $packageMap array of array(package, installDir-relative-to-composer.json) * @param array $packageMap array of array(package, installDir-relative-to-composer.json)
* @param RootPackageInterface $rootPackage root package instance * @param RootPackageInterface $rootPackage root package instance
* @param bool $filterOutRequireDevPackages whether to filter out require-dev packages * @param bool|string[] $filteredDevPackages If an array, the list of packages that must be removed. If bool, whether to filter out require-dev packages
* @return array array('psr-0' => array('Ns\\Foo' => array('installDir'))) * @return array array('psr-0' => array('Ns\\Foo' => array('installDir')))
*/ */
public function parseAutoloads(array $packageMap, PackageInterface $rootPackage, $filterOutRequireDevPackages = false) public function parseAutoloads(array $packageMap, PackageInterface $rootPackage, $filteredDevPackages = false)
{ {
$rootPackageMap = array_shift($packageMap); $rootPackageMap = array_shift($packageMap);
if ($filterOutRequireDevPackages) { if (is_array($filteredDevPackages)) {
$packageMap = array_filter($packageMap, function ($item) use ($filteredDevPackages) {
return !in_array($item[0]->getName(), $filteredDevPackages, true);
});
} elseif ($filteredDevPackages) {
$packageMap = $this->filterPackageMap($packageMap, $rootPackage); $packageMap = $this->filterPackageMap($packageMap, $rootPackage);
} }
$sortedPackageMap = $this->sortPackageMap($packageMap); $sortedPackageMap = $this->sortPackageMap($packageMap);