Config::has should check for key presence

src/AbstractConfig.php

@@ -35,7 +35,7 @@ abstract class AbstractConfig implements ArrayAccess, ConfigInterface, Iterator
      *
      * @param array $data
      */
-    public function __construct(Array $data)
+    public function __construct(array $data)
     {
         $this->data = array_merge($this->getDefaults(), $data);
     }
@@ -62,27 +62,11 @@ protected function getDefaults()
      */
     public function get($key, $default = null)
     {
-        // Check if already cached
-        if (isset($this->cache[$key])) {
+        if ($this->has($key)) {
             return $this->cache[$key];
         }
 
-        $segs = explode('.', $key);
-        $root = $this->data;
-
-        // nested case
-        foreach ($segs as $part) {
-            if (isset($root[$part])) {
-                $root = $root[$part];
-                continue;
-            } else {
-                $root = $default;
-                break;
-            }
-        }
-
-        // whatever we have is what we needed
-        return ($this->cache[$key] = $root);
+        return $default;
     }
 
     /**
@@ -96,7 +80,7 @@ public function set($key, $value)
 
         // Look for the key, creating nested keys if needed
         while ($part = array_shift($segs)) {
-            if($cacheKey != ''){
+            if ($cacheKey != '') {
                 $cacheKey .= '.';
             }
             $cacheKey .= $part;
@@ -106,14 +90,14 @@ public function set($key, $value)
             $root = &$root[$part];
 
             //Unset all old nested cache
-            if(isset($this->cache[$cacheKey])){
+            if (isset($this->cache[$cacheKey])) {
                 unset($this->cache[$cacheKey]);
             }
 
             //Unset all old nested cache in case of array
-            if(count($segs) == 0){
+            if (count($segs) == 0) {
                 foreach ($this->cache as $cacheLocalKey => $cacheValue) {
-                    if(substr($cacheLocalKey, 0, strlen($cacheKey)) === $cacheKey){
+                    if (substr($cacheLocalKey, 0, strlen($cacheKey)) === $cacheKey) {
                         unset($this->cache[$cacheLocalKey]);
                     }
                 }
@@ -129,7 +113,28 @@ public function set($key, $value)
      */
     public function has($key)
     {
-        return !is_null($this->get($key));
+        // Check if already cached
+        if (isset($this->cache[$key])) {
+            return true;
+        }
+
+        $segments = explode('.', $key);
+        $root = $this->data;
+
+        // nested case
+        foreach ($segments as $segment) {
+            if (array_key_exists($segment, $root)) {
+                $root = $root[$segment];
+                continue;
+            } else {
+                return false;
+            }
+        }
+
+        // Set cache for the given key
+        $this->cache[$key] = $root;
+
+        return true;
     }
 
     /**
@@ -140,8 +145,6 @@ public function all()
         return $this->data;
     }
 
-
-
     /**
      * ArrayAccess Methods
      */

src/Config.php

@@ -58,7 +58,11 @@ public function __construct($path)
 
             // Get file information
             $info      = pathinfo($path);
-            $extension = isset($info['extension']) ? $info['extension'] : '';
+            $parts = explode('.', $info['basename']);
+            $extension = array_pop($parts);
+            if ($extension === 'dist') {
+                $extension = array_pop($parts);
+            }
             $parser    = $this->getParser($extension);
 
             // Try and load file

src/ConfigInterface.php

@@ -52,5 +52,4 @@ public function has($key);
      * @return array
      */
     public function all();
-
 }

src/ErrorException.php

@@ -0,0 +1,7 @@
+<?php
+
+namespace Noodlehaus;
+
+class ErrorException extends \ErrorException
+{
+}

src/Exception.php

@@ -0,0 +1,7 @@
+<?php
+
+namespace Noodlehaus;
+
+class Exception extends \Exception
+{
+}

src/Exception/EmptyDirectoryException.php

@@ -2,7 +2,7 @@
 
 namespace Noodlehaus\Exception;
 
