Merge branch 'develop' of https://github.com/swooletw/laravel-swoole into develop

Author: albertcht

src/Server/Manager.php

@@ -251,7 +251,7 @@ public function onRequest($swooleRequest, $swooleResponse)
                 return;
             }
 
-            // set currnt request to sandbox
+            // set current request to sandbox
             $this->sandbox->setRequest($illuminateRequest);
 
             // enable sandbox
@@ -262,9 +262,6 @@ public function onRequest($swooleRequest, $swooleResponse)
             $illuminateResponse = $application->run($illuminateRequest);
             $response = Response::make($illuminateResponse, $swooleResponse);
             $response->send();
-
-            // disable and recycle sandbox resource
-            $this->sandbox->disable();
         } catch (Exception $e) {
             try {
                 $exceptionResponse = $this->app[ExceptionHandler::class]->render($illuminateRequest, $e);
@@ -273,6 +270,9 @@ public function onRequest($swooleRequest, $swooleResponse)
             } catch (Exception $e) {
                 $this->logServerError($e);
             }
+        } finally {
+            // disable and recycle sandbox resource
+            $this->sandbox->disable();
         }
     }
 
@@ -281,6 +281,7 @@ public function onRequest($swooleRequest, $swooleResponse)
      *
      * @param \Illuminate\Http\Request $illuminateRequest
      * @param \Swoole\Http\Response $swooleResponse
+     * @return boolean
      */
     protected function handleStaticRequest($illuminateRequest, $swooleResponse)
     {
@@ -325,7 +326,7 @@ protected function resetOnRequest()
     /**
      * Set onTask listener.
      */
-    public function onTask(HttpServer $server, $taskId, $fromId, $data)
+    public function onTask(HttpServer $server, $taskId, $srcWorkerId, $data)
     {
         $this->container['events']->fire('swoole.task', func_get_args());
 
@@ -445,7 +446,10 @@ protected function createPidFile()
      */
     protected function removePidFile()
     {
-        unlink($this->getPidFile());
+        $pidFile = $this->getPidFile();
+        if (file_exists($pidFile)) {
+            unlink($pidFile);
+        }
     }
 
     /**

src/Server/Sandbox.php

@@ -213,7 +213,8 @@ protected function resetSession($application)
     protected function resetCookie($application)
     {
         if (isset($application['cookie'])) {
-            foreach ($application->make('cookie')->getQueuedCookies() as $key => $value) {
+            $cookies = $application->make('cookie');
+            foreach ($cookies->getQueuedCookies() as $key => $value) {
                 $cookies->unqueue($key);
             }
         }

src/Table/SwooleTable.php

@@ -18,6 +18,7 @@ class SwooleTable
      *
      * @param string $name
      * @param \Swoole\Table $table
+     * @return \SwooleTW\Http\Table\SwooleTable
      */
     public function add(string $name, Table $table)
     {