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

Refactor sortPackageMap to depend on separate sortPackage function.

pull/8085/head
Dane Powell 2019-04-09 10:55:33 -07:00
parent a908e22a91
commit 266a41e046
No known key found for this signature in database
GPG Key ID: 5FCA7D7DAF2DDD5B
3 changed files with 51 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,6 +17,7 @@ use Composer\EventDispatcher\EventDispatcher;
use Composer\Installer\InstallationManager;
use Composer\IO\IOInterface;
use Composer\Package\AliasPackage;
use Composer\Package\Link;
use Composer\Package\PackageInterface;
use Composer\Repository\InstalledRepositoryInterface;
use Composer\Util\Filesystem;
@ -956,27 +957,18 @@ INITIALIZER;
*
* Packages of equal weight retain the original order
*
* @param array $packageMap
* @param array $packages
* @return array
*/
public function sortPackageMap(array $packageMap)
{
$packages = array();
$paths = array();
public function sortPackages(array $packages) {
$usageList = array();
foreach ($packageMap as $item) {
list($package, $path) = $item;
$name = $package->getName();
$packages[$name] = $package;
$paths[$name] = $path;
foreach (array_merge($package->getRequires(), $package->getDevRequires()) as $link) {
foreach ($packages as $package) { /** @var PackageInterface $package */
foreach (array_merge($package->getRequires(), $package->getDevRequires()) as $link) { /** @var Link $link */
$target = $link->getTarget();
$usageList[$target][] = $name;
$usageList[$target][] = $package->getName();
}
}
$computing = array();
$computed = array();
$computeImportance = function ($name) use (&$computeImportance, &$computing, &$computed, $usageList) {
@ -1034,9 +1026,41 @@ INITIALIZER;
$stable_sort($weightList);
$sortedPackageMap = array();
$sortedPackages = array();
foreach (array_keys($weightList) as $name) {
$sortedPackages[] = $packages[$name];
}
return $sortedPackages;
}
/**
* Sorts packages by dependency weight
*
* Packages of equal weight retain the original order
*
* @param array $packageMap
* @return array
*/
public function sortPackageMap(array $packageMap)
{
$packages = array();
$paths = array();
foreach ($packageMap as $item) {
list($package, $path) = $item;
$name = $package->getName();
$packages[$name] = $package;
$paths[$name] = $path;
}
$sortedPackages = $this->sortPackages($packages);
$sortedPackageMap = array();
foreach ($sortedPackages as $package) {
$name = $package->getName();
$sortedPackageMap[] = array($packages[$name], $paths[$name]);
}

7
src/Composer/Plugin/PluginManager.php
View File

@ -255,11 +255,8 @@ class PluginManager
{
$packages = $repo->getPackages();
$generator = $this->composer->getAutoloadGenerator();
$rootPackage = $this->composer->getPackage(); /** @var PackageInterface $rootPackage */
$packageMap = $generator->buildPackageMap($this->composer->getInstallationManager(), $rootPackage, $packages);
$sortedPackageMap = array_reverse($generator->sortPackageMap($packageMap));
foreach ($sortedPackageMap as $fullPackage) {
$package = $fullPackage[0]; /** @var PackageInterface $package */
$sortedPackages = array_reverse($generator->sortPackages($packages));
foreach ($sortedPackages as $package) {
if (!($package instanceof CompletePackage)) {
continue;
}

10
src/Composer/Util/PackageSorter.php Normal file
View File

@ -0,0 +1,10 @@
<?php
namespace Composer\Util;
class PackageSorter
{
}