Merge 5dbdeb0 into 6093c6d

rorteg · Mar 12, 2019 · dd5d6e4 · dd5d6e4
2 parents 6093c6d + 5dbdeb0
commit dd5d6e4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/app/code/Shelf/Framework/App/Http.php b/app/code/Shelf/Framework/App/Http.php
@@ -35,14 +35,12 @@ class Http implements AppInterface
 
     /**
      * Http constructor.
-     * @param $routeConfig
      * @param ServiceManager $serviceManager
      */
     public function __construct(
-        ServiceManager $serviceManager,
-        $routeConfig
+        ServiceManager $serviceManager
     ) {
-        $this->routeConfig = $routeConfig;
+        $this->routeConfig = $serviceManager->get('config')['routes'];
         $this->serviceManager = $serviceManager;
 
         /** @var ApplicationStrategy $strategy */

diff --git a/pub/index.php b/pub/index.php
@@ -19,5 +19,5 @@
 }
 
 $bootstrap = \Shelf\Framework\App\Bootstrap::create($serviceManager, BP);
-$application = $bootstrap->createApplication(Http::class, $bootstrap->getRoutes());
+$application = $bootstrap->createApplication(Http::class);
 $bootstrap->run($application);