From ed216f78bf6a13b81f7dab81b720df5423b68a08 Mon Sep 17 00:00:00 2001
From: Josef Glatz <josefglatz@gmail.com>
Date: Wed, 25 Mar 2020 07:57:00 +0100
Subject: [PATCH] [BUGFIX] Sort upgrade documentation by filename
Restore sorting of documentation files based on their filename
like it was available up to TYPO3 version 8.7.
Resolves: #87390
Releases: master, 9.5
Change-Id: I2ab75d6b750b3a3003f00ed174c0d3dfb865bec9
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/63913
Tested-by: Georg Ringer <georg.ringer@gmail.com>
Tested-by: TYPO3com <noreply@typo3.com>
Tested-by: Susanne Moog <look@susi.dev>
Reviewed-by: Georg Ringer <georg.ringer@gmail.com>
Reviewed-by: Susanne Moog <look@susi.dev>
---
typo3/sysext/install/Classes/Controller/UpgradeController.php | 1 -
.../sysext/install/Classes/UpgradeAnalysis/DocumentationFile.php | 1 +
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/typo3/sysext/install/Classes/Controller/UpgradeController.php b/typo3/sysext/install/Classes/Controller/UpgradeController.php
index 6e9b66e008d2..f38d33642342 100644
--- a/typo3/sysext/install/Classes/Controller/UpgradeController.php
+++ b/typo3/sysext/install/Classes/Controller/UpgradeController.php
@@ -1247,7 +1247,6 @@ class UpgradeController extends AbstractController
$documentationFiles = $documentationFileService->findDocumentationFiles(
str_replace('\\', '/', realpath(ExtensionManagementUtility::extPath('core') . 'Documentation/Changelog/' . $version))
);
- $documentationFiles = array_reverse($documentationFiles);
$queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)->getQueryBuilderForTable('sys_registry');
$filesMarkedAsRead = $queryBuilder
diff --git a/typo3/sysext/install/Classes/UpgradeAnalysis/DocumentationFile.php b/typo3/sysext/install/Classes/UpgradeAnalysis/DocumentationFile.php
index 6304ef6076ef..e761653bb826 100644
--- a/typo3/sysext/install/Classes/UpgradeAnalysis/DocumentationFile.php
+++ b/typo3/sysext/install/Classes/UpgradeAnalysis/DocumentationFile.php
@@ -341,6 +341,7 @@ class DocumentationFile
$finder = new Finder();
$finder
->depth(0)
+ ->sortByName()
->name('/^(Feature|Breaking|Deprecation|Important)\-\d+.+\.rst$/i');
return $finder;
--
GitLab