13 files changed, 137 insertions, 33 deletions

diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 6bb345c2..511698ff 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -22,4 +22,5 @@ require_once 'tests/utils/ReferenceLinkDB.php';
 require_once 'tests/utils/ReferenceHistory.php';
 require_once 'tests/utils/FakeBookmarkService.php';
 require_once 'tests/container/ShaarliTestContainer.php';
-require_once 'tests/front/controller/FrontControllerMockHelper.php';
+require_once 'tests/front/controller/visitor/FrontControllerMockHelper.php';
+require_once 'tests/front/controller/admin/FrontAdminControllerMockHelper.php';
diff --git a/tests/front/controller/admin/FrontAdminControllerMockHelper.php b/tests/front/controller/admin/FrontAdminControllerMockHelper.php
new file mode 100644
index 00000000..94581c09
--- /dev/null
+++ b/tests/front/controller/admin/FrontAdminControllerMockHelper.php
@@ -0,0 +1,34 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Shaarli\Front\Controller\Admin;
+
+use Shaarli\Container\ShaarliTestContainer;
+use Shaarli\Front\Controller\Visitor\FrontControllerMockHelper;
+use Shaarli\Security\LoginManager;
+
+/**
+ * Trait FrontControllerMockHelper
+ *
+ * Helper trait used to initialize the ShaarliContainer and mock its services for admin controller tests.
+ *
+ * @property ShaarliTestContainer $container
+ */
+trait FrontAdminControllerMockHelper
+{
+    use FrontControllerMockHelper {
+        FrontControllerMockHelper::createContainer as parentCreateContainer;
+    }
+
+    /**
+     * Mock the container instance
+     */
+    protected function createContainer(): void
+    {
+        $this->parentCreateContainer();
+
+        $this->container->loginManager = $this->createMock(LoginManager::class);
+        $this->container->loginManager->method('isLoggedIn')->willReturn(true);
+    }
+}
diff --git a/tests/front/controller/LogoutControllerTest.php b/tests/front/controller/admin/LogoutControllerTest.php
index 8e01c367..239e39b2 100644
--- a/tests/front/controller/LogoutControllerTest.php
+++ b/tests/front/controller/admin/LogoutControllerTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Shaarli\Front\Controller;
+namespace Shaarli\Front\Controller\Admin;
 
 /** Override PHP builtin setcookie function in the local namespace to mock it... more or less */
 if (!function_exists('Shaarli\Front\Controller\setcookie')) {
@@ -19,7 +19,7 @@ use Slim\Http\Response;
 
 class LogoutControllerTest extends TestCase
 {
-    use FrontControllerMockHelper;
+    use FrontAdminControllerMockHelper;
 
     /** @var LogoutController */
     protected $controller;
diff --git a/tests/front/controller/SessionFilterControllerTest.php b/tests/front/controller/admin/SessionFilterControllerTest.php
index f541de03..f50f2fc2 100644
--- a/tests/front/controller/SessionFilterControllerTest.php
+++ b/tests/front/controller/admin/SessionFilterControllerTest.php
@@ -2,16 +2,18 @@
 
 declare(strict_types=1);
 
-namespace Shaarli\Front\Controller;
+namespace Shaarli\Front\Controller\Admin;
 
 use PHPUnit\Framework\TestCase;
+use Shaarli\Security\LoginManager;
 use Shaarli\Security\SessionManager;
 use Slim\Http\Request;
 use Slim\Http\Response;
+use Slim\Http\Uri;
 
 class SessionFilterControllerTest extends TestCase
 {
-    use FrontControllerMockHelper;
+    use FrontAdminControllerMockHelper;
 
     /** @var SessionFilterController */
     protected $controller;
@@ -33,6 +35,12 @@ class SessionFilterControllerTest extends TestCase
         $this->container->environment = ['HTTP_REFERER' => 'http://shaarli/subfolder/controller/?searchtag=abc'];
 
         $request = $this->createMock(Request::class);
+        $request->method('getUri')->willReturnCallback(function (): Uri {
+            $uri = $this->createMock(Uri::class);
+            $uri->method('getBasePath')->willReturn('/subfolder');
+
+            return $uri;
+        });
         $request->method('getParam')->with('nb')->willReturn('8');
         $response = new Response();
 
@@ -57,6 +65,12 @@ class SessionFilterControllerTest extends TestCase
         $this->createValidContainerMockSet();
 
         $request = $this->createMock(Request::class);
+        $request->method('getUri')->willReturnCallback(function (): Uri {
+            $uri = $this->createMock(Uri::class);
+            $uri->method('getBasePath')->willReturn('/subfolder');
+
+            return $uri;
+        });
         $request->method('getParam')->with('nb')->willReturn('test');
         $response = new Response();
 
@@ -70,7 +84,7 @@ class SessionFilterControllerTest extends TestCase
 
         static::assertInstanceOf(Response::class, $result);
         static::assertSame(302, $result->getStatusCode());
-        static::assertSame(['./'], $result->getHeader('location'));
+        static::assertSame(['/subfolder'], $result->getHeader('location'));
     }
 
     /**
@@ -92,6 +106,12 @@ class SessionFilterControllerTest extends TestCase
         ;
 
         $request = $this->createMock(Request::class);
+        $request->method('getUri')->willReturnCallback(function (): Uri {
+            $uri = $this->createMock(Uri::class);
+            $uri->method('getBasePath')->willReturn('/subfolder');
+
+            return $uri;
+        });
         $response = new Response();
 
         $result = $this->controller->visibility($request, $response, $arg);
@@ -129,6 +149,12 @@ class SessionFilterControllerTest extends TestCase
         ;
 
         $request = $this->createMock(Request::class);
+        $request->method('getUri')->willReturnCallback(function (): Uri {
+            $uri = $this->createMock(Uri::class);
+            $uri->method('getBasePath')->willReturn('/subfolder');
+
+            return $uri;
+        });
         $response = new Response();
 
         $result = $this->controller->visibility($request, $response, $arg);
@@ -160,13 +186,19 @@ class SessionFilterControllerTest extends TestCase
         ;
 
         $request = $this->createMock(Request::class);
+        $request->method('getUri')->willReturnCallback(function (): Uri {
+            $uri = $this->createMock(Uri::class);
+            $uri->method('getBasePath')->willReturn('/subfolder');
+
+            return $uri;
+        });
         $response = new Response();
 
         $result = $this->controller->visibility($request, $response, $arg);
 
         static::assertInstanceOf(Response::class, $result);
         static::assertSame(302, $result->getStatusCode());
-        static::assertSame(['./'], $result->getHeader('location'));
+        static::assertSame(['/subfolder'], $result->getHeader('location'));
     }
 
     /**
@@ -192,6 +224,12 @@ class SessionFilterControllerTest extends TestCase
         ;
 
         $request = $this->createMock(Request::class);
+        $request->method('getUri')->willReturnCallback(function (): Uri {
+            $uri = $this->createMock(Uri::class);
+            $uri->method('getBasePath')->willReturn('/subfolder');
+
+            return $uri;
+        });
         $response = new Response();
 
         $result = $this->controller->visibility($request, $response, $arg);
@@ -212,6 +250,7 @@ class SessionFilterControllerTest extends TestCase
 
         $this->container->environment = ['HTTP_REFERER' => 'http://shaarli/subfolder/controller/?searchtag=abc'];
 
+        $this->container->loginManager = $this->createMock(LoginManager::class);
         $this->container->loginManager->method('isLoggedIn')->willReturn(false);
         $this->container->sessionManager
             ->expects(static::never())
@@ -224,6 +263,12 @@ class SessionFilterControllerTest extends TestCase
         ;
 
         $request = $this->createMock(Request::class);
+        $request->method('getUri')->willReturnCallback(function (): Uri {
+            $uri = $this->createMock(Uri::class);
+            $uri->method('getBasePath')->willReturn('/subfolder');
+
+            return $uri;
+        });
         $response = new Response();
 
         $result = $this->controller->visibility($request, $response, $arg);
@@ -243,6 +288,12 @@ class SessionFilterControllerTest extends TestCase
         $this->container->environment = ['HTTP_REFERER' => 'http://shaarli/subfolder/controller/?searchtag=abc'];
 
         $request = $this->createMock(Request::class);
+        $request->method('getUri')->willReturnCallback(function (): Uri {
+            $uri = $this->createMock(Uri::class);
+            $uri->method('getBasePath')->willReturn('/subfolder');
+
+            return $uri;
+        });
         $response = new Response();
 
         $this->container->sessionManager
@@ -268,6 +319,13 @@ class SessionFilterControllerTest extends TestCase
         $this->container->environment = ['HTTP_REFERER' => 'http://shaarli/subfolder/controller/?searchtag=abc'];
 
         $request = $this->createMock(Request::class);
+        $request->method('getUri')->willReturnCallback(function (): Uri {
+            $uri = $this->createMock(Uri::class);
+            $uri->method('getBasePath')->willReturn('/subfolder');
+
+            return $uri;
+        });
+
         $response = new Response();
 
         $this->container->sessionManager
diff --git a/tests/front/controller/DailyControllerTest.php b/tests/front/controller/visitor/DailyControllerTest.php
index 7ec99030..6ff769fc 100644
--- a/tests/front/controller/DailyControllerTest.php
+++ b/tests/front/controller/visitor/DailyControllerTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Shaarli\Front\Controller;
+namespace Shaarli\Front\Controller\Visitor;
 
 use PHPUnit\Framework\TestCase;
 use Shaarli\Bookmark\Bookmark;
diff --git a/tests/front/controller/FeedControllerTest.php b/tests/front/controller/visitor/FeedControllerTest.php
index 7e8657e2..fd4679ea 100644
--- a/tests/front/controller/FeedControllerTest.php
+++ b/tests/front/controller/visitor/FeedControllerTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Shaarli\Front\Controller;
+namespace Shaarli\Front\Controller\Visitor;
 
 use PHPUnit\Framework\TestCase;
 use Shaarli\Feed\FeedBuilder;
diff --git a/tests/front/controller/FrontControllerMockHelper.php b/tests/front/controller/visitor/FrontControllerMockHelper.php
index b65607e7..bc3266b5 100644
--- a/tests/front/controller/FrontControllerMockHelper.php
+++ b/tests/front/controller/visitor/FrontControllerMockHelper.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Shaarli\Front\Controller;
+namespace Shaarli\Front\Controller\Visitor;
 
 use PHPUnit\Framework\MockObject\MockObject;
 use Shaarli\Bookmark\BookmarkServiceInterface;
diff --git a/tests/front/controller/LoginControllerTest.php b/tests/front/controller/visitor/LoginControllerTest.php
index 21937f3c..9d223316 100644
--- a/tests/front/controller/LoginControllerTest.php
+++ b/tests/front/controller/visitor/LoginControllerTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Shaarli\Front\Controller;
+namespace Shaarli\Front\Controller\Visitor;
 
 use PHPUnit\Framework\TestCase;
 use Shaarli\Config\ConfigManager;
diff --git a/tests/front/controller/OpenSearchControllerTest.php b/tests/front/controller/visitor/OpenSearchControllerTest.php
index f3b6f439..52475318 100644
--- a/tests/front/controller/OpenSearchControllerTest.php
+++ b/tests/front/controller/visitor/OpenSearchControllerTest.php
@@ -2,11 +2,9 @@
 
 declare(strict_types=1);
 
-namespace front\controller;
+namespace Shaarli\Front\Controller\Visitor;
 
 use PHPUnit\Framework\TestCase;
-use Shaarli\Front\Controller\FrontControllerMockHelper;
-use Shaarli\Front\Controller\OpenSearchController;
 use Slim\Http\Request;
 use Slim\Http\Response;
 
diff --git a/tests/front/controller/PictureWallControllerTest.php b/tests/front/controller/visitor/PictureWallControllerTest.php
index 8160bb38..7ac842cb 100644
--- a/tests/front/controller/PictureWallControllerTest.php
+++ b/tests/front/controller/visitor/PictureWallControllerTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Shaarli\Front\Controller;
+namespace Shaarli\Front\Controller\Visitor;
 
 use PHPUnit\Framework\TestCase;
 use Shaarli\Bookmark\Bookmark;
diff --git a/tests/front/controller/ShaarliControllerTest.php b/tests/front/controller/visitor/ShaarliPublicControllerTest.php
index a6011b49..e2e88da3 100644
--- a/tests/front/controller/ShaarliControllerTest.php
+++ b/tests/front/controller/visitor/ShaarliPublicControllerTest.php
@@ -2,11 +2,13 @@
 
 declare(strict_types=1);
 
-namespace Shaarli\Front\Controller;
+namespace Shaarli\Front\Controller\Visitor;
 
 use PHPUnit\Framework\TestCase;
 use Shaarli\Bookmark\BookmarkFilter;
+use Slim\Http\Request;
 use Slim\Http\Response;
+use Slim\Http\Uri;
 
 /**
  * Class ShaarliControllerTest
@@ -24,13 +26,16 @@ class ShaarliControllerTest extends TestCase
     /** @var mixed[] List of variable assigned to the template */
     protected $assignedValues;
 
+    /** @var Request */
+    protected $request;
+
     public function setUp(): void
     {
         $this->createContainer();
 
-        $this->controller = new class($this->container) extends ShaarliController
+        $this->controller = new class($this->container) extends ShaarliVisitorController
         {
-            public function assignView(string $key, $value): ShaarliController
+            public function assignView(string $key, $value): ShaarliVisitorController
             {
                 return parent::assignView($key, $value);
             }
@@ -41,14 +46,23 @@ class ShaarliControllerTest extends TestCase
             }
 
             public function redirectFromReferer(
+                Request $request,
                 Response $response,
                 array $loopTerms = [],
                 array $clearParams = []
             ): Response {
-                return parent::redirectFromReferer($response, $loopTerms, $clearParams);
+                return parent::redirectFromReferer($request, $response, $loopTerms, $clearParams);
             }
         };
         $this->assignedValues = [];
+
+        $this->request = $this->createMock(Request::class);
+        $this->request->method('getUri')->willReturnCallback(function (): Uri {
+            $uri = $this->createMock(Uri::class);
+            $uri->method('getBasePath')->willReturn('/subfolder');
+
+            return $uri;
+        });
     }
 
     public function testAssignView(): void
@@ -59,7 +73,7 @@ class ShaarliControllerTest extends TestCase
 
         $self = $this->controller->assignView('variableName', 'variableValue');
 
-        static::assertInstanceOf(ShaarliController::class, $self);
+        static::assertInstanceOf(ShaarliVisitorController::class, $self);
         static::assertSame('variableValue', $this->assignedValues['variableName']);
     }
 
