refactor: Use SessionAccess rather than holding a reference relates to horde/core#190

src/Controller/MyBugsController.php

@@ -24,7 +24,7 @@
 use Horde_PageOutput;
 use Horde_Perms;
 use Horde_Registry;
-use Horde\Core\Session\HordeSession;
+use Horde\Core\Session\SessionAccess;
 use Horde_Url;
 use Horde\Whups\Service\TopbarSearch;
 use Horde\Whups\Service\UrlGenerator;
@@ -41,7 +41,7 @@ public function __construct(
         private readonly Horde_Notification_Handler $notification,
         private readonly Horde_PageOutput $pageOutput,
         private readonly Horde_Registry $registry,
-        private readonly HordeSession $session,
+        private readonly SessionAccess $session,
         private readonly TopbarSearch $topbarSearch,
         private readonly PrefsService $prefs,
         private readonly UrlGenerator $urlGenerator,

src/Controller/MyBugsEditController.php

@@ -23,7 +23,7 @@
 use Horde_Notification_Handler;
 use Horde_PageOutput;
 use Horde_Registry;
-use Horde\Core\Session\HordeSession;
+use Horde\Core\Session\SessionAccess;
 use Horde_Url;
 use Horde\Whups\Service\UrlGenerator;
 use Horde\Whups\Service\TopbarSearch;
@@ -40,7 +40,7 @@ public function __construct(
         private readonly Horde_Notification_Handler $notification,
         private readonly Horde_PageOutput $pageOutput,
         private readonly Horde_Registry $registry,
-        private readonly HordeSession $session,
+        private readonly SessionAccess $session,
         private readonly TopbarSearch $topbarSearch,
         private readonly PrefsService $prefs,
         private readonly UrlGenerator $urlGenerator,

src/Controller/Query/RunController.php

@@ -22,7 +22,7 @@
 namespace Horde\Whups\Controller\Query;
 
 use Horde\Core\Service\PrefsService;
-use Horde\Core\Session\HordeSession;
+use Horde\Core\Session\SessionAccess;
 use Horde\Form\V3\HtmlRenderer;
 use Horde\Whups\Controller\ResponseTrait;
 use Horde\Whups\Form\Query\QueryParameterForm;
@@ -55,7 +55,7 @@ public function __construct(
         private readonly Horde_Notification_Handler $notification,
         private readonly Horde_PageOutput $pageOutput,
         private readonly Horde_Registry $registry,
-        private readonly HordeSession $session,
+        private readonly SessionAccess $session,
         private readonly TicketSorter $sorter,
         private readonly TopbarSearch $topbarSearch,
         private readonly UrlGenerator $urlGenerator,

src/Controller/Queue/ViewController.php

@@ -14,7 +14,7 @@
 namespace Horde\Whups\Controller\Queue;
 
 use Horde\Core\Service\PrefsService;
-use Horde\Core\Session\HordeSession;
+use Horde\Core\Session\SessionAccess;
 use Horde\Whups\Controller\ResponseTrait;
 use Horde\Whups\Service\TicketSorter;
 use Horde\Whups\Service\TopbarSearch;
@@ -39,7 +39,7 @@ public function __construct(
         private readonly Horde_Notification_Handler $notification,
         private readonly Horde_PageOutput $pageOutput,
         private readonly Horde_Registry $registry,
-        private readonly HordeSession $session,
+        private readonly SessionAccess $session,
         private readonly TicketSorter $sorter,
         private readonly TopbarSearch $topbarSearch,
         private readonly UrlGenerator $urlGenerator,

src/Controller/SearchController.php

@@ -27,7 +27,7 @@
 use Horde_PageOutput;
 use Horde_Perms;
 use Horde_Registry;
-use Horde\Core\Session\HordeSession;
+use Horde\Core\Session\SessionAccess;
 use Horde_Url;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
@@ -49,7 +49,7 @@ public function __construct(
         private readonly Horde_Notification_Handler $notification,
         private readonly Horde_PageOutput $pageOutput,
         private readonly Horde_Registry $registry,
-        private readonly HordeSession $session,
+        private readonly SessionAccess $session,
         private readonly TicketSorter $sorter,
         private readonly TopbarSearch $topbarSearch,
         private readonly UrlGenerator $urlGenerator,

src/Controller/Ticket/AttachmentsController.php

@@ -33,7 +33,7 @@
 use Horde_PageOutput;
 use Horde_Perms;
 use Horde_Registry;
-use Horde\Core\Session\HordeSession;
+use Horde\Core\Session\SessionAccess;
 use Horde_Themes_Image;
 use Horde_Url;
 use Horde_Variables;
@@ -60,7 +60,7 @@ public function __construct(
         private readonly Horde_Notification_Handler $notification,
         private readonly Horde_PageOutput $pageOutput,
         private readonly Horde_Registry $registry,
-        private readonly HordeSession $session,
+        private readonly SessionAccess $session,
         private readonly TopbarSearch $topbarSearch,
         private readonly PrefsService $prefs,
         private readonly PermissionChecker $permissions,

src/Controller/Ticket/CommentController.php

@@ -31,7 +31,7 @@
 use Horde_Perms;
 use Horde_Perms_Base;
 use Horde_Registry;
-use Horde\Core\Session\HordeSession;
+use Horde\Core\Session\SessionAccess;
 use Horde_Text_Flowed;
 use Horde_Variables;
 use Horde\Util\Variables;
@@ -55,7 +55,7 @@ public function __construct(
         private readonly Horde_PageOutput $pageOutput,
         private readonly Horde_Perms_Base $perms,
         private readonly Horde_Registry $registry,
-        private readonly HordeSession $session,
+        private readonly SessionAccess $session,
         private readonly TopbarSearch $topbarSearch,
         private readonly PrefsService $prefs,
         private readonly PermissionChecker $permissions,

src/Controller/Ticket/CreateController.php

@@ -15,7 +15,7 @@
 namespace Horde\Whups\Controller\Ticket;
 
 use Horde;
-use Horde\Core\Session\HordeSession;
+use Horde\Core\Session\SessionAccess;
 use Horde\Form\V3\HtmlRenderer;
 use Horde\Whups\Controller\ResponseTrait;
 use Horde\Whups\Domain\StateCategory;
@@ -45,7 +45,7 @@ public function __construct(
         private readonly Horde_Notification_Handler $notification,
         private readonly Horde_PageOutput $pageOutput,
         private readonly Horde_Registry $registry,
-        private readonly HordeSession $session,
+        private readonly SessionAccess $session,
         private readonly TopbarSearch $topbarSearch,
         private readonly UrlGenerator $urlGenerator,
         private readonly Horde_Group_Base $groupService,

src/Controller/Ticket/DeleteController.php

@@ -29,7 +29,7 @@
 use Horde_PageOutput;
 use Horde_Perms;
 use Horde_Registry;
-use Horde\Core\Session\HordeSession;
+use Horde\Core\Session\SessionAccess;
 use Horde_Url;
 use Horde_Variables;
 use Horde\Whups\Service\TopbarSearch;
@@ -51,7 +51,7 @@ public function __construct(
         private readonly Horde_Notification_Handler $notification,
         private readonly Horde_PageOutput $pageOutput,
         private readonly Horde_Registry $registry,
-        private readonly HordeSession $session,
+        private readonly SessionAccess $session,
         private readonly TopbarSearch $topbarSearch,
         private readonly PrefsService $prefs,
         private readonly PermissionChecker $permissions,

src/Controller/Ticket/DeleteMultipleController.php

@@ -29,7 +29,7 @@
 use Horde_PageOutput;
 use Horde_Perms;
 use Horde_Registry;
-use Horde\Core\Session\HordeSession;
+use Horde\Core\Session\SessionAccess;
 use Horde_Url;
 use Horde\Whups\Service\TopbarSearch;
 use Psr\Http\Message\ResponseInterface;
@@ -48,7 +48,7 @@ public function __construct(
         private readonly Horde_Notification_Handler $notification,
         private readonly Horde_PageOutput $pageOutput,
         private readonly Horde_Registry $registry,
-        private readonly HordeSession $session,
+        private readonly SessionAccess $session,
         private readonly TopbarSearch $topbarSearch,
         private readonly PrefsService $prefs,
         private readonly PermissionChecker $permissions,

src/Controller/Ticket/QueueMoveController.php

@@ -31,7 +31,7 @@
 use Horde_Perms;
 use Horde_Perms_Base;
 use Horde_Registry;
-use Horde\Core\Session\HordeSession;
+use Horde\Core\Session\SessionAccess;
 use Horde_Variables;
 use Horde\Whups\Service\TopbarSearch;
 use Psr\Http\Message\ResponseInterface;
@@ -52,7 +52,7 @@ public function __construct(
         private readonly Horde_Notification_Handler $notification,
         private readonly Horde_PageOutput $pageOutput,
         private readonly Horde_Registry $registry,
-        private readonly HordeSession $session,
+        private readonly SessionAccess $session,
         private readonly TopbarSearch $topbarSearch,
         private readonly PrefsService $prefs,
         private readonly PermissionChecker $permissions,

src/Controller/Ticket/TypeChangeController.php

@@ -29,7 +29,7 @@
 use Horde_Notification_Handler;
 use Horde_PageOutput;
 use Horde_Registry;
-use Horde\Core\Session\HordeSession;
+use Horde\Core\Session\SessionAccess;
 use Horde_Variables;
 use Horde\Whups\Service\TopbarSearch;
 use Psr\Http\Message\ResponseInterface;
@@ -49,7 +49,7 @@ public function __construct(
         private readonly Horde_Notification_Handler $notification,
         private readonly Horde_PageOutput $pageOutput,
         private readonly Horde_Registry $registry,
-        private readonly HordeSession $session,
+        private readonly SessionAccess $session,
         private readonly TopbarSearch $topbarSearch,
         private readonly PrefsService $prefs,
         private readonly PermissionChecker $permissions,

src/Controller/Ticket/UpdateController.php

@@ -36,7 +36,7 @@
 use Horde_Perms_Base;
 use Horde_Perms_Exception;
 use Horde_Registry;
-use Horde\Core\Session\HordeSession;
+use Horde\Core\Session\SessionAccess;
 use Horde_Text_Flowed;
 use Horde_Variables;
 use Horde\Util\Variables;
@@ -61,7 +61,7 @@ public function __construct(
         private readonly Horde_PageOutput $pageOutput,
         private readonly Horde_Perms_Base $perms,
         private readonly Horde_Registry $registry,
-        private readonly HordeSession $session,
+        private readonly SessionAccess $session,
         private readonly TopbarSearch $topbarSearch,
         private readonly PrefsService $prefs,
         private readonly PermissionChecker $permissions,

src/Controller/Ticket/ViewController.php

@@ -28,7 +28,7 @@
 use Horde_PageOutput;
 use Horde_Perms;
 use Horde_Registry;
-use Horde\Core\Session\HordeSession;
+use Horde\Core\Session\SessionAccess;
 use Horde_Variables;
 use Horde\Whups\Service\TopbarSearch;
 use Psr\Http\Message\ResponseInterface;
@@ -50,7 +50,7 @@ public function __construct(
         private readonly Horde_Notification_Handler $notification,
         private readonly Horde_PageOutput $pageOutput,
         private readonly Horde_Registry $registry,
-        private readonly HordeSession $session,
+        private readonly SessionAccess $session,
         private readonly TopbarSearch $topbarSearch,
         private readonly PrefsService $prefs,
         private readonly PermissionChecker $permissions,

src/Controller/Ticket/WatchController.php

@@ -29,7 +29,7 @@
 use Horde_Notification_Handler;
 use Horde_PageOutput;
 use Horde_Registry;
-use Horde\Core\Session\HordeSession;
+use Horde\Core\Session\SessionAccess;
 use Horde_Themes_Image;
 use Horde_Url;
 use Horde_Variables;
@@ -52,7 +52,7 @@ public function __construct(
         private readonly Horde_Notification_Handler $notification,
         private readonly Horde_PageOutput $pageOutput,
         private readonly Horde_Registry $registry,
-        private readonly HordeSession $session,
+        private readonly SessionAccess $session,
         private readonly TopbarSearch $topbarSearch,
         private readonly PrefsService $prefs,
         private readonly PermissionChecker $permissions,

src/Service/TopbarSearch.php

@@ -22,7 +22,7 @@
 
 namespace Horde\Whups\Service;
 
-use Horde\Core\Session\HordeSession;
+use Horde\Core\Session\SessionAccess;
 use Horde_Registry;
 use Horde_Url;
 use Horde_View_Topbar;
@@ -31,7 +31,7 @@ class TopbarSearch
 {
     public function __construct(
         private readonly Horde_Registry $registry,
-        private readonly HordeSession $session,
+        private readonly SessionAccess $session,
         private readonly Horde_View_Topbar $topbar,
     ) {}
 

test/Unit/Controller/Query/RunControllerTest.php

@@ -5,7 +5,7 @@
 namespace Horde\Whups\Test\Unit\Controller\Query;
 
 use Horde\Core\Service\PrefsService;
-use Horde\Core\Session\HordeSession;
+use Horde\Core\Session\SessionAccess;
 use Horde\Http\ServerRequest;
 use Horde\Routes\Mapper;
 use Horde\Routes\Utils;
@@ -37,7 +37,7 @@ class RunControllerTest extends TestCase
     private Horde_Notification_Handler $notification;
     private Horde_PageOutput $pageOutput;
     private Horde_Registry $registry;
-    private HordeSession $session;
+    private SessionAccess $session;
     private TicketSorter $sorter;
     private TopbarSearch $topbarSearch;
     private UrlGenerator $urlGenerator;
@@ -110,7 +110,7 @@ protected function setUp(): void
         $this->notification = $this->createMock(Horde_Notification_Handler::class);
         $this->pageOutput = $this->createMock(Horde_PageOutput::class);
         $this->registry = $registry;
-        $this->session = $this->createMock(HordeSession::class);
+        $this->session = $this->createMock(SessionAccess::class);
         $this->sorter = $this->createMock(TicketSorter::class);
         $this->topbarSearch = $this->createMock(TopbarSearch::class);
         $this->urlGenerator = $this->createMock(UrlGenerator::class);

test/Unit/Controller/Queue/ViewControllerTest.php

@@ -5,7 +5,7 @@
 namespace Horde\Whups\Test\Unit\Controller\Queue;
 
 use Horde\Core\Service\PrefsService;
-use Horde\Core\Session\HordeSession;
+use Horde\Core\Session\SessionAccess;
 use Horde\Http\ServerRequest;
 use Horde\Whups\Controller\Queue\ViewController;
 use Horde\Whups\Service\TicketSorter;
@@ -29,7 +29,7 @@ class ViewControllerTest extends TestCase
     private Horde_Notification_Handler $notification;
     private Horde_PageOutput $pageOutput;
     private Horde_Registry $registry;
-    private HordeSession $session;
+    private SessionAccess $session;
     private TicketSorter $sorter;
     private TopbarSearch $topbarSearch;
     private UrlGenerator $urlGenerator;
@@ -49,7 +49,7 @@ protected function setUp(): void
             ['webroot', 'whups', '/whups'],
         ]);
         $this->registry->method('getAuth')->willReturn('test_user');
-        $this->session = $this->createMock(HordeSession::class);
+        $this->session = $this->createMock(SessionAccess::class);
         $this->sorter = $this->createMock(TicketSorter::class);
         $this->topbarSearch = $this->createMock(TopbarSearch::class);
         $this->urlGenerator = $this->createMock(UrlGenerator::class);