Merge pull request #321 from mikenz/resetable-state

Implement Resettable interface on SubsiteState so it gets reset between unit tests

src/State/SubsiteState.php

@@ -4,11 +4,12 @@
 
 use SilverStripe\Core\Injector\Injectable;
 use SilverStripe\Core\Injector\Injector;
+use SilverStripe\Core\Resettable;
 
 /**
  * SubsiteState provides static access to the current state for subsite related data during a request
  */
-class SubsiteState
+class SubsiteState implements Resettable
 {
     use Injectable;
 
@@ -106,4 +107,22 @@ public function withState(callable $callback)
             Injector::inst()->registerService($this);
         }
     }
+
+    /**
+     * Reset the local cache of the singleton
+     */
+    public static function reset()
+    {
+        SubsiteState::singleton()->resetState();
+    }
+
+    /**
+     * Reset the local cache of this object
+     */
+    public function resetState()
+    {
+        $this->originalSubsiteId = null;
+        $this->subsiteId = null;
+        $this->useSessions = null;
+    }
 }