Optimized

Author: huangzhhui

app/Controller/Controller.php

@@ -12,8 +12,8 @@
 
 namespace App\Controller;
 
-use App\Kernel\Http\Response;
 use Hyperf\HttpServer\Contract\RequestInterface;
+use Hyperf\HttpServer\Contract\ResponseInterface;
 use Psr\Container\ContainerInterface;
 
 abstract class Controller
@@ -24,19 +24,19 @@ abstract class Controller
     protected $container;
 
     /**
-     * @var Response
+     * @var RequestInterface
      */
-    protected $response;
+    protected $request;
 
     /**
-     * @var RequestInterface
+     * @var ResponseInterface
      */
-    protected $request;
+    protected $response;
 
     public function __construct(ContainerInterface $container)
     {
         $this->container = $container;
-        $this->response = $container->get(Response::class);
         $this->request = $container->get(RequestInterface::class);
+        $this->response = $container->get(ResponseInterface::class);
     }
 }

app/Controller/IndexController.php

@@ -18,13 +18,10 @@ public function index()
     {
         $user = $this->request->input('user', 'Hyperf');
         $method = $this->request->getMethod();
-        $file = $this->request->file('file');
 
-        return $this->response->success([
-            'user' => $user,
+        return [
             'method' => $method,
-            'message' => 'Hello Hyperf.',
-            'file' => $file ? $file->getFilename() : null,
-        ]);
+            'message' => "Hello $user.",
+        ];
     }
 }

app/Exception/BusinessException.php

@@ -0,0 +1,43 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * This file is part of Hyperf.
+ *
+ * @link     https://www.hyperf.io
+ * @document https://doc.hyperf.io
+ * @contact  [email protected]
+ * @license  https://github.com/hyperf-cloud/hyperf/blob/master/LICENSE
+ */
+
+namespace App\Exception\Handler;
+
+use Hyperf\Contract\StdoutLoggerInterface;
+use Hyperf\ExceptionHandler\ExceptionHandler;
+use Hyperf\HttpMessage\Stream\SwooleStream;
+use Psr\Http\Message\ResponseInterface;
+use Throwable;
+
+class AppExceptionHandler extends ExceptionHandler
+{
+    /**
+     * @var StdoutLoggerInterface
+     */
+    protected $logger;
+
+    public function __construct(StdoutLoggerInterface $logger)
+    {
+        $this->logger = $logger;
+    }
+
+    public function handle(Throwable $throwable, ResponseInterface $response)
+    {
+        $this->logger->error($throwable->getTraceAsString());
+        return $response->withStatus(500)->withBody(new SwooleStream('Internal Server Error.'));
+    }
+
+    public function isValid(Throwable $throwable): bool
+    {
+        return true;
+    }
+}

app/Exception/Handler/AppExceptionHandler.php

@@ -9,7 +9,6 @@
 
 ! defined('BASE_PATH') && define('BASE_PATH', dirname(__DIR__, 1));
 
-// TODO: Later move to the right place
 \Swoole\Runtime::enableCoroutine(true);
 
 require BASE_PATH . '/vendor/autoload.php';

app/Exception/Handler/BusinessExceptionHandler.php

@@ -13,7 +13,7 @@
 return [
     'handler' => [
         'http' => [
-            App\Exception\Handler\BusinessExceptionHandler::class,
+            App\Exception\Handler\AppExceptionHandler::class,
         ],
     ],
 ];