From 5961eba6a1d8b0f544f1ad03404d29d62eafebce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=B4me=20Chilliet?= Date: Thu, 12 Mar 2026 16:32:21 +0100 Subject: [PATCH] fix: Remove static var in NaturalSort MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Côme Chilliet --- lib/private/NaturalSort.php | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/lib/private/NaturalSort.php b/lib/private/NaturalSort.php index 240d4de637a..d367cc9d6e9 100644 --- a/lib/private/NaturalSort.php +++ b/lib/private/NaturalSort.php @@ -11,7 +11,6 @@ use OCP\Server; use Psr\Log\LoggerInterface; class NaturalSort { - private static $instance; private $collator; private $cache = []; @@ -113,10 +112,7 @@ class NaturalSort { * Returns a singleton * @return NaturalSort instance */ - public static function getInstance() { - if (!isset(self::$instance)) { - self::$instance = new NaturalSort(); - } - return self::$instance; + public static function getInstance(): NaturalSort { + return \OCP\Server::get(NaturalSort::class); } }