Better imports and exception handling

Author: Jonathon Hill

src/Handlers/RedisHandler.php

@@ -8,9 +8,9 @@
 
 use Compwright\PhpSession\Config;
 use Compwright\PhpSession\SessionId;
-use Exception;
 use MatthiasMullie\Scrapbook\Adapters\Redis as RedisKeyValueStore;
 use Redis;
+use RuntimeException;
 
 /**
  * Redis session store.
@@ -25,7 +25,7 @@ public function __construct(Config $config)
         $this->sid = new SessionId($config);
 
         if (!extension_loaded('redis')) {
-            throw new Exception('Missing redis extension');
+            throw new RuntimeException('Missing redis extension');
         }
     }
 

src/Manager.php

@@ -6,6 +6,11 @@
 
 namespace Compwright\PhpSession;
 
+use InvalidArgumentException;
+use RuntimeException;
+use SessionUpdateTimestampHandlerInterface;
+use Throwable;
+
 class Manager
 {
     protected Config $config;
@@ -87,7 +92,7 @@ public function commit(): bool
     public function create_id(string $prefix = "")
     {
         if ($prefix && preg_match("/^[a-zA-Z0-9,-]+$/", $prefix) === 0) {
-            throw new \InvalidArgumentException("\$prefix contains disallowed characters");
+            throw new InvalidArgumentException("\$prefix contains disallowed characters");
         }
 
         $this->config->setSidPrefix($prefix);
@@ -112,7 +117,7 @@ public function decode(string $data)
             $serializer = $this->config->getSerializeHandler();
             $this->currentSession->setContents($serializer->unserialize($data));
             return true;
-        } catch (\Exception $e) {
+        } catch (Throwable $e) {
             return false;
         }
     }
@@ -135,7 +140,7 @@ public function encode()
         try {
             $serializer = $this->config->getSerializeHandler();
             return $serializer->serialize($this->currentSession->toArray());
-        } catch (\Exception $e) {
+        } catch (Throwable $e) {
             return false;
         }
     }
@@ -321,7 +326,7 @@ public function start(): bool
         if (
             !$this->currentSession
             || (
-                $handler instanceof \SessionUpdateTimestampHandlerInterface
+                $handler instanceof SessionUpdateTimestampHandlerInterface
                 && !$handler->validateId($this->currentSession->getId())
             )
         ) {
@@ -427,7 +432,7 @@ public function write_close(): bool
             $handler->destroy($id);
             $handler->close();
             $this->currentSession->close();
-            throw new \RuntimeException("Data serialization failure");
+            throw new RuntimeException("Data serialization failure");
             return false;
         }