From 08e284c51bc9d4af2382dedfda54d3fb9c22c473 Mon Sep 17 00:00:00 2001 From: Kevin Papst Date: Tue, 3 Nov 2020 23:59:44 +0100 Subject: [PATCH] sort composer packages in doctor (#2089) --- src/Controller/DoctorController.php | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/src/Controller/DoctorController.php b/src/Controller/DoctorController.php index b2f9e2ec..90fc7348 100644 --- a/src/Controller/DoctorController.php +++ b/src/Controller/DoctorController.php @@ -104,11 +104,35 @@ class DoctorController extends AbstractController 'logs' => $this->getLog(), 'logLines' => $logLines, 'logSize' => $this->getLogSize(), - 'composer' => Versions::VERSIONS, + 'composer' => $this->getComposerPackages(), ] )); } + private function getComposerPackages(): array + { + $packages = []; + + if (class_exists('Composer\Versions')) { + // TODO composer 2 + } else { + $packages = Versions::VERSIONS; + } + + // remove kimai from the package list + $packages = array_filter($packages, function ($name) { + if ($name === Versions::ROOT_PACKAGE_NAME) { + return false; + } + + return true; + }, ARRAY_FILTER_USE_KEY); + + ksort($packages); + + return $packages; + } + private function getLoadedExtensions() { $results = [];