fixed config

src/ServiceProvider/CacheServiceProvider.php

@@ -49,8 +49,6 @@ public function register(Container $container)
             return $this->cache;
         });
 
-        config()->merge($config);
-
         unset($config);
     }
 }

src/ServiceProvider/ConfigServiceProvider.php

@@ -25,6 +25,10 @@ class ConfigServiceProvider implements ServiceProviderInterface
      */
     public function register(Container $container)
     {
-        $container->add('config', new Config($container->get('config')));
+        $config = new Config($container->get('config'));
+
+        $config->load(app()->getAppPath() . '/config/config.php');
+
+        $container->add('config', $config);
     }
 }

tests/ApplicationTest.php

@@ -60,6 +60,7 @@ public function testConfigurationServiceProvider()
         $app = $this->createApplication();
 
         $this->assertEquals('fast-d', $app->get('config')->get('name'));
+        $this->assertEquals('bar', config()->get('foo'));
     }
 
     public function testLoggerServiceProvider()

tests/config/app.php

@@ -61,11 +61,6 @@
         ])
     ],
 
-    /**
-     * User custom configure
-     */
-    'config' => include __DIR__ . '/config.php',
-
     /**
      * Database config
      */

tests/config/config.php

@@ -8,5 +8,5 @@
  */
 
 return [
-
+    'foo' => 'bar'
 ];