Cleanup

extend.php

@@ -12,7 +12,7 @@
 namespace GlowingBlue\RedisSetup;
 
 use Flarum\Extend;
-use GlowingBlue\RedisSetup\Extend\EnableRedis;
+use GlowingBlue\RedisSetup\Extend as GBExtend;
 use GlowingBlue\RedisSetup\Provider\QueueProvider;
 
 return [
@@ -21,7 +21,7 @@ return [
 
 	new Extend\Locales(__DIR__.'/resources/locale'),
 
-	new EnableRedis(),
+	new GBExtend\EnableRedis(),
 
 	(new Extend\ServiceProvider())
 		->register(QueueProvider::class),

src/Extend/EnableRedis.php

@@ -18,15 +18,10 @@ class EnableRedis implements ExtenderInterface
     public function extend(Container $container, Extension $extension = null)
     {
         $config = $this->buildConfig();
-        $disabled = $this->getDisabledServices();
 
-        $redis = (new Redis($config));
-
-        foreach ($disabled as $service) {
-            $redis->disable($service);
-        }
-
-        $redis->extend($container, $extension);
+        (new Redis($config))
+            ->disable($this->getDisabledServices())
+            ->extend($container, $extension);
     }
 
     private function getDisabledServices(): array
@@ -51,14 +46,8 @@ class EnableRedis implements ExtenderInterface
         return $disabled;
     }
 
-    private function buildConfig(): array
+    private function buildConfig($config = []): array
     {
-        if ($this->getHost() === null) {
-            return [];
-        }
-
-        $config = [];
-
         $cache = [
             'host' => $this->getHost(),
             'password' => $this->getPassword(),