优化route

Author: wpjscc

composer.json

@@ -5,7 +5,8 @@
     "require": {
         "react/event-loop": "^1.0",
         "react/async": "^4.3",
-        "reactphp-x/framework-x": "^0.16.1"
+        "clue/framework-x": "^0.16",
+        "reactphp-x/route": "^1.0"
     },
     "license": "MIT",
     "authors": [

src/Facades/Route.php

@@ -23,6 +23,6 @@ class Route extends Facade
 {
     protected static function getFacadeAccessor()
     {
-        return 'reactphp.server';
+        return 'reactphp.route';
     }
 }

src/Providers/ServerServiceProvider.php

@@ -18,6 +18,7 @@ public function register()
     {
         $this->mergeConfigs();
         $this->registerLoop();
+        $this->registerRoute();
         $this->registerServer();
         $this->registerManager();
         $this->registerCommands();
@@ -50,10 +51,16 @@ protected function registerLoop()
         $this->app->alias('React\EventLoop\LoopInterface', 'reactphp.loop');
     }
 
+    protected function registerRoute()
+    {
+        $this->app->singleton('reactphp.route', function ($app) {
+            return new \ReactphpX\Route\Route($app);
+        });
+    }
     protected function registerServer()
     {
         $this->app->singleton('reactphp.server', function ($app) {
-            return new App(new \FrameworkX\Container($app), ...(array_filter($app['config']->get('reactphp.middlewares', []))));
+            return new App(...(array_filter($app['config']->get('reactphp.middlewares', []))), $app->get('reactphp.route'));
         });
     }