From f3384375f606c6257dac0b05231e49f4396a27e6 Mon Sep 17 00:00:00 2001 From: Ralf Lang Date: Wed, 22 Jul 2026 11:52:13 +0200 Subject: [PATCH] refactor: Use SessionAccess rather than holding a reference relates to horde/core#190 --- src/Controller/MyBugsController.php | 4 ++-- src/Controller/MyBugsEditController.php | 4 ++-- src/Controller/Query/RunController.php | 4 ++-- src/Controller/Queue/ViewController.php | 4 ++-- src/Controller/SearchController.php | 4 ++-- src/Controller/Ticket/AttachmentsController.php | 4 ++-- src/Controller/Ticket/CommentController.php | 4 ++-- src/Controller/Ticket/CreateController.php | 4 ++-- src/Controller/Ticket/DeleteController.php | 4 ++-- src/Controller/Ticket/DeleteMultipleController.php | 4 ++-- src/Controller/Ticket/QueueMoveController.php | 4 ++-- src/Controller/Ticket/TypeChangeController.php | 4 ++-- src/Controller/Ticket/UpdateController.php | 4 ++-- src/Controller/Ticket/ViewController.php | 4 ++-- src/Controller/Ticket/WatchController.php | 4 ++-- src/Service/TopbarSearch.php | 4 ++-- test/Unit/Controller/Query/RunControllerTest.php | 6 +++--- test/Unit/Controller/Queue/ViewControllerTest.php | 6 +++--- 18 files changed, 38 insertions(+), 38 deletions(-) diff --git a/src/Controller/MyBugsController.php b/src/Controller/MyBugsController.php index dac1d34..387c866 100644 --- a/src/Controller/MyBugsController.php +++ b/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, diff --git a/src/Controller/MyBugsEditController.php b/src/Controller/MyBugsEditController.php index 3177f21..55629b8 100644 --- a/src/Controller/MyBugsEditController.php +++ b/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, diff --git a/src/Controller/Query/RunController.php b/src/Controller/Query/RunController.php index f2af43c..7c1792c 100644 --- a/src/Controller/Query/RunController.php +++ b/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, diff --git a/src/Controller/Queue/ViewController.php b/src/Controller/Queue/ViewController.php index 7552187..03d768f 100644 --- a/src/Controller/Queue/ViewController.php +++ b/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, diff --git a/src/Controller/SearchController.php b/src/Controller/SearchController.php index 88c8234..e0aeed6 100644 --- a/src/Controller/SearchController.php +++ b/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, diff --git a/src/Controller/Ticket/AttachmentsController.php b/src/Controller/Ticket/AttachmentsController.php index f78f351..984aee2 100644 --- a/src/Controller/Ticket/AttachmentsController.php +++ b/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, diff --git a/src/Controller/Ticket/CommentController.php b/src/Controller/Ticket/CommentController.php index c9f52cf..013da78 100644 --- a/src/Controller/Ticket/CommentController.php +++ b/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, diff --git a/src/Controller/Ticket/CreateController.php b/src/Controller/Ticket/CreateController.php index 9c34701..0765110 100644 --- a/src/Controller/Ticket/CreateController.php +++ b/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, diff --git a/src/Controller/Ticket/DeleteController.php b/src/Controller/Ticket/DeleteController.php index c690482..ebb0680 100644 --- a/src/Controller/Ticket/DeleteController.php +++ b/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, diff --git a/src/Controller/Ticket/DeleteMultipleController.php b/src/Controller/Ticket/DeleteMultipleController.php index b45034a..5e817dc 100644 --- a/src/Controller/Ticket/DeleteMultipleController.php +++ b/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, diff --git a/src/Controller/Ticket/QueueMoveController.php b/src/Controller/Ticket/QueueMoveController.php index bdec0b3..1ba7224 100644 --- a/src/Controller/Ticket/QueueMoveController.php +++ b/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, diff --git a/src/Controller/Ticket/TypeChangeController.php b/src/Controller/Ticket/TypeChangeController.php index 3c7a5f6..fcb7fc8 100644 --- a/src/Controller/Ticket/TypeChangeController.php +++ b/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, diff --git a/src/Controller/Ticket/UpdateController.php b/src/Controller/Ticket/UpdateController.php index 586041b..117df79 100644 --- a/src/Controller/Ticket/UpdateController.php +++ b/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, diff --git a/src/Controller/Ticket/ViewController.php b/src/Controller/Ticket/ViewController.php index e640720..73ef3d1 100644 --- a/src/Controller/Ticket/ViewController.php +++ b/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, diff --git a/src/Controller/Ticket/WatchController.php b/src/Controller/Ticket/WatchController.php index a7e8f97..1c46cd6 100644 --- a/src/Controller/Ticket/WatchController.php +++ b/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, diff --git a/src/Service/TopbarSearch.php b/src/Service/TopbarSearch.php index 2abdf7f..acf71f0 100644 --- a/src/Service/TopbarSearch.php +++ b/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, ) {} diff --git a/test/Unit/Controller/Query/RunControllerTest.php b/test/Unit/Controller/Query/RunControllerTest.php index 59fe323..14a5be3 100644 --- a/test/Unit/Controller/Query/RunControllerTest.php +++ b/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); diff --git a/test/Unit/Controller/Queue/ViewControllerTest.php b/test/Unit/Controller/Queue/ViewControllerTest.php index 940ebb9..773e1f3 100644 --- a/test/Unit/Controller/Queue/ViewControllerTest.php +++ b/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);