MDL-33550 reset repository static cache between unit tests

diff --git a/lib/phpunit/classes/util.php b/lib/phpunit/classes/util.php
index fedb08b..93aecf7 100644 (file)
--- a/lib/phpunit/classes/util.php
+++ b/lib/phpunit/classes/util.php
@@ -612,8 +612,11 @@ class phpunit_util {
         get_string_manager()->reset_caches();
         events_get_handlers('reset');
         textlib::reset_caches();
+        if (class_exists('repository')) {
+            repository::reset_caches();
+        }
         $GROUPLIB_CACHE = null;
-        //TODO: add more resets here and probably refactor them to new core function
+        //TODO MDL-25290: add more resets here and probably refactor them to new core function
 
         // purge dataroot directory
         self::reset_dataroot();

diff --git a/repository/lib.php b/repository/lib.php
index ffb6705..8fb95a8 100644 (file)
--- a/repository/lib.php
+++ b/repository/lib.php
@@ -2191,21 +2191,31 @@ abstract class repository {
         }
     }
 
-
+    /**
+     * Called from phpunit between tests, resets whatever was cached
+     */
+    public static function reset_caches() {
+        self::sync_external_file(null, true);
+    }
 
     /**
      * Call to request proxy file sync with repository source.
      *
      * @param stored_file $file
+     * @param bool $resetsynchistory whether to reset all history of sync (used by phpunit)
      * @return bool success
      */
-    public static function sync_external_file(stored_file $file) {
+    public static function sync_external_file($file, $resetsynchistory = false) {
         global $DB;
+        // TODO MDL-25290 static should be replaced with MUC code.
         static $synchronized = array();
+        if ($resetsynchistory) {
+            $synchronized = array();
+        }
 
         $fs = get_file_storage();
 
-        if (!$file->get_referencefileid()) {
+        if (!$file || !$file->get_referencefileid()) {
             return false;
         }
         if (array_key_exists($file->get_id(), $synchronized)) {