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

Transaction: Define a total order on packages to keep behavior on PHP8 

So far the ordering of alias packages with the same name was undefined
so the actual order was determined by implementation of the sorting
algorithm in PHP. As of PHP8 sort is stable by default which changes the
outcome in some of our test cases.

With the fully defined total order the order can longer change depending
on sorting algorithm used and remains the same across PHP versions.
pull/9285/head
Nils Adermann 2020-10-14 11:13:51 +02:00
parent 9ca7457698
commit 85eb007f4f
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Composer/DependencyResolver/Transaction.php
View File

@ -61,8 +61,12 @@ class Transaction
{
$packageSort = function (PackageInterface $a, PackageInterface $b) {
// sort alias packages by the same name behind their non alias version
if ($a->getName() == $b->getName() && $a instanceof AliasPackage != $b instanceof AliasPackage) {
return $a instanceof AliasPackage ? -1 : 1;
if ($a->getName() == $b->getName()) {
if ($a instanceof AliasPackage != $b instanceof AliasPackage) {
return $a instanceof AliasPackage ? -1 : 1;
}
// if names are the same, compare version, e.g. to sort aliases reliably, actual order does not matter
return strcmp($b->getVersion(), $a->getVersion());
}
return strcmp($b->getName(), $a->getName());
};

2
tests/Composer/Test/DependencyResolver/TransactionTest.php
View File

@ -58,8 +58,8 @@ class TransactionTest extends TestCase
array('job' => 'update', 'from' => $packageB, 'to' => $packageBnew),
array('job' => 'install', 'package' => $packageG),
array('job' => 'install', 'package' => $packageF),
array('job' => 'markAliasInstalled', 'package' => $packageFalias1),
array('job' => 'markAliasInstalled', 'package' => $packageFalias2),
array('job' => 'markAliasInstalled', 'package' => $packageFalias1),
array('job' => 'install', 'package' => $packageD),
);

2
tests/Composer/Test/Fixtures/installer/install-aliased-alias.test
View File

@ -32,7 +32,7 @@ Installing double aliased package
install
--EXPECT--
Installing b/b (dev-foo)
Marking b/b (dev-master) as installed, alias of b/b (dev-foo)
Marking b/b (1.0.x-dev) as installed, alias of b/b (dev-foo)
Marking b/b (dev-master) as installed, alias of b/b (dev-foo)
Installing a/a (dev-master)
Marking a/a (9999999-dev) as installed, alias of a/a (dev-master)