-use Exception;
+use Noodlehaus\Exception;
 
 class EmptyDirectoryException extends Exception
 {

src/Exception/FileNotFoundException.php

@@ -2,7 +2,7 @@
 
 namespace Noodlehaus\Exception;
 
-use Exception;
+use Noodlehaus\Exception;
 
 class FileNotFoundException extends Exception
 {

src/Exception/ParseException.php

@@ -2,7 +2,7 @@
 
 namespace Noodlehaus\Exception;
 
-use ErrorException;
+use Noodlehaus\ErrorException;
 
 class ParseException extends ErrorException
 {

src/Exception/UnsupportedFormatException.php

@@ -2,7 +2,7 @@
 
 namespace Noodlehaus\Exception;
 
-use Exception;
+use Noodlehaus\Exception;
 
 class UnsupportedFormatException extends Exception
 {

src/FileParser/Json.php

@@ -25,13 +25,12 @@ public function parse($path)
     {
         $data = json_decode(file_get_contents($path), true);
 
-        if (function_exists('json_last_error_msg')) {
-            $error_message = json_last_error_msg();
-        } else {
+        if (json_last_error() !== JSON_ERROR_NONE) {
             $error_message  = 'Syntax error';
-        }
+            if (function_exists('json_last_error_msg')) {
+                $error_message = json_last_error_msg();
+            }
 
-        if (json_last_error() !== JSON_ERROR_NONE) {
             $error = array(
                 'message' => $error_message,
                 'type'    => json_last_error(),

tests/AbstractConfigTest.php

@@ -30,8 +30,10 @@ protected function setUp()
                 ),
                 'application' => array(
                     'name'   => 'configuration',
-                    'secret' => 's3cr3t'
-                )
+                    'secret' => 's3cr3t',
+                    'runtime' => null,
+                ),
+                'user' => null,
             )
         );
     }
@@ -115,7 +117,7 @@ public function testGetReturnsArray()
     {
         $this->assertArrayHasKey('name', $this->config->get('application'));
         $this->assertEquals('configuration', $this->config->get('application.name'));
-        $this->assertCount(2, $this->config->get('application'));
+        $this->assertCount(3, $this->config->get('application'));
     }
 
     /**
@@ -238,6 +240,7 @@ public function testSetAndUnsetArray()
     public function testHas()
     {
         $this->assertTrue($this->config->has('application'));
+        $this->assertTrue($this->config->has('user'));
         $this->assertFalse($this->config->has('not_exist'));
     }
 
@@ -247,6 +250,7 @@ public function testHas()
     public function testHasNestedKey()
     {
         $this->assertTrue($this->config->has('application.name'));
+        $this->assertTrue($this->config->has('application.runtime'));
         $this->assertFalse($this->config->has('application.not_exist'));
         $this->assertFalse($this->config->has('not_exist.name'));
     }
@@ -266,8 +270,10 @@ public function testAll()
             ),
             'application' => array(
                 'name'   => 'configuration',
-                'secret' => 's3cr3t'
-            )
+                'secret' => 's3cr3t',
+                'runtime' => null,
+            ),
+            'user' => null,
         );
         $this->assertEquals($all, $this->config->all());
     }
@@ -338,6 +344,8 @@ public function testCurrent()
         $this->assertEquals($this->config['servers'], $this->config->current());
         $this->config->next();
         $this->assertEquals($this->config['application'], $this->config->current());
+        $this->config->next();
+        $this->assertEquals($this->config['user'], $this->config->current());
 
         /* Step beyond the end and confirm the result */
         $this->config->next();
@@ -360,6 +368,8 @@ public function testKey()
         $this->assertEquals('servers', $this->config->key());
         $this->config->next();
         $this->assertEquals('application', $this->config->key());
+        $this->config->next();
+        $this->assertEquals('user', $this->config->key());
 
         /* Step beyond the end and confirm the result */
         $this->config->next();
@@ -378,6 +388,7 @@ public function testNext()
         $this->assertEquals($this->config['port'], $this->config->next());
         $this->assertEquals($this->config['servers'], $this->config->next());
         $this->assertEquals($this->config['application'], $this->config->next());
+        $this->assertEquals($this->config['user'], $this->config->next());
 
         /* Step beyond the end and confirm the result */
         $this->assertFalse($this->config->next());
@@ -413,6 +424,8 @@ public function testValid()
         $this->assertTrue($this->config->valid());
         $this->config->next();
         $this->assertTrue($this->config->valid());
+        $this->config->next();
+        $this->assertTrue($this->config->valid());
 
         /* Step beyond the end and confirm the result */
         $this->config->next();
@@ -426,23 +439,32 @@ public function testValid()
     public function testIterator()
     {
         /* Create numerically indexed copies of the test config */
-        $expectedKeys = array('host', 'port', 'servers', 'application');
+        $expectedKeys = array('host', 'port', 'servers', 'application', 'user');
         $expectedValues = array(
             'localhost',
             80,
             array('host1', 'host2', 'host3'),
             array(
                 'name'   => 'configuration',
-                'secret' => 's3cr3t'
-            )
+                'secret' => 's3cr3t',
+                'runtime' => null,
+            ),
+            null
         );
 
         $idxConfig = 0;
 
         foreach ($this->config as $configKey => $configValue) {
-            $this->assertEquals($expectedKeys [$idxConfig], $configKey);
-            $this->assertEquals($expectedValues [$idxConfig], $configValue);
+            $this->assertEquals($expectedKeys[$idxConfig], $configKey);
+            $this->assertEquals($expectedValues[$idxConfig], $configValue);
             $idxConfig++;
         }
     }
+
+    public function testGetShouldNotSet()
+    {
+        $this->config->get('invalid', 'default');
+        $actual = $this->config->get('invalid', 'expected');
+        $this->assertSame('expected', $actual);
+    }
 }

tests/ConfigTest.php

@@ -175,7 +175,23 @@ public function testConstructWithYml()
 
         $this->assertEquals($expected, $actual);
     }
-
+
+    /**
+     * @covers Noodlehaus\Config::__construct()
+     * @covers Noodlehaus\Config::getParser()
+     * @covers Noodlehaus\Config::getPathFromArray()
+     * @covers Noodlehaus\Config::getValidPath()
+     */
+    public function testConstructWithYmlDist()
+    {
+        $config = new Config(__DIR__ . '/mocks/pass/config.yml.dist');
+
+        $expected = 'localhost';
+        $actual   = $config->get('host');
+
+        $this->assertEquals($expected, $actual);
+    }
+
     /**
      * @covers Noodlehaus\Config::__construct()
      * @covers Noodlehaus\Config::getParser()

tests/mocks/pass/config.yml.dist

@@ -0,0 +1,9 @@
+application:
+    name: configuration
+    secret: s3cr3t
+host: localhost
+port: 80
+servers:
+- host1
+- host2
+- host3