RootControllerDelegate is no longer a WeakInterface.

diff --git a/admin/index.php b/admin/index.php
index 3aef8bb703887c42a2b2588ee4ffd42f1a271c84..dda4edc75792241bd2cc3ac31f445146506dac7e 100644 (file)
--- a/admin/index.php
+++ b/admin/index.php
@@ -37,10 +37,7 @@ require_once HOPLITE_ROOT . '/views/template_loader.php';
 
 require_once BUGDAR_ROOT . '/admin/login.php';
 
-/**
- * @implements \hoplite\http\RootControllerDelegate
- */
-class FrontController
+class FrontController implements http\RootControllerDelegate
 {
        /** @var \hoplite\http\RootController */
        private $controller = NULL;
@@ -50,6 +47,13 @@ class FrontController
                $this->controller = $controller;
        }
 
+       public function LoginPage()
+       {
+               $this->controller->InvokeAction(new LoginAction($this->controller));
+       }
+
+       // RootControllerDelegate:
+
        public function OnInitialRequest(http\Request $request, http\Response $response)
        {
                $response->data['language'] = fetch_user_language();
@@ -78,11 +82,6 @@ class FrontController
                $this->LoginPage();
        }
 
-       public function LoginPage()
-       {
-               $this->controller->InvokeAction(new LoginAction($this->controller));
-       }
-
        public function WillInvokeAction(http\Action $action, http\Request $request, http\Response $response)
        {
                $templates = array('admin_header', 'admin_footer');
@@ -90,6 +89,10 @@ class FrontController
                        $templates = array_merge($templates, $action->TemplateSet());
                views\TemplateLoader::GetInstance()->PreCache($templates);
        }
+
+       public function DidInvokeAction(http\Action $action, http\Request $request, http\Response $response) {}
+
+       public function WillStop(http\Request $request, http\Response $response) {}
 }
 
 // Actions can implement this interface to have their required templates loaded

diff --git a/includes/hoplite b/includes/hoplite
index 78804a1dc21baf4763116e17c4440501fe79a6bc..dc08cff4b89d90466ebc2b3f2a8dc38b611558ab 160000 (submodule)
--- a/includes/hoplite
+++ b/includes/hoplite
@@ -1 +1 @@
-Subproject commit 78804a1dc21baf4763116e17c4440501fe79a6bc
+Subproject commit dc08cff4b89d90466ebc2b3f2a8dc38b611558ab