Merge pull request #21 from boesing/refactor/finalize-and-cleanup

Mark classes `final`, tighten `ext-redis` dependency and remove `ext-redis` extension checks
laminas · Oct 12, 2021 · c147cee · c147cee
2 parents 96bd15c + e6749d8
commit c147cee
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 23 deletions.
diff --git a/composer.json b/composer.json
@@ -8,8 +8,7 @@
   "license": "BSD-3-Clause",
   "require": {
     "php": "^7.3 || ~8.0.0 || ~8.1.0",
-    "ext-posix": "*",
-    "ext-redis": "*",
+    "ext-redis": "^4.3 || ^5.0.2",
     "laminas/laminas-cache": "^3.0"
   },
   "provide": {

diff --git a/composer.lock b/composer.lock
diff --git a/src/Redis.php b/src/Redis.php
@@ -15,10 +15,9 @@
 
 use function array_combine;
 use function array_filter;
-use function extension_loaded;
 use function version_compare;
 
-class Redis extends AbstractAdapter implements
+final class Redis extends AbstractAdapter implements
     ClearByNamespaceInterface,
     ClearByPrefixInterface,
     FlushableInterface,
@@ -61,10 +60,6 @@ class Redis extends AbstractAdapter implements
      */
     public function __construct($options = null)
     {
-        if (! extension_loaded('redis')) {
-            throw new Exception\ExtensionNotLoadedException("Redis extension is not loaded");
-        }
-
         parent::__construct($options);
 
         // reset initialized flag on update option(s)

diff --git a/src/RedisCluster.php b/src/RedisCluster.php
@@ -21,7 +21,6 @@
 use function array_key_exists;
 use function array_values;
 use function count;
-use function extension_loaded;
 use function in_array;
 use function sprintf;
 use function version_compare;
@@ -49,10 +48,6 @@ final class RedisCluster extends AbstractAdapter implements
      */
     public function __construct($options = null)
     {
-        if (! extension_loaded('redis')) {
-            throw new Exception\ExtensionNotLoadedException("Redis extension is not loaded");
-        }
-
         /** @psalm-suppress PossiblyInvalidArgument */
         parent::__construct($options);
         $eventManager = $this->getEventManager();

diff --git a/src/RedisClusterResourceManager.php b/src/RedisClusterResourceManager.php
@@ -4,7 +4,6 @@
 
 namespace Laminas\Cache\Storage\Adapter;
 
-use Laminas\Cache\Exception\ExtensionNotLoadedException;
 use Laminas\Cache\Exception\RuntimeException;
 use Laminas\Cache\Storage\Adapter\Exception\RedisRuntimeException;
 use Laminas\Cache\Storage\Plugin\PluginInterface;
@@ -15,7 +14,6 @@
 
 use function array_key_exists;
 use function assert;
-use function extension_loaded;
 
 /**
  * @psalm-type RedisClusterInfoType = array<string,mixed>&array{redis_version:string}
@@ -31,9 +29,6 @@ final class RedisClusterResourceManager implements RedisClusterResourceManagerIn
     public function __construct(RedisClusterOptions $options)
     {
         $this->options = $options;
-        if (! extension_loaded('redis')) {
-            throw new ExtensionNotLoadedException('Redis extension is not loaded');
-        }
     }
 
     public function getVersion(): string

diff --git a/src/RedisOptions.php b/src/RedisOptions.php
@@ -7,7 +7,7 @@
 use function sprintf;
 use function strlen;
 
-class RedisOptions extends AdapterOptions
+final class RedisOptions extends AdapterOptions
 {
     // @codingStandardsIgnoreStart
     /**

diff --git a/src/RedisResourceManager.php b/src/RedisResourceManager.php
@@ -23,7 +23,7 @@
 /**
  * This is a resource manager for redis
  */
-class RedisResourceManager
+final class RedisResourceManager
 {
     /**
      * Registered resources