@@ -112,7 +126,7 @@ class ShaarliControllerTest extends TestCase
 
         $response = new Response();
 
-        $result = $this->controller->redirectFromReferer($response);
+        $result = $this->controller->redirectFromReferer($this->request, $response);
 
         static::assertSame(302, $result->getStatusCode());
         static::assertSame(['/subfolder/controller?query=param&other=2'], $result->getHeader('location'));
@@ -129,7 +143,7 @@ class ShaarliControllerTest extends TestCase
 
         $response = new Response();
 
-        $result = $this->controller->redirectFromReferer($response, ['nope']);
+        $result = $this->controller->redirectFromReferer($this->request, $response, ['nope']);
 
         static::assertSame(302, $result->getStatusCode());
         static::assertSame(['/subfolder/controller?query=param&other=2'], $result->getHeader('location'));
@@ -146,10 +160,10 @@ class ShaarliControllerTest extends TestCase
 
         $response = new Response();
 
-        $result = $this->controller->redirectFromReferer($response, ['nope', 'controller']);
+        $result = $this->controller->redirectFromReferer($this->request, $response, ['nope', 'controller']);
 
         static::assertSame(302, $result->getStatusCode());
-        static::assertSame(['./'], $result->getHeader('location'));
+        static::assertSame(['/subfolder'], $result->getHeader('location'));
     }
 
     /**
@@ -163,10 +177,10 @@ class ShaarliControllerTest extends TestCase
 
         $response = new Response();
 
-        $result = $this->controller->redirectFromReferer($response, ['nope', 'other']);
+        $result = $this->controller->redirectFromReferer($this->request, $response, ['nope', 'other']);
 
         static::assertSame(302, $result->getStatusCode());
-        static::assertSame(['./'], $result->getHeader('location'));
+        static::assertSame(['/subfolder'], $result->getHeader('location'));
     }
 
     /**
@@ -181,7 +195,7 @@ class ShaarliControllerTest extends TestCase
 
         $response = new Response();
 
-        $result = $this->controller->redirectFromReferer($response, ['nope', 'param']);
+        $result = $this->controller->redirectFromReferer($this->request, $response, ['nope', 'param']);
 
         static::assertSame(302, $result->getStatusCode());
         static::assertSame(['/subfolder/controller?query=param&other=2'], $result->getHeader('location'));
@@ -199,7 +213,7 @@ class ShaarliControllerTest extends TestCase
 
         $response = new Response();
 
-        $result = $this->controller->redirectFromReferer($response, ['shaarli']);
+        $result = $this->controller->redirectFromReferer($this->request, $response, ['shaarli']);
 
         static::assertSame(302, $result->getStatusCode());
         static::assertSame(['/subfolder/controller?query=param&other=2'], $result->getHeader('location'));
@@ -217,7 +231,7 @@ class ShaarliControllerTest extends TestCase
 
         $response = new Response();
 
-        $result = $this->controller->redirectFromReferer($response, ['query'], ['query']);
+        $result = $this->controller->redirectFromReferer($this->request, $response, ['query'], ['query']);
 
         static::assertSame(302, $result->getStatusCode());
         static::assertSame(['/subfolder/controller?other=2'], $result->getHeader('location'));
diff --git a/tests/front/controller/TagCloudControllerTest.php b/tests/front/controller/visitor/TagCloudControllerTest.php
index 8c27900d..e636d496 100644
--- a/tests/front/controller/TagCloudControllerTest.php
+++ b/tests/front/controller/visitor/TagCloudControllerTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Shaarli\Front\Controller;
+namespace Shaarli\Front\Controller\Visitor;
 
 use PHPUnit\Framework\TestCase;
 use Shaarli\Bookmark\BookmarkFilter;
diff --git a/tests/front/controller/TagControllerTest.php b/tests/front/controller/visitor/TagControllerTest.php
index 2184cb11..9a2b1f71 100644
--- a/tests/front/controller/TagControllerTest.php
+++ b/tests/front/controller/visitor/TagControllerTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Shaarli\Front\Controller;
+namespace Shaarli\Front\Controller\Visitor;
 
 use PHPUnit\Framework\TestCase;
 use Slim\Http\Request;
@@ -12,8 +12,7 @@ class TagControllerTest extends TestCase
 {
     use FrontControllerMockHelper;
 
-    /** @var TagController */
-    protected $controller;
+    /** @var TagController */    protected $controller;
 
     public function setUp(): void
     {