Fix bugs found by scrutinizer-ci

wshafer · May 17, 2017 · e06ed57 · e06ed57
1 parent 2370d07
commit e06ed57
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 73 deletions.
diff --git a/src/Config/AdaptorConfig.php b/src/Config/AdaptorConfig.php
@@ -3,40 +3,6 @@
 
 namespace WShafer\PSR11FlySystem\Config;
 
-use WShafer\PSR11FlySystem\Exception\MissingConfigException;
-
-class AdaptorConfig
+class AdaptorConfig extends ConfigurationAbstract
 {
-    protected $config = [];
-
-    public function __construct(array $config)
-    {
-        $this->validateConfig($config);
-        $this->config = $config;
-    }
-
-    protected function validateConfig($config)
-    {
-        if (empty($config)) {
-            throw new MissingConfigException(
-                'No config found'
-            );
-        }
-
-        if (empty($config['type'])) {
-            throw new MissingConfigException(
-                'No config key of "type" found in adaptor config array.'
-            );
-        }
-    }
-
-    public function getType()
-    {
-        return $this->config['type'];
-    }
-
-    public function getOptions()
-    {
-        return $this->config['options'] ?? [];
-    }
 }
diff --git a/src/Config/CacheConfig.php b/src/Config/CacheConfig.php
@@ -3,40 +3,6 @@
 
 namespace WShafer\PSR11FlySystem\Config;
 
-use WShafer\PSR11FlySystem\Exception\MissingConfigException;
-
-class CacheConfig
+class CacheConfig extends ConfigurationAbstract
 {
-    protected $config = [];
-
-    public function __construct(array $config)
-    {
-        $this->validateConfig($config);
-        $this->config = $config;
-    }
-
-    protected function validateConfig($config)
-    {
-        if (empty($config)) {
-            throw new MissingConfigException(
-                'No config found'
-            );
-        }
-
-        if (empty($config['type'])) {
-            throw new MissingConfigException(
-                'No config key of "type" found in cache config array.'
-            );
-        }
-    }
-
-    public function getType()
-    {
-        return $this->config['type'];
-    }
-
-    public function getOptions()
-    {
-        return $this->config['options'] ?? [];
-    }
 }
diff --git a/src/Config/ConfigurationAbstract.php b/src/Config/ConfigurationAbstract.php
@@ -0,0 +1,42 @@
+<?php
+declare(strict_types=1);
+
+namespace WShafer\PSR11FlySystem\Config;
+
+use WShafer\PSR11FlySystem\Exception\MissingConfigException;
+
+abstract class ConfigurationAbstract
+{
+    protected $config = [];
+
+    public function __construct(array $config)
+    {
+        $this->validateConfig($config);
+        $this->config = $config;
+    }
+
+    protected function validateConfig($config)
+    {
+        if (empty($config)) {
+            throw new MissingConfigException(
+                'No config found'
+            );
+        }
+
+        if (empty($config['type'])) {
+            throw new MissingConfigException(
+                'No config key of "type" found in adaptor config array.'
+            );
+        }
+    }
+
+    public function getType()
+    {
+        return $this->config['type'];
+    }
+
+    public function getOptions()
+    {
+        return $this->config['options'] ?? [];
+    }
+}
diff --git a/src/Config/FileSystemConfig.php b/src/Config/FileSystemConfig.php
@@ -51,7 +51,7 @@ public function validateConfig($config)
     /**
      * Get the adaptor
      *
-     * @return AdaptorConfig
+     * @return string
      */
     public function getAdaptor()
     {
@@ -61,7 +61,7 @@ public function getAdaptor()
     /**
      * Get the cache
      *
-     * @return CacheConfig|string
+     * @return string
      */
     public function getCache()
     {

diff --git a/src/Service/CacheManager.php b/src/Service/CacheManager.php
@@ -11,7 +11,8 @@
 
 class CacheManager implements ContainerInterface
 {
-    protected $config = [];
+    /** @var MainConfig */
+    protected $config;
 
     /** @var MapperInterface */
     protected $cacheMapper;