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

Fix unstable order of psr-0 and psr-4 rules 

Fixes #12090
pull/12263/head
Jordi Boggiano 2025-01-09 14:50:13 +01:00
parent 9d87fd7e8d
commit 7b1e983ce9
No known key found for this signature in database
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -578,12 +578,17 @@ EOF;
} }
$sortedPackageMap = $this->sortPackageMap($packageMap); $sortedPackageMap = $this->sortPackageMap($packageMap);
$sortedPackageMap[] = $rootPackageMap; $sortedPackageMap[] = $rootPackageMap;
array_unshift($packageMap, $rootPackageMap); $reverseSortedMap = array_reverse($sortedPackageMap);
$psr0 = $this->parseAutoloadsType($packageMap, 'psr-0', $rootPackage); // reverse-sorted means root first, then dependents, then their dependents, etc.
$psr4 = $this->parseAutoloadsType($packageMap, 'psr-4', $rootPackage); // which makes sense to allow root to override classmap or psr-0/4 entries with higher precedence rules
$classmap = $this->parseAutoloadsType(array_reverse($sortedPackageMap), 'classmap', $rootPackage); $psr0 = $this->parseAutoloadsType($reverseSortedMap, 'psr-0', $rootPackage);
$psr4 = $this->parseAutoloadsType($reverseSortedMap, 'psr-4', $rootPackage);
$classmap = $this->parseAutoloadsType($reverseSortedMap, 'classmap', $rootPackage);
// sorted (i.e. dependents first) for files to ensure that dependencies are loaded/available once a file is included
$files = $this->parseAutoloadsType($sortedPackageMap, 'files', $rootPackage); $files = $this->parseAutoloadsType($sortedPackageMap, 'files', $rootPackage);
// using sorted here but it does not really matter as all are excluded equally
$exclude = $this->parseAutoloadsType($sortedPackageMap, 'exclude-from-classmap', $rootPackage); $exclude = $this->parseAutoloadsType($sortedPackageMap, 'exclude-from-classmap', $rootPackage);
krsort($psr0); krsort($psr0);