zend usage removed; psr2 fixes

Author: DarkGit

composer.json

@@ -31,11 +31,10 @@
   "require": {
     "php"                     : ">=7.3",
     "g4/mcache"               : "*",
-    "laminas/laminas-cache"   : "3.0.*",
+    "laminas/laminas-cache"   : "2.13.*",
     "laminas/laminas-session" : "2.12.*"
   },
   "require-dev": {
-    "laminas/laminas-cache-storage-adapter-memory" : "2.0.*",
     "phpunit/phpunit"           : "9.*",
     "squizlabs/php_codesniffer" : "3.*",
     "g4/code-coverage"          : "1.*"

composer.lock

@@ -2,11 +2,13 @@
 
 namespace G4\Session;
 
+use Laminas\Session\Container as LaminasContainer;
+
 class Container
 {
 
     /**
-     * @var \Zend\Session\Container
+     * @var LaminasContainer
      */
     private $container;
 
@@ -15,14 +17,14 @@ class Container
      */
     public function __construct($name)
     {
-        $this->container = new \Zend\Session\Container($name);
+        $this->container = new LaminasContainer($name);
     }
 
     /**
      * @param string $key
      * @return boolean
      */
-    public function offsetExists($key)
+    public function offsetExists($key): bool
     {
         return $this->container->offsetExists($key);
     }
@@ -40,44 +42,44 @@ public function offsetGet($key)
      * @param string $key
      * @param mixed $value
      */
-    public function offsetSet($key, $value)
+    public function offsetSet($key, $value): void
     {
-        return $this->container->offsetSet($key, $value);
+        $this->container->offsetSet($key, $value);
     }
 
     /**
      * @param string $key
      * @return void
      */
-    public function offsetUnset($key)
+    public function offsetUnset($key): void
     {
         $this->container->offsetUnset($key);
     }
 
     /**
      * @return array
      */
-    public function getData()
+    public function getData(): array
     {
         return $this->container->getArrayCopy();
     }
 
     /**
      * @return boolean
      */
-    public function hasData()
+    public function hasData(): bool
     {
         $data = $this->container->getArrayCopy();
         return !empty($data);
     }
 
     /**
      * @param array $data
-     * @return \G4\Session\Container
+     * @return Container
      */
-    public function setData(array $data)
+    public function setData(array $data): Container
     {
         $this->container->exchangeArray($data);
         return $this;
     }
-}
+}

src/Container.php

@@ -1,11 +1,9 @@
 <?php
 
-
 namespace G4\Session;
 
-
 class ErrorCodes
 {
 
-    const MISSING_DOMAIN_NAME_EXCEPTION = 70001;
+    public const MISSING_DOMAIN_NAME_EXCEPTION = 70001;
 }

src/ErrorCodes.php

@@ -8,7 +8,7 @@
 class MissingDomainNameException extends Exception
 {
 
-    const MESSAGE = 'Missing Domain Name';
+    public const MESSAGE = 'Missing Domain Name';
 
     public function __construct()
     {

src/Exception/MissingDomainNameException.php

@@ -2,11 +2,15 @@
 
 namespace G4\Session\SaveHandler;
 
-class Couchbase implements \Zend\Session\SaveHandler\SaveHandlerInterface
+use G4\Mcache\Mcache;
+use G4\Mcache\McacheFactory;
+use Laminas\Session\SaveHandler\SaveHandlerInterface;
+
+class Couchbase implements SaveHandlerInterface
 {
 
     /**
-     * @var \G4\Mcache\Mcache
+     * @var Mcache
      */
     private $mcache;
 
@@ -15,15 +19,15 @@ class Couchbase implements \Zend\Session\SaveHandler\SaveHandlerInterface
      */
     private $options;
 
-
     /**
      * @param array $options
+     * @throws \Exception
      */
     public function __construct(array $options)
     {
-        $this->options   = $options;
-        $this->mcache = \G4\Mcache\McacheFactory::createInstance(
-            \G4\Mcache\McacheFactory::DRIVER_COUCHBASE,
+        $this->options = $options;
+        $this->mcache  = McacheFactory::createInstance(
+            McacheFactory::DRIVER_COUCHBASE,
             $this->options,
             __CLASS__
         );
@@ -32,15 +36,15 @@ public function __construct(array $options)
     /**
      * Unnecessary for couchbase
      */
-    public function open($savePath, $name)
+    public function open($savePath, $name): bool
     {
         return true;
     }
 
     /**
      * Unnecessary for couchbase
      */
-    public function close()
+    public function close(): bool
     {
         return true;
     }
@@ -49,7 +53,7 @@ public function close()
      * @param string $id
      * @return string
      */
-    public function read($id)
+    public function read($id): string
     {
         return $this->mcache
             ->key($id)
@@ -61,21 +65,22 @@ public function read($id)
      * @param string $data
      * @return bool
      */
-    public function write($id, $data)
+    public function write($id, $data): bool
     {
         $result = $this->mcache
             ->key($id)
             ->value($data)
             ->expiration($this->getLifetime())
             ->set();
+
         return !empty($result);
     }
 
     /**
      * @param string $id
      * @return bool
      */
-    public function destroy($id)
+    public function destroy($id): bool
     {
         return $this->mcache
             ->key($id)
@@ -85,18 +90,18 @@ public function destroy($id)
     /**
      * Unnecessary for couchbase
      */
-    public function gc($maxlifetime)
+    public function gc($maxlifetime): bool
     {
         return true;
     }
 
     /**
      * @return int
      */
-    private function getLifetime()
+    private function getLifetime(): int
     {
         return isset($this->options['lifetime'])
             ? (int) $this->options['lifetime']
             : 0;
     }
-}
+}