Increased coverage and finished implementing imports/default node handling

Author: Marc Aschmann

Config/AbstractConfig.php

@@ -77,7 +77,10 @@ public function readConfig($file)
         $config = $this->extractDefault($config);
         $this->mergeDefault();
 
-        return $config;
+        return array_replace_recursive(
+            $this->default,
+            $config
+        );
     }
 
     /**
@@ -128,10 +131,10 @@ private function extractImports(array $config)
                         $this->imports,
                         $this->readFile($import['resource'])
                     );
-
-                    unset($config['resource'][$key]);
                 }
             }
+
+            unset($config['imports']);
         }
 
         return $config;

Tests/Config/ConfigDefaultTest.php

@@ -22,15 +22,14 @@
 class ConfigDefaultTest extends BaseConfigTest
 {
     /**
-     * @covers \Asm\Config\ConfigAbstract::readConfig
-     * @covers \Asm\Config\ConfigAbstract::setConfig
+     * @covers \Asm\Config\AbstractConfig::readConfig
+     * @covers \Asm\Config\AbstractConfig::setConfig
      */
     public function testFactory()
     {
         $config = Config::factory(
             [
                 'file' => $this->getTestYaml(),
-                'filecheck' => false,
             ],
             'ConfigDefault'
         );
@@ -44,7 +43,7 @@ public function testFactory()
      * @depends testFactory
      * @param ConfigDefault $config
      */
-    /*public function testImport($config)
+    public function testImport(ConfigDefault $config)
     {
         $this->assertEquals(
             [
@@ -53,5 +52,5 @@ public function testFactory()
             ],
             $config->get('testkey_5')
         );
-    }*/
+    }
 }

Tests/Config/ConfigEnvTest.php

@@ -28,6 +28,26 @@ class ConfigEnvTest extends BaseConfigTest
      * @return \Asm\Config\ConfigInterface
      */
     public function testFactoryProd()
+    {
+        // merged environments config
+        $config = Config::factory(
+            [
+                'file' => $this->getTestYaml(),
+            ],
+            'ConfigEnv'
+        );
+
+        $this->assertInstanceOf('Asm\Config\ConfigEnv', $config);
+
+        return $config;
+    }
+
+    /**
+     * @covers \Asm\Config\ConfigEnv::mergeEnvironments
+     * @covers \Asm\Config\ConfigEnv::__construct
+     * @return \Asm\Config\ConfigInterface
+     */
+    public function testFactoryProdWithoutFilecheck()
     {
         // merged environments config
         $config = Config::factory(
@@ -52,8 +72,7 @@ public function testFactoryEnv()
     {
         $config = Config::factory(
             [
-                'file' => TestData::getYamlConfigFile(),
-                'filecheck' => false,
+                'file' => $this->getTestYaml(),
                 'defaultEnv' => 'prod',
                 'env' => 'dev',
             ],
@@ -73,4 +92,32 @@ public function testConfigMerge(ConfigEnv $config)
     {
         $this->assertEquals(25, $config->get('testkey_2', 0));
     }
+
+
+    /**
+     * @depends testFactoryEnv
+     * @param ConfigEnv $config
+     */
+    public function testConfigInclude(ConfigEnv $config)
+    {
+        $this->assertEquals(
+            [
+                'default' => 'yaddayadda',
+                'my_test' => 'is testing hard'
+            ],
+            $config->get('testkey_5')
+        );
+    }
+
+    /**
+     * @depends testFactoryEnv
+     * @param ConfigEnv $config
+     */
+    public function testConfigDefaultNode(ConfigEnv $config)
+    {
+        $this->assertEquals(
+            'default test',
+            $config->get('testkey_4')
+        );
+    }
 }

Tests/Config/ConfigTimerTest.php

@@ -25,6 +25,7 @@ class ConfigTimerTest extends BaseConfigTest
      * @covers \Asm\Config\ConfigTimer::handleTimers
      * @covers \Asm\Config\ConfigTimer::handleHolidays
      * @covers \Asm\Config\ConfigTimer::handleGeneralHolidays
+     * @covers \Asm\Test\BaseConfigTest::getTimerYaml
      * @return ConfigTimer $config
      * @throws \ErrorException
      */
@@ -33,7 +34,6 @@ public function testFactory()
         $config = Config::factory(
             [
                 'file' => $this->getTimerYaml(),
-                'filecheck' => false,
             ],
             'ConfigTimer'
         );

Tests/Timer/TimerTest.php

@@ -75,6 +75,7 @@ public function testIsTimerActive(Timer $timer)
      * @covers  \Asm\Timer\Timer::isHoliday
      * @covers  \Asm\Timer\Timer::getHoliday
      * @covers  \Asm\Timer\Timer::checkHoliday
+     * @covers  \Asm\Timer\Timer::convertDate
      * @param Timer $timer
      */
     public function testIsHoliday(Timer $timer)

phpunit.xml.dist

@@ -23,6 +23,7 @@
             <exclude>
                 <directory>./Tests</directory>
                 <directory>./vendor</directory>
+                <file>./example.php</file>
             </exclude>
         </whitelist>
     </filter>