Update to PHP 8.1

Author: byjg

src/JwtSession.php

@@ -3,6 +3,8 @@
 namespace ByJG\Session;
 
 use ByJG\Util\JwtWrapper;
+use ByJG\Util\JwtWrapperException;
+use Exception;
 use SessionHandlerInterface;
 
 class JwtSession implements SessionHandlerInterface
@@ -101,7 +103,7 @@ public function destroy(string $id): bool
      * Sessions that have not updated for
      * the last maxlifetime seconds will be removed.
      * </p>
-     * @return bool <p>
+     * @return int|false <p>
      * The return value (usually TRUE on success, FALSE on failure).
      * Note this value is returned internally to PHP for processing.
      * </p>
@@ -158,7 +160,7 @@ public function read(string $id): string
                 return $data->data;
             }
             return '';
-        } catch (\Exception $ex) {
+        } catch (Exception $ex) {
             return '';
         }
     }
@@ -179,7 +181,7 @@ public function read(string $id): string
      * The return value (usually TRUE on success, FALSE on failure).
      * Note this value is returned internally to PHP for processing.
      * </p>
-     * @throws \ByJG\Util\JwtWrapperException
+     * @throws JwtWrapperException
      * @since 5.4.0
      */
     public function write(string $id, string $data): bool

src/JwtSessionException.php

@@ -1,7 +1,9 @@
 <?php
 namespace ByJG\Session;
 
-class JwtSessionException extends \Exception
+use Exception;
+
+class JwtSessionException extends Exception
 {
 
 }

src/SessionConfig.php

@@ -8,14 +8,14 @@
 
 class SessionConfig
 {
-    protected $serverName;
+    protected string $serverName;
 
-    protected $sessionContext = 'default';
-    protected $timeoutMinutes = 20;
-    protected $cookieDomain = null;
-    protected $cookiePath = '/';
-    protected $jwtKey = null;
-    protected $replaceSessionHandler = null;
+    protected string $sessionContext = 'default';
+    protected int $timeoutMinutes = 20;
+    protected ?string $cookieDomain = null;
+    protected string $cookiePath = '/';
+    protected ?JwtKeyInterface $jwtKey = null;
+    protected ?bool $replaceSessionHandler = null;
 
     /**
      * SessionConfig constructor.
@@ -26,95 +26,104 @@ public function __construct($serverName)
         $this->serverName = $serverName;
     }
 
-    public function withSessionContext($context) {
+    public function withSessionContext($context): static
+    {
         $this->sessionContext = $context;
         return $this;
     }
 
-    public function withTimeoutMinutes($timeout) {
+    public function withTimeoutMinutes($timeout): static
+    {
         $this->timeoutMinutes = $timeout;
         return $this;
     }
 
-    public function withTimeoutHours($timeout) {
+    public function withTimeoutHours($timeout): static
+    {
         $this->timeoutMinutes = $timeout * 60;
         return $this;
     }
 
-    public function withCookie($domain, $path = "/") {
+    public function withCookie($domain, $path = "/"): static
+    {
         $this->cookieDomain = $domain;
         $this->cookiePath = $path;
         return $this;
     }
 
-    public function withSecret($secret) {
+    public function withSecret($secret): static
+    {
         $this->jwtKey = new JwtKeySecret($secret);
         return $this;
     }
 
-    public function withRsaSecret($private, $public) {
+    public function withRsaSecret($private, $public): static
+    {
         $this->jwtKey = new JwtRsaKey($private, $public);
         return $this;
     }
 
-    public function replaceSessionHandler($startSession = true) {
+    public function replaceSessionHandler($startSession = true): static
+    {
         $this->replaceSessionHandler = $startSession;
         return $this;
     }
 
     /**
-     * @return mixed
+     * @return string
      */
-    public function getServerName()
+    public function getServerName(): string
     {
         return $this->serverName;
     }
 
     /**
      * @return string
      */
-    public function getSessionContext()
+    public function getSessionContext(): string
     {
         return $this->sessionContext;
     }
 
     /**
      * @return int
      */
-    public function getTimeoutMinutes()
+    public function getTimeoutMinutes(): int
     {
         return $this->timeoutMinutes;
     }
 
     /**
-     * @return null
+     * @return string|null
      */
-    public function getCookieDomain()
+    public function getCookieDomain(): ?string
     {
         return $this->cookieDomain;
     }
 
     /**
      * @return string
      */
-    public function getCookiePath()
+    public function getCookiePath(): string
     {
         return $this->cookiePath;
     }
 
     /**
-     * @return JwtKeyInterface
+     * @return JwtKeyInterface|null
      */
-    public function getKey()
+    public function getKey(): ?JwtKeyInterface
     {
         return $this->jwtKey;
     }
 
-    public function isReplaceSession() {
+    public function isReplaceSession(): bool
+    {
         return $this->replaceSessionHandler !== null;
     }
 
-    public function isStartSession() {
+    public function isStartSession(): bool
+    {
         return $this->replaceSessionHandler === true;
     }
 }

tests/JwtSessionRsaTest.php

@@ -1,11 +1,16 @@
 <?php
 
 use ByJG\Session\JwtSession;
+use ByJG\Session\JwtSessionException;
+use ByJG\Session\SessionConfig;
 
 require_once __DIR__ . "/JwtSessionTest.php";
 
 class JwtSessionRsaTest extends JwtSessionTest
 {
+    /**
+     * @throws JwtSessionException
+     */
     protected function setUp(): void
     {
         $secret = <<<PRIVATE
@@ -50,7 +55,7 @@ protected function setUp(): void
 -----END PUBLIC KEY-----
 PUBLIC;
 
-        $this->sessionConfig = (new \ByJG\Session\SessionConfig('example.com'))
+        $this->sessionConfig = (new SessionConfig('example.com'))
             ->withRsaSecret($secret, $public);
 
         $this->object = new JwtSession($this->sessionConfig);

tests/JwtSessionTest.php

@@ -1,27 +1,34 @@
 <?php
 
 use ByJG\Session\JwtSession;
+use ByJG\Session\JwtSessionException;
+use ByJG\Session\SessionConfig;
+use ByJG\Util\JwtWrapperException;
+use PHPUnit\Framework\TestCase;
 
 ob_start();
 define("SETCOOKIE_FORTEST", "TESTCASE");
 
-class JwtSessionTest extends \PHPUnit\Framework\TestCase
+class JwtSessionTest extends TestCase
 {
     /**
-     * @var JwtSession
+     * @var ?JwtSession
      */
-    protected $object;
+    protected ?JwtSession $object;
 
     /**
-     * @var \ByJG\Session\SessionConfig
+     * @var SessionConfig
      */
-    protected $sessionConfig;
+    protected SessionConfig $sessionConfig;
 
     const SESSION_ID = "sessionid";
 
+    /**
+     * @throws JwtSessionException
+     */
     protected function setUp(): void
     {
-        $this->sessionConfig = (new \ByJG\Session\SessionConfig('example.com'))
+        $this->sessionConfig = (new SessionConfig('example.com'))
             ->withSecret('secretKey');
 
         $this->object = new JwtSession($this->sessionConfig);
@@ -50,7 +57,7 @@ public function testClose()
         $this->assertTrue($this->object->close());
     }
 
-    public function dataProvider()
+    public function dataProvider(): array
     {
         $obj = new stdClass();
         $obj->prop1 = "value1";
@@ -139,6 +146,7 @@ public function testUnserializeData($expected, $input)
      * @dataProvider dataProvider
      * @param $object
      * @param $serialize
+     * @throws JwtWrapperException
      */
     public function testReadWrite($object, $serialize)
     {