Browse Source

Streamline reseting of private static properties

Signed-off-by: Louis Chemineau <louis@chmn.me>
pull/30582/head
Louis Chemineau 4 years ago
parent
commit
e50121d4c0
  1. 10
      lib/public/Util.php
  2. 4
      tests/lib/UtilTest.php

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

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

Loading…
Cancel
Save