Create an interface for Config component #6

tonik · Jul 24, 2017 · 8b651ee · 8b651ee
1 parent 1f45315
commit 8b651ee
Show file tree

Hide file tree

Showing 6 changed files with 61 additions and 20 deletions.
diff --git a/src/Gin/Asset/Asset.php b/src/Gin/Asset/Asset.php
@@ -2,16 +2,15 @@
 
 namespace Tonik\Gin\Asset;
 
-use Tonik\Gin\Foundation\Config;
+use Tonik\Gin\Contract\ConfigInterface;
 use Tonik\Gin\Foundation\Exception\FileNotFoundException;
-use Tonik\Gin\Foundation\Theme;
 
 class Asset
 {
     /**
      * Theme config instance.
      *
-     * @var \Tonik\Gin\Foundation\Config
+     * @var \Tonik\Gin\Foundation\ConfigInterface
      */
     protected $config;
 
@@ -25,9 +24,9 @@ class Asset
     /**
      * Construct asset.
      *
-     * @param \Tonik\Gin\Foundation\Config $config
+     * @param \Tonik\Gin\Foundation\ConfigInterface $config
      */
-    public function __construct(Config $config)
+    public function __construct(ConfigInterface $config)
     {
         $this->config = $config;
     }

diff --git a/src/Gin/Contract/ConfigInterface.php b/src/Gin/Contract/ConfigInterface.php
@@ -0,0 +1,42 @@
+<?php
+
+namespace Tonik\Gin\Contract;
+
+interface ConfigInterface
+{
+    /**
+     * Get all of the configuration items for the application.
+     *
+     * @return array
+     */
+    public function all();
+
+    /**
+     * Get the specified configuration value.
+     *
+     * @param  string  $key
+     * @param  mixed   $default
+     *
+     * @return mixed
+     */
+    public function get($key, $default);
+
+    /**
+     * Set a given configuration value.
+     *
+     * @param  array|string  $key
+     * @param  mixed   $value
+     *
+     * @return void
+     */
+    public function set($key, $value);
+
+    /**
+     * Determine if the given configuration value exists.
+     *
+     * @param  string  $key
+     *
+     * @return bool
+     */
+    public function has($key);
+}
diff --git a/src/Gin/Foundation/Autoloader.php b/src/Gin/Foundation/Autoloader.php
@@ -2,24 +2,24 @@
 
 namespace Tonik\Gin\Foundation;
 
+use Tonik\Gin\Contract\ConfigInterface;
 use Tonik\Gin\Foundation\Exception\FileNotFoundException;
-use Tonik\Gin\Foundation\Theme;
 
 class Autoloader
 {
     /**
      * Theme config instance.
      *
-     * @var array
+     * @var \Tonik\Gin\Contract\ConfigInterface
      */
     protected $config;
 
     /**
      * Construct autoloader.
      *
-     * @param \Tonik\Gin\Foundation\Theme $theme
+     * @param \Tonik\Gin\Contract\ConfigInterface $config
      */
-    public function __construct($config)
+    public function __construct(ConfigInterface $config)
     {
         $this->config = $config;
     }

diff --git a/src/Gin/Foundation/Config.php b/src/Gin/Foundation/Config.php
@@ -3,8 +3,9 @@
 namespace Tonik\Gin\Foundation;
 
 use ArrayAccess;
+use Tonik\Gin\Contract\ConfigInterface;
 
-class Config implements ArrayAccess
+class Config implements ConfigInterface, ArrayAccess
 {
     /**
      * All of the configuration items.

diff --git a/src/Gin/Foundation/Theme.php b/src/Gin/Foundation/Theme.php
@@ -2,8 +2,8 @@
 
 namespace Tonik\Gin\Foundation;
 
-use Closure;
 use ArrayAccess;
+use Closure;
 use Tonik\Gin\Foundation\Exception\BindingResolutionException;
 
 class Theme extends Singleton implements ArrayAccess
@@ -92,7 +92,7 @@ public function get($key, array $parameters = [])
         if (isset($this->services[$key])) {
             // Resolve service jf we don't have
             // a deposit for this service.
-            if (! isset($this->deposit[$key])) {
+            if ( ! isset($this->deposit[$key])) {
                 $this->deposit[$key] = $this->resolve($this->services[$key], $parameters);
             }
 
@@ -148,7 +148,7 @@ public function offsetGet($key)
      */
     public function offsetSet($key, $service)
     {
-        if (! is_callable($service)) {
+        if ( ! is_callable($service)) {
             throw new BindingResolutionException("Service definition [{$service}] is not an instance of Closure");
         }
 

diff --git a/src/Gin/Template/Template.php b/src/Gin/Template/Template.php
@@ -2,16 +2,15 @@
 
 namespace Tonik\Gin\Template;
 
-use Tonik\Gin\Foundation\Config;
+use Tonik\Gin\Contract\ConfigInterface;
 use Tonik\Gin\Foundation\Exception\FileNotFoundException;
-use Tonik\Gin\Foundation\Theme;
 
 class Template
 {
     /**
      * Theme config instance.
      *
-     * @var array
+     * @var \Tonik\Gin\Contract\ConfigInterface
      */
     protected $config;
 
@@ -25,9 +24,9 @@ class Template
     /**
      * Construct template.
      *
-     * @param \Tonik\Gin\Foundation\Config $config
+     * @param \Tonik\Gin\Contract\ConfigInterface $config
      */
-    public function __construct(Config $config)
+    public function __construct(ConfigInterface $config)
     {
         $this->config = $config;
     }
@@ -149,13 +148,13 @@ public function isNamed()
     {
         // If file is not array, then template
         // is not named for sure.
-        if (! is_array($this->file)) {
+        if ( ! is_array($this->file)) {
             return false;
         }
 
         // Return false if template is named,
         // but name is bool or null.
-        if (isset($this->file[1]) && is_bool($this->file[1]) || is_null($this->file[1])) {
+        if (isset($this->file[1]) && is_bool($this->file[1]) || null === $this->file[1]) {
             return false;
         }