Use TicketStore abstract class type

simplesamlphp · Dec 15, 2024 · 36c2e4e · 36c2e4e
1 parent f314472
commit 36c2e4e
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 15 deletions.
diff --git a/src/Controller/Cas10Controller.php b/src/Controller/Cas10Controller.php
@@ -8,6 +8,7 @@
 use SimpleSAML\Logger;
 use SimpleSAML\Module\casserver\Cas\Factories\TicketFactory;
 use SimpleSAML\Module\casserver\Cas\Protocol\Cas10;
+use SimpleSAML\Module\casserver\Cas\Ticket\TicketStore;
 use SimpleSAML\Module\casserver\Controller\Traits\UrlTrait;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
@@ -31,20 +32,20 @@ class Cas10Controller
     /** @var TicketFactory */
     protected TicketFactory $ticketFactory;
 
-    // this could be any configured ticket store
-    protected mixed $ticketStore;
+    /** @var TicketStore */
+    protected TicketStore $ticketStore;
 
     /**
      * @param   Configuration       $sspConfig
      * @param   Configuration|null  $casConfig
-     * @param   null                $ticketStore
+     * @param   TicketStore|null    $ticketStore
      *
      * @throws \Exception
      */
     public function __construct(
         private readonly Configuration $sspConfig,
         Configuration $casConfig = null,
-        $ticketStore = null,
+        TicketStore $ticketStore = null,
     ) {
         // We are using this work around in order to bypass Symfony's autowiring for cas configuration. Since
         // the configuration class is the same, it loads the ssp configuration twice. Still, we need the constructor

diff --git a/src/Controller/Cas20Controller.php b/src/Controller/Cas20Controller.php
@@ -9,6 +9,7 @@
 use SimpleSAML\Logger;
 use SimpleSAML\Module\casserver\Cas\Factories\TicketFactory;
 use SimpleSAML\Module\casserver\Cas\Protocol\Cas20;
+use SimpleSAML\Module\casserver\Cas\Ticket\TicketStore;
 use SimpleSAML\Module\casserver\Controller\Traits\UrlTrait;
 use SimpleSAML\Module\casserver\Http\XmlResponse;
 use SimpleSAML\Utils;
@@ -37,20 +38,21 @@ class Cas20Controller
     /** @var TicketFactory */
     protected TicketFactory $ticketFactory;
 
-    // this could be any configured ticket store
-    protected mixed $ticketStore;
+    /** @var TicketStore */
+    protected TicketStore $ticketStore;
 
     /**
      * @param   Configuration       $sspConfig
      * @param   Configuration|null  $casConfig
-     * @param                       $ticketStore
+     * @param   TicketStore|null    $ticketStore
+     * @param   Utils\HTTP|null           $httpUtils
      *
      * @throws \Exception
      */
     public function __construct(
         private readonly Configuration $sspConfig,
         Configuration $casConfig = null,
-        $ticketStore = null,
+        TicketStore $ticketStore = null,
         Utils\HTTP $httpUtils = null,
     ) {
         // We are using this work around in order to bypass Symfony's autowiring for cas configuration. Since

diff --git a/src/Controller/LoginController.php b/src/Controller/LoginController.php
@@ -15,6 +15,7 @@
 use SimpleSAML\Module\casserver\Cas\Protocol\Cas20;
 use SimpleSAML\Module\casserver\Cas\Protocol\SamlValidateResponder;
 use SimpleSAML\Module\casserver\Cas\ServiceValidator;
+use SimpleSAML\Module\casserver\Cas\Ticket\TicketStore;
 use SimpleSAML\Module\casserver\Controller\Traits\UrlTrait;
 use SimpleSAML\Module\casserver\Http\XmlResponse;
 use SimpleSAML\Session;
@@ -48,9 +49,8 @@ class LoginController
     /** @var Cas20 */
     protected Cas20 $cas20Protocol;
 
-    // this could be any configured ticket store
-    /** @var mixed */
-    protected mixed $ticketStore;
+    /** @var TicketStore */
+    protected TicketStore $ticketStore;
 
     /** @var ServiceValidator */
     protected ServiceValidator $serviceValidator;
@@ -76,7 +76,7 @@ class LoginController
      * @param   Configuration       $sspConfig
      * @param   Configuration|null  $casConfig
      * @param   Simple|null         $source
-     * @param   HTTP|null           $httpUtils
+     * @param   Utils\HTTP|null           $httpUtils
      *
      * @throws \Exception
      */

diff --git a/src/Controller/LogoutController.php b/src/Controller/LogoutController.php
@@ -10,6 +10,7 @@
 use SimpleSAML\Logger;
 use SimpleSAML\Module;
 use SimpleSAML\Module\casserver\Cas\Factories\TicketFactory;
+use SimpleSAML\Module\casserver\Cas\Ticket\TicketStore;
 use SimpleSAML\Module\casserver\Controller\Traits\UrlTrait;
 use SimpleSAML\Session;
 use Symfony\Component\HttpFoundation\RedirectResponse;
@@ -37,9 +38,8 @@ class LogoutController
     /** @var SspContainer */
     protected SspContainer $container;
 
-    // this could be any configured ticket store
-    /** @var mixed */
-    protected mixed $ticketStore;
+    /** @var TicketStore */
+    protected TicketStore $ticketStore;
 
 
     /**