MDL-60600 core_output: Clear static icon system cache between unit tests

nilo72 · Oct 26, 2017 · a9ca3fa · a9ca3fa
1 parent d12e409
commit a9ca3fa
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/lib/classes/output/icon_system.php b/lib/classes/output/icon_system.php
@@ -145,5 +145,12 @@ public final function remap_icon_name($iconname, $component) {
         }
         return false;
     }
+
+    /**
+     * Clears the instance cache, for use in unit tests
+     */
+    public static function reset_caches() {
+        self::$instance = null;
+    }
 }
 
diff --git a/lib/phpunit/classes/util.php b/lib/phpunit/classes/util.php
@@ -217,6 +217,7 @@ public static function reset_all_data($detectchanges = false) {
         core_filetypes::reset_caches();
         \core_search\manager::clear_static();
         core_user::reset_caches();
+        \core\output\icon_system::reset_caches();
         if (class_exists('core_media_manager', false)) {
             core_media_manager::reset_caches();
         }