upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-02-20 00:12:30 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 34

Streamline reseting of private static properties

Browse source 
Signed-off-by: Louis Chemineau <louis@chmn.me>
This commit is contained in:
Louis Chemineau 2022-01-10 17:34:48 +01:00
parent 92e60caa86
commit 25ade6218a
2 changed files with 2 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/public/Util.php
View file

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

4
tests/lib/UtilTest.php
View file

@ -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() {