Bind default accessors in Container

kokororin · Sep 23, 2017 · 4f628a3 · 4f628a3
1 parent 859d665
commit 4f628a3
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 11 deletions.
diff --git a/src/App.php b/src/App.php
@@ -66,17 +66,6 @@ public function __construct($config = [])
         if (!empty($config)) {
             $this->config = $config;
         }
-
-        Container::getInstance()->bind([
-            'cache' => \Kotori\Core\Cache::class,
-            'config' => \Kotori\Core\Config::class,
-            'controller' => \Kotori\Core\Controller::class,
-            'request' => \Kotori\Http\Request::class,
-            'response' => \Kotori\Http\Response::class,
-            'route' => \Kotori\Http\Route::class,
-            'trace' => \Kotori\Debug\Trace::class,
-            'model/provider' => \Kotori\Core\Model\Provider::class,
-        ]);
     }
 
     /**

diff --git a/src/Core/Container.php b/src/Core/Container.php
@@ -26,6 +26,27 @@ class Container
      */
     protected static $instance;
 
+    /**
+     * Class constructor
+     *
+     * Bind default accessors
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        $this->bind([
+            'cache' => \Kotori\Core\Cache::class,
+            'config' => \Kotori\Core\Config::class,
+            'controller' => \Kotori\Core\Controller::class,
+            'request' => \Kotori\Http\Request::class,
+            'response' => \Kotori\Http\Response::class,
+            'route' => \Kotori\Http\Route::class,
+            'trace' => \Kotori\Debug\Trace::class,
+            'model/provider' => \Kotori\Core\Model\Provider::class,
+        ]);
+    }
+
     /**
      * Get singleton
      *