From 92e60caa866718aaff8516b0fd3dc490c83499d1 Mon Sep 17 00:00:00 2001
From: Louis Chemineau <louis@chmn.me>
Date: Mon, 10 Jan 2022 18:42:07 +0100
Subject: [PATCH] Revert "Streamline reseting of private static properties"

This reverts commit e50121d4c05afb8eca22bc105b160283ff4181c0.
---
 lib/public/Util.php    | 10 ++++++++++
 tests/lib/UtilTest.php |  4 ++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/lib/public/Util.php b/lib/public/Util.php
index f8d8b1aaf71..61b8d9369cc 100644
--- a/lib/public/Util.php
+++ b/lib/public/Util.php
@@ -597,4 +597,14 @@ class Util {
 		}
 		return $temp;
 	}
+
+	/**
+	 * Reset scripts and scriptDeps to empty arrays.
+	 * Only used in tests.
+	 * @since 24.0.0
+	 */
+	public static function clearScriptsState() {
+		self::$scripts = [];
+		self::$scriptDeps = [];
+	}
 }
diff --git a/tests/lib/UtilTest.php b/tests/lib/UtilTest.php
index 90bdb5708df..4734898a787 100644
--- a/tests/lib/UtilTest.php
+++ b/tests/lib/UtilTest.php
@@ -224,17 +224,17 @@ class UtilTest extends \Test\TestCase {
 		parent::setUp();
 
 		\OC_Util::$scripts = [];
+		\OCP\Util::clearScriptsState();
 		\OC_Util::$styles = [];
 		self::invokePrivate(\OCP\Util::class, 'scripts', [[]]);
-		self::invokePrivate(\OCP\Util::class, 'scriptsDeps', [[]]);
 	}
 	protected function tearDown(): void {
 		parent::tearDown();
 
 		\OC_Util::$scripts = [];
+		\OCP\Util::clearScriptsState();
 		\OC_Util::$styles = [];
 		self::invokePrivate(\OCP\Util::class, 'scripts', [[]]);
-		self::invokePrivate(\OCP\Util::class, 'scriptsDeps', [[]]);
 	}
 
 	public function testAddScript() {