nextcloud
/
server
mirror of https://github.com/nextcloud/server
0
0
Fork 0
Code Issues Releases Wiki Activity

Revert "Streamline reseting of private static properties" 

This reverts commit e50121d4c0.
This commit is contained in:
Louis Chemineau 2022-01-10 18:42:07 +01:00
parent e50121d4c0
commit 92e60caa86
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/public/Util.php
View File

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

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, '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() {