From e50121d4c05afb8eca22bc105b160283ff4181c0 Mon Sep 17 00:00:00 2001 From: Louis Chemineau Date: Mon, 10 Jan 2022 17:34:48 +0100 Subject: [PATCH] Streamline reseting of private static properties Signed-off-by: Louis Chemineau --- lib/public/Util.php | 10 ---------- tests/lib/UtilTest.php | 4 ++-- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/lib/public/Util.php b/lib/public/Util.php index 61b8d9369cc..f8d8b1aaf71 100644 --- a/lib/public/Util.php +++ b/lib/public/Util.php @@ -597,14 +597,4 @@ 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 4734898a787..90bdb5708df 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() { -- 2.39.5