diff options
| author | Louis Chemineau <louis@chmn.me> | 2022-01-10 17:34:48 +0100 |
|---|---|---|
| committer | Louis Chemineau <louis@chmn.me> | 2022-01-11 10:29:25 +0100 |
| commit | 25ade6218afeaefad2fac3890a8d38692e9987c7 (patch) | |
| tree | b76df6b262bb6f4b667eb5881bc8fbeebc3c375a | |
| parent | 92e60caa866718aaff8516b0fd3dc490c83499d1 (diff) | |
| download | nextcloud-server-25ade6218afeaefad2fac3890a8d38692e9987c7.tar.gz nextcloud-server-25ade6218afeaefad2fac3890a8d38692e9987c7.zip | |
Streamline reseting of private static properties
Signed-off-by: Louis Chemineau <louis@chmn.me>
| -rw-r--r-- | lib/public/Util.php | 10 | ||||
| -rw-r--r-- | 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..aeb53a600d9 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, '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() { |