fixed compoer require

Author: JanHuang

Diff for: helpers.php

@@ -10,17 +10,18 @@
 
 /**
  * @param $file
+ *
  * @return array
  */
 function load($file)
 {
     $extension = pathinfo($file, PATHINFO_EXTENSION);
 
     switch ($extension) {
-        case "ini":
-            $config = parse_ini_file($file, true);;
+        case 'ini':
+            $config = parse_ini_file($file, true);
             break;
-        case "yml":
+        case 'yml':
             $config = Yaml::parse(file_get_contents($file));
             break;
         case 'json':
@@ -32,4 +33,4 @@ function load($file)
     }
 
     return $config;
-}
+}

Diff for: src/Config.php

@@ -9,13 +9,10 @@
 
 namespace FastD\Config;
 
-
 use FastD\Utils\ArrayObject;
 
 /**
- * Class Config
- *
- * @package FastD\Config
+ * Class Config.
  */
 class Config extends ArrayObject
 {
@@ -28,6 +25,7 @@ class Config extends ArrayObject
 
     /**
      * Config constructor.
+     *
      * @param $config
      * @param array $variables
      */
@@ -40,6 +38,7 @@ public function __construct(array $config = [], array $variables = [])
 
     /**
      * @param $file
+     *
      * @return $this
      */
     public function load($file)
@@ -53,12 +52,14 @@ public function load($file)
 
     /**
      * @param $value
+     *
      * @return string
      */
     protected function replace($value)
     {
         if ('env' === substr($value, 0, 3)) {
             $env = substr($value, 4);
+
             return env($env);
         }
 
@@ -71,29 +72,68 @@ protected function replace($value)
 
     /**
      * @param $key
-     * @param null $default
-     * @return mixed|null|string
+     * @param $default
+     *
+     * @return mixed
      */
     public function get($key, $default = null)
     {
         try {
             $value = $this->find($key);
+
             return is_string($value) ? $this->replace($value) : $value;
         } catch (\Exception $exception) {
             return $default;
         }
     }
 
+    public function has($key)
+    {
+        try {
+            $this->find($key);
+        } catch (\Exception $exception) {
+            return false;
+        }
+
+        return true;
+    }
+
+    public function set($key, $value)
+    {
+        if ($this->offsetExists($key)) {
+            return parent::set($key, $value);
+        }
+        $keys = explode('.', $key);
+        $firstDimension = array_shift($keys);
+
+        $data = [];
+        if ($this->offsetExists($firstDimension)) {
+            $data = $this->offsetGet($firstDimension);
+            ! is_array($data) && $data = [$data];
+        }
+
+        $target = &$data;
+
+        foreach ($keys as $key) {
+            $target = &$target[$key];
+        }
+        $target = $value;
+
+        return parent::set($firstDimension, $data);
+    }
+
     /**
      * @param $variable
+     *
      * @return string
      */
     protected function variable($variable)
     {
         return preg_replace_callback(sprintf('/%s(\w*\.*\w*)%s/', static::GLUE, static::GLUE), function ($match) {
-            if (!$this->has($match[1])) {
+            if ( ! $this->has($match[1])) {
                 throw new \Exception($match[1]);
             }
+
             return $this->variables[$match[1]];
         }, $variable);
     }
@@ -103,6 +143,6 @@ protected function variable($variable)
      */
     public function all()
     {
-        return (array) $this;
+        return (array)$this;
     }
-}
+}

Diff for: tests/ConfigTest.php

@@ -6,7 +6,6 @@
  * @link      https://www.github.com/janhuang
  * @link      http://www.fast-d.cn/
  */
-
 use FastD\Config\Config;
 
 class ConfigTest extends PHPUnit_Framework_TestCase
@@ -19,23 +18,59 @@ class ConfigTest extends PHPUnit_Framework_TestCase
     public function setUp()
     {
         $this->config = new Config([], [
-            'name' => 'bar'
+            'name' => 'bar',
         ]);
     }
 
     public function testLoad()
     {
-        $this->config->load(__DIR__ . '/config/config.yml');
+        $this->config->load(__DIR__.'/config/config.yml');
 
         $this->assertEquals('yml', $this->config->find('foo'));
         $this->assertEquals([
-            'foo' => 'yml'
+            'foo' => 'yml',
         ], $this->config->all());
     }
 
     public function testVariable()
     {
-        $this->config->load(__DIR__ . '/config/variable.yml');
+        $this->config->load(__DIR__.'/config/variable.yml');
         $this->assertEquals('bar', $this->config->get('name'));
     }
+
+    public function testSetConfig()
+    {
+        $this->config->set('a', 'hello');
+        $this->config->set('a.b.c', 'world');
+        $this->assertEquals([
+            'a' => [
+                'hello',
+                'b' => [
+                    'c' => 'world',
+                ],
+            ],
+        ], $this->config->all());
+        $this->config->set('a.b', 'world');
+        $this->assertEquals([
+            'a' => [
+                'hello',
+                'b' => 'world',
+            ],
+        ], $this->config->all());
+    }
+
+    public function testHasConfig()
+    {
+        $this->config->set('a', [
+            'b' => [
+                'c' => 'hello world',
+            ],
+        ]);
+        $this->assertSame(true, $this->config->has('a'));
+        $this->assertSame(true, $this->config->has('a.b'));
+        $this->assertSame(true, $this->config->has('a.b.c'));
+        $this->assertSame(false, $this->config->has('a.b.cd'));
+        $this->assertSame(false, $this->config->has('b'));
+        $this->assertSame(false, $this->config->has('b.c'));
+    }
 }

Diff for: tests/HelperTest.php

@@ -11,7 +11,7 @@ class HelperTest extends PHPUnit_Framework_TestCase
 {
     public function testLoad()
     {
-        $this->assertEquals(load(__DIR__ . '/config/config.ini'), ['foo' => 'bar']);
-        $this->assertEquals(load(__DIR__ . '/config/config.yml'), ['foo' => 'yml']);
+        $this->assertEquals(load(__DIR__.'/config/config.ini'), ['foo' => 'bar']);
+        $this->assertEquals(load(__DIR__.'/config/config.yml'), ['foo' => 'yml']);
     }
 }