@@ -9,7 +9,6 @@ |
||
| 9 | 9 | use Composer\IO\IOInterface; |
| 10 | 10 | use Composer\Package\PackageInterface; |
| 11 | 11 | use Composer\Plugin\PluginInterface; |
| 12 | -use Composer\Repository\InstalledFilesystemRepository; |
|
| 13 | 12 | use Composer\Script\Event; |
| 14 | 13 | use Composer\Script\ScriptEvents; |
| 15 | 14 | use Seld\JsonLint\JsonParser; |
@@ -132,7 +132,7 @@ |
||
| 132 | 132 | foreach ($json as $key => $values) { |
| 133 | 133 | $existingValues = $array[$key] ?? []; |
| 134 | 134 | if (!is_array($values)) { |
| 135 | - $values = [ $values ]; |
|
| 135 | + $values = [$values]; |
|
| 136 | 136 | } |
| 137 | 137 | $existingValues = array_merge($existingValues, $values); |
| 138 | 138 | $array[$key] = $existingValues; |
@@ -17,61 +17,61 @@ |
||
| 17 | 17 | * @param PackageInterface[] $unorderedPackagesList |
| 18 | 18 | * @return array|PackageInterface[] |
| 19 | 19 | */ |
| 20 | - public static function reorderPackages(array $unorderedPackagesList) { |
|
| 21 | - // The very first step is to reorder the packages alphabetically. |
|
| 22 | - // This is to ensure the same order every time, even between packages that are unrelated. |
|
| 23 | - usort($unorderedPackagesList, function(PackageInterface $packageA, PackageInterface $packageB) { |
|
| 24 | - return strcmp($packageA->getName(), $packageB->getName()); |
|
| 25 | - }); |
|
| 20 | + public static function reorderPackages(array $unorderedPackagesList) { |
|
| 21 | + // The very first step is to reorder the packages alphabetically. |
|
| 22 | + // This is to ensure the same order every time, even between packages that are unrelated. |
|
| 23 | + usort($unorderedPackagesList, function(PackageInterface $packageA, PackageInterface $packageB) { |
|
| 24 | + return strcmp($packageA->getName(), $packageB->getName()); |
|
| 25 | + }); |
|
| 26 | 26 | |
| 27 | - $orderedPackagesList = array(); |
|
| 28 | - foreach ($unorderedPackagesList as $package) { |
|
| 29 | - $orderedPackagesList = self::walkPackagesList($package, $orderedPackagesList, $unorderedPackagesList); |
|
| 30 | - } |
|
| 27 | + $orderedPackagesList = array(); |
|
| 28 | + foreach ($unorderedPackagesList as $package) { |
|
| 29 | + $orderedPackagesList = self::walkPackagesList($package, $orderedPackagesList, $unorderedPackagesList); |
|
| 30 | + } |
|
| 31 | 31 | |
| 32 | - return $orderedPackagesList; |
|
| 33 | - } |
|
| 32 | + return $orderedPackagesList; |
|
| 33 | + } |
|
| 34 | 34 | |
| 35 | - /** |
|
| 36 | - * Function used to sort packages by dependencies (packages depending from no other package in front of others) |
|
| 37 | - * Invariant hypothesis for this function: $orderedPackagesList is already ordered and the package we add |
|
| 38 | - * has all its dependencies already accounted for. If not, we add the dependencies first. |
|
| 39 | - * |
|
| 40 | - * @param PackageInterface $package |
|
| 41 | - * @param PackageInterface[] $orderedPackagesList The list of sorted packages |
|
| 42 | - * @param PackageInterface[] $availablePackages The list of all packages not yet sorted |
|
| 43 | - * @return PackageInterface[] |
|
| 44 | - */ |
|
| 45 | - private static function walkPackagesList(PackageInterface $package, array $orderedPackagesList, array &$availablePackages) { |
|
| 46 | - // First, let's check that the package we want to add is not already in our list. |
|
| 47 | - foreach ($orderedPackagesList as $includedPackage) { |
|
| 48 | - if ($includedPackage->equals($package)) { |
|
| 49 | - return $orderedPackagesList; |
|
| 50 | - } |
|
| 51 | - } |
|
| 35 | + /** |
|
| 36 | + * Function used to sort packages by dependencies (packages depending from no other package in front of others) |
|
| 37 | + * Invariant hypothesis for this function: $orderedPackagesList is already ordered and the package we add |
|
| 38 | + * has all its dependencies already accounted for. If not, we add the dependencies first. |
|
| 39 | + * |
|
| 40 | + * @param PackageInterface $package |
|
| 41 | + * @param PackageInterface[] $orderedPackagesList The list of sorted packages |
|
| 42 | + * @param PackageInterface[] $availablePackages The list of all packages not yet sorted |
|
| 43 | + * @return PackageInterface[] |
|
| 44 | + */ |
|
| 45 | + private static function walkPackagesList(PackageInterface $package, array $orderedPackagesList, array &$availablePackages) { |
|
| 46 | + // First, let's check that the package we want to add is not already in our list. |
|
| 47 | + foreach ($orderedPackagesList as $includedPackage) { |
|
| 48 | + if ($includedPackage->equals($package)) { |
|
| 49 | + return $orderedPackagesList; |
|
| 50 | + } |
|
| 51 | + } |
|
| 52 | 52 | |
| 53 | - // We need to make sure there is no loop (if a package A requires a package B that requires the package A)... |
|
| 54 | - // We do that by removing the package from the list of all available packages. |
|
| 55 | - $key = array_search($package, $availablePackages); |
|
| 56 | - unset($availablePackages[$key]); |
|
| 53 | + // We need to make sure there is no loop (if a package A requires a package B that requires the package A)... |
|
| 54 | + // We do that by removing the package from the list of all available packages. |
|
| 55 | + $key = array_search($package, $availablePackages); |
|
| 56 | + unset($availablePackages[$key]); |
|
| 57 | 57 | |
| 58 | - // Now, let's see if there are dependencies. |
|
| 59 | - foreach ($package->getRequires() as $require) { |
|
| 60 | - /* @var $require Link */ |
|
| 61 | - foreach ($availablePackages as $iterPackage) { |
|
| 62 | - if ($iterPackage->getName() == $require->getTarget()) { |
|
| 63 | - $orderedPackagesList = self::walkPackagesList($iterPackage, $orderedPackagesList, $availablePackages); |
|
| 64 | - break; |
|
| 65 | - } |
|
| 66 | - } |
|
| 67 | - } |
|
| 58 | + // Now, let's see if there are dependencies. |
|
| 59 | + foreach ($package->getRequires() as $require) { |
|
| 60 | + /* @var $require Link */ |
|
| 61 | + foreach ($availablePackages as $iterPackage) { |
|
| 62 | + if ($iterPackage->getName() == $require->getTarget()) { |
|
| 63 | + $orderedPackagesList = self::walkPackagesList($iterPackage, $orderedPackagesList, $availablePackages); |
|
| 64 | + break; |
|
| 65 | + } |
|
| 66 | + } |
|
| 67 | + } |
|
| 68 | 68 | |
| 69 | - // FIXME: manage dev-requires and "provides" |
|
| 69 | + // FIXME: manage dev-requires and "provides" |
|
| 70 | 70 | |
| 71 | - // Finally, let's add the package once all dependencies have been added. |
|
| 72 | - $orderedPackagesList[] = $package; |
|
| 71 | + // Finally, let's add the package once all dependencies have been added. |
|
| 72 | + $orderedPackagesList[] = $package; |
|
| 73 | 73 | |
| 74 | - return $orderedPackagesList; |
|
| 75 | - } |
|
| 74 | + return $orderedPackagesList; |
|
| 75 | + } |
|
| 76 | 76 | |
| 77 | 77 | } |
| 78 | 78 | \ No newline at end of file |