Level 4 static analysis

Author: Jonathon Hill

phpstan.neon

@@ -1,5 +1,5 @@
 parameters:
-    level: 3
+    level: 4
     paths:
         - src
         - tests

src/Handlers/ArrayHandler.php

@@ -27,8 +27,6 @@ class ArrayHandler implements
 {
     use SessionIdTrait;
 
-    private Config $config;
-
     private SessionId $sid;
 
     /**
@@ -38,15 +36,8 @@ class ArrayHandler implements
 
     public function __construct(Config $config, array $store = [])
     {
-        // required for SessionIdTrait
-        $this->config = $config;
         $this->sid = new SessionId($config);
-        
         $this->store = $store;
-
-        if (microtime(true) === false) {
-            throw new RuntimeException("High resolution time not supported");
-        }
     }
 
     public function open($path, $name): bool

src/Handlers/FileHandler.php

@@ -25,16 +25,13 @@ class FileHandler implements
 {
     use SessionIdTrait;
 
-    private Config $config;
-
     private SessionId $sid;
 
     private string $savePath;
 
     public function __construct(Config $config)
     {
         // required for SessionIdTrait
-        $this->config = $config;
         $this->sid = new SessionId($config);
     }
 

src/Handlers/Psr16Handler.php

@@ -24,8 +24,6 @@ class Psr16Handler implements
 {
     use SessionIdTrait;
 
-    private Config $config;
-
     private SessionId $sid;
 
     private CacheInterface $store;
@@ -34,7 +32,6 @@ class Psr16Handler implements
 
     public function __construct(Config $config, CacheInterface $store)
     {
-        $this->config = $config; // still required by SessionIdTrait
         $this->store = $store;
         $this->sid = new SessionId($config);
     }

src/Handlers/RedisHandler.php

@@ -49,7 +49,7 @@ public function open($path, $name): bool
             return false;
         }
 
-        if (!$redis->select((int) $query['database'] ?? 0)) {
+        if (!$redis->select((int) ($query['database'] ?? 0))) {
             $redis->close();
             unset($redis);
             return false;

src/Manager.php

@@ -347,9 +347,7 @@ public function start(): bool
         }
 
         if ($contents === false) {
-            if ($isOpen) {
-                $handler->close();
-            }
+            $handler->close();
             return false;
         }
 
@@ -433,7 +431,6 @@ public function write_close(): bool
             $handler->close();
             $this->currentSession->close();
             throw new RuntimeException("Data serialization failure");
-            return false;
         }
 
         if (!$this->currentSession->isModified() && $this->config->getLazyWrite()) {

src/Middleware/SessionCacheControlMiddleware.php

@@ -21,7 +21,7 @@ public function process(
     ): ResponseInterface {
         $response = $handler->handle($request);
 
-        /** @var Manager */
+        /** @var ?Manager */
         $manager = $request->getAttribute("sessionManager");
 
         if (!$manager || !$manager instanceof Manager) {

src/Middleware/SessionMiddleware.php

@@ -19,7 +19,7 @@ public function process(
         ServerRequestInterface $request,
         RequestHandlerInterface $handler
     ): ResponseInterface {
-        /** @var Manager */
+        /** @var ?Manager */
         $manager = $request->getAttribute("sessionManager");
 
         if (!$manager || !$manager instanceof Manager) {

tests/behavior/PersistenceContext.php

@@ -11,6 +11,7 @@
 use Compwright\PhpSession\Manager;
 use Compwright\PhpSession\Session;
 use PHPUnit\Framework\Assert;
+use RuntimeException;
 
 /**
  * Defines application features from the specific context.
@@ -112,11 +113,11 @@ public function furtherSessionWritesAreNotSaved()
         Assert::assertFalse($this->session->isWriteable());
 
         try {
-            $this->session->bar = "baz";
-        } catch (\RuntimeException $e) {
+            $this->session->__set('bar', 'baz');
+        } catch (RuntimeException $e) {
             // ignore
         } finally {
-            Assert::assertFalse(isset($this->session->bar));
+            Assert::assertFalse($this->session->__isset('bar'));
         }
     }