Optimized the exception handler which add content-type header automatically by default. (#2373)

* Optimized validation exception handler.

* Added test cases.

Author: limingxinleo

src/ValidationExceptionHandler.php

@@ -23,6 +23,9 @@ public function handle(Throwable $throwable, ResponseInterface $response)
         $this->stopPropagation();
         /** @var \Hyperf\Validation\ValidationException $throwable */
         $body = $throwable->validator->errors()->first();
+        if (! $response->hasHeader('content-type')) {
+            $response = $response->withAddedHeader('content-type', 'text/plain; charset=utf-8');
+        }
         return $response->withStatus($throwable->status)->withBody(new SwooleStream($body));
     }
 

tests/Cases/ValidationExceptionTest.php

@@ -12,10 +12,13 @@
 namespace HyperfTest\Validation\Cases;
 
 use Hyperf\Contract\TranslatorInterface;
+use Hyperf\Contract\ValidatorInterface;
+use Hyperf\HttpMessage\Base\Response;
 use Hyperf\Utils\ApplicationContext;
 use Hyperf\Utils\MessageBag;
 use Hyperf\Validation\Contract\ValidatorFactoryInterface;
 use Hyperf\Validation\ValidationException;
+use Hyperf\Validation\ValidationExceptionHandler;
 use Hyperf\Validation\ValidatorFactory;
 use Mockery;
 use PHPUnit\Framework\TestCase;
@@ -49,6 +52,30 @@ public function testWithMessages()
         ], $errors->getMessages());
     }
 
+    public function testValidationExceptionHandler()
+    {
+        $handler = new ValidationExceptionHandler();
+        $validator = Mockery::mock(ValidatorInterface::class);
+        $validator->shouldReceive('errors')->andReturnUsing(function () {
+            $message = Mockery::mock(MessageBag::class);
+            $message->shouldReceive('first')->andReturn('id is required');
+            return $message;
+        });
+        $exception = new ValidationException($validator);
+        $response = new Response();
+        $response = $handler->handle($exception, $response);
+        $this->assertSame(422, $response->getStatusCode());
+        $this->assertSame('id is required', $response->getBody()->getContents());
+        $this->assertSame('text/plain; charset=utf-8', $response->getHeaderLine('content-type'));
+
+        $response = (new Response())->withAddedHeader('Content-Type', 'application/json; charset=utf-8');
+        $exception = new ValidationException($validator);
+        $response = $handler->handle($exception, $response);
+        $this->assertSame(422, $response->getStatusCode());
+        $this->assertSame('id is required', $response->getBody()->getContents());
+        $this->assertSame('application/json; charset=utf-8', $response->getHeaderLine('content-type'));
+    }
+
     protected function getContainer()
     {
         $container = Mockery::mock(ContainerInterface::class);