From d4d3c3d9fa4edb147a8b85fa109b9606369b7677 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn=20Wagner?= <joern.wagner@explicatis.com>
Date: Mon, 21 Dec 2020 20:39:12 +0100
Subject: [PATCH] [TASK] Make TreeNodeCollection compatible with PHP 8
Adds the new parameter in ArrayObject::asort for PHP 8. As an additional parameter it's backwards-compatible with PHP 7.4.
Resolves: #92141
Related: #92138
Releases: master
Change-Id: I691bad5f19457b7456da1e624cf7289538317495
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/67226
Tested-by: Alexander Schnitzler <git@alexanderschnitzler.de>
Tested-by: TYPO3com <noreply@typo3.com>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
Reviewed-by: Alexander Schnitzler <git@alexanderschnitzler.de>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
---
typo3/sysext/backend/Classes/Tree/TreeNodeCollection.php | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/typo3/sysext/backend/Classes/Tree/TreeNodeCollection.php b/typo3/sysext/backend/Classes/Tree/TreeNodeCollection.php
index 368da2a6a8fa..699310c8ef07 100644
--- a/typo3/sysext/backend/Classes/Tree/TreeNodeCollection.php
+++ b/typo3/sysext/backend/Classes/Tree/TreeNodeCollection.php
@@ -41,8 +41,10 @@ class TreeNodeCollection extends \ArrayObject
/**
* Sorts the internal nodes array
+ *
+ * @param int $flags Optional parameter, ignored. Added to be compatible with asort method signature in PHP 8.
*/
- public function asort()
+ public function asort($flags = SORT_REGULAR)
{
$this->uasort([$this, 'nodeCompare']);
}
--
GitLab