Merge pull request #30582 from nextcloud/fix/streamline_clearing_static_state

Streamline reseting of private static properties

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 = [];
-	}
 }

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, 'scriptDeps', [[]]);
 	}
 	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, 'scriptDeps', [[]]);
 	}
 
 	public function testAddScript() {