修复服务注入问题

lawoole · Feb 9, 2018 · 5e75bcb · 5e75bcb
1 parent cabb076
commit 5e75bcb
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 8 deletions.
diff --git a/src/Server/ServerExceptionHandler.php b/src/Server/ServerExceptionHandler.php
@@ -3,8 +3,8 @@
 
 use Exception;
 use Illuminate\Contracts\Debug\ExceptionHandler;
+use Lawoole\Application;
 use Lawoole\Console\OutputStyle;
-use Lawoole\Contracts\Foundation\ApplicationInterface;
 use Lawoole\Swoole\Exception\ExceptionHandlerInterface;
 use Symfony\Component\Debug\Exception\FatalThrowableError;
 use Throwable;
@@ -14,7 +14,7 @@ class ServerExceptionHandler implements ExceptionHandlerInterface
     /**
      * 服务容器
      *
-     * @var \Lawoole\Contracts\Foundation\ApplicationInterface
+     * @var \Lawoole\Application
      */
     protected $app;
 
@@ -28,10 +28,10 @@ class ServerExceptionHandler implements ExceptionHandlerInterface
     /**
      * 创建异常处理器
      *
-     * @param \Lawoole\Contracts\Foundation\ApplicationInterface $app
+     * @param \Lawoole\Application $app
      * @param \Lawoole\Console\OutputStyle $outputStyle
      */
-    public function __construct(ApplicationInterface $app, OutputStyle $outputStyle)
+    public function __construct(Application $app, OutputStyle $outputStyle)
     {
         $this->app = $app;
         $this->outputStyle = $outputStyle;

diff --git a/src/Server/ServerHandler.php b/src/Server/ServerHandler.php
@@ -4,6 +4,7 @@
 use Exception;
 use Illuminate\Contracts\Debug\ExceptionHandler;
 use Illuminate\Support\Facades\Log;
+use Lawoole\Application;
 use Lawoole\Console\OutputStyle;
 use Lawoole\Swoole\Handlers\ServerHandlerInterface;
 use Lawoole\Swoole\Handlers\ServerSocketBufferHandlerInterface;
@@ -34,7 +35,7 @@ class ServerHandler implements ServerHandlerInterface, ServerSocketBufferHandler
      * @param \Lawoole\Application $app
      * @param \Lawoole\Console\OutputStyle $outputStyle
      */
-    public function __construct($app, OutputStyle $outputStyle)
+    public function __construct(Application $app, OutputStyle $outputStyle)
     {
         $this->app = $app;
         $this->outputStyle = $outputStyle;

diff --git a/src/Server/ServerManager.php b/src/Server/ServerManager.php
@@ -18,7 +18,7 @@ class ServerManager
     /**
      * 服务容器
      *
-     * @var \Lawoole\Contracts\Foundation\ApplicationInterface
+     * @var \Lawoole\Application
      */
     protected $app;
 
@@ -36,10 +36,17 @@ class ServerManager
      */
     protected $server;
 
+    /**
+     * 样式输出
+     *
+     * @var \Lawoole\Console\OutputStyle
+     */
+    protected $outputStyle;
+
     /**
      * 创建 Swoole 服务管理器
      *
-     * @param \Lawoole\Contracts\Foundation\ApplicationInterface $app
+     * @param \Lawoole\Application $app
      */
     public function __construct($app)
     {
@@ -71,8 +78,10 @@ public function prepare(InputInterface $input, OutputInterface $output)
         $this->prepared = true;
 
         if (!$this->app->bound(OutputStyle::class)) {
+            $this->outputStyle = new OutputStyle($input, $output);
+
             // 共享一个统一的输出
-            $this->app->instance(OutputStyle::class, new OutputStyle($input, $output));
+            $this->app->instance(OutputStyle::class, $this->outputStyle);
         }
 
         $config = $this->app->make('config')->get('server', []);
@@ -92,10 +101,12 @@ public function prepare(InputInterface $input, OutputInterface $output)
      */
     protected function configureServer($server, array $config)
     {
+        // 设置异常处理器
         $server->setExceptionHandler(
             $this->app->make(Arr::get($config, 'exception.handler', ServerExceptionHandler::class))
         );
 
+        // 设置事件处理器
         $server->setEventHandler(
             $this->app->make(Arr::get($config, 'handler', ServerHandler::class))
         );