Support swow psr7-plus interface for all components. (#5839)

Author: limingxinleo

src/Request/FormRequest.php

@@ -13,6 +13,7 @@
 
 use Hyperf\Collection\Arr;
 use Hyperf\Context\Context;
+use Hyperf\Context\ResponseContext;
 use Hyperf\Contract\ValidatorInterface;
 use Hyperf\HttpServer\Request;
 use Hyperf\Validation\Contract\ValidatesWhenResolved;
@@ -64,10 +65,7 @@ public function getScene(): ?string
      */
     public function response(): ResponseInterface
     {
-        /** @var ResponseInterface $response */
-        $response = Context::get(ResponseInterface::class);
-
-        return $response->withStatus(422);
+        return ResponseContext::get()->setStatus(422);
     }
 
     /**

src/ValidationExceptionHandler.php

@@ -13,20 +13,20 @@
 
 use Hyperf\ExceptionHandler\ExceptionHandler;
 use Hyperf\HttpMessage\Stream\SwooleStream;
-use Psr\Http\Message\ResponseInterface;
+use Swow\Psr7\Message\ResponsePlusInterface;
 use Throwable;
 
 class ValidationExceptionHandler extends ExceptionHandler
 {
-    public function handle(Throwable $throwable, ResponseInterface $response)
+    public function handle(Throwable $throwable, ResponsePlusInterface $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');
+            $response = $response->addHeader('content-type', 'text/plain; charset=utf-8');
         }
-        return $response->withStatus($throwable->status)->withBody(new SwooleStream($body));
+        return $response->setStatus($throwable->status)->setBody(new SwooleStream($body));
     }
 
     public function isValid(Throwable $throwable): bool

tests/Cases/FormRequestTest.php

@@ -13,6 +13,8 @@
 
 use Hyperf\Context\ApplicationContext;
 use Hyperf\Context\Context;
+use Hyperf\Context\RequestContext;
+use Hyperf\Context\ResponseContext;
 use Hyperf\Coroutine\Waiter;
 use Hyperf\HttpMessage\Server\Response;
 use Hyperf\HttpMessage\Upload\UploadedFile;
@@ -30,6 +32,7 @@
 use Psr\Container\ContainerInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
+use Swow\Psr7\Message\ServerRequestPlusInterface;
 use Throwable;
 
 use function Hyperf\Coroutine\wait;
@@ -50,7 +53,7 @@ protected function tearDown(): void
 
     public function testRequestValidationData()
     {
-        $psrRequest = Mockery::mock(ServerRequestInterface::class);
+        $psrRequest = Mockery::mock(ServerRequestPlusInterface::class);
         $file = new UploadedFile('/tmp/tmp_name', 32, 0);
         $psrRequest->shouldReceive('getUploadedFiles')->andReturn([
             'file' => $file,
@@ -60,15 +63,15 @@ public function testRequestValidationData()
         ]);
         $psrRequest->shouldReceive('getQueryParams')->andReturn([]);
 
-        Context::set(ServerRequestInterface::class, $psrRequest);
+        RequestContext::set($psrRequest);
         $request = new DemoRequest(Mockery::mock(ContainerInterface::class));
 
         $this->assertEquals(['id' => 1, 'file' => $file], $request->getValidationData());
     }
 
     public function testRequestValidationDataWithSameKey()
     {
-        $psrRequest = Mockery::mock(ServerRequestInterface::class);
+        $psrRequest = Mockery::mock(ServerRequestPlusInterface::class);
         $file = new UploadedFile('/tmp/tmp_name', 32, 0);
         $psrRequest->shouldReceive('getUploadedFiles')->andReturn([
             'file' => [$file],
@@ -78,23 +81,23 @@ public function testRequestValidationDataWithSameKey()
         ]);
         $psrRequest->shouldReceive('getQueryParams')->andReturn([]);
 
-        Context::set(ServerRequestInterface::class, $psrRequest);
+        RequestContext::set($psrRequest);
         $request = new DemoRequest(Mockery::mock(ContainerInterface::class));
 
         $this->assertEquals(['file' => ['Invalid File.', $file]], $request->getValidationData());
     }
 
     public function testRewriteGetRules()
     {
-        $psrRequest = Mockery::mock(ServerRequestInterface::class);
+        $psrRequest = Mockery::mock(ServerRequestPlusInterface::class);
         $psrRequest->shouldReceive('getQueryParams')->andReturn([]);
         $psrRequest->shouldReceive('getUploadedFiles')->andReturn([]);
         $psrRequest->shouldReceive('getParsedBody')->andReturn([
             'name' => 'xxx',
         ]);
 
-        Context::set(ServerRequestInterface::class, $psrRequest);
-        Context::set(ResponseInterface::class, new Response());
+        RequestContext::set($psrRequest);
+        ResponseContext::set(new Response());
         $container = Mockery::mock(ContainerInterface::class);
         $translator = new Translator(new ArrayLoader(), 'en');
         $container->shouldReceive('get')->with(ValidatorFactoryInterface::class)->andReturn(new ValidatorFactory($translator));
@@ -115,15 +118,15 @@ public function testRewriteGetRules()
 
     public function testSceneForFormRequest()
     {
-        $psrRequest = Mockery::mock(ServerRequestInterface::class);
+        $psrRequest = Mockery::mock(ServerRequestPlusInterface::class);
         $psrRequest->shouldReceive('getQueryParams')->andReturn([]);
         $psrRequest->shouldReceive('getUploadedFiles')->andReturn([]);
         $psrRequest->shouldReceive('getParsedBody')->andReturn([
             'mobile' => '12345',
         ]);
 
-        Context::set(ServerRequestInterface::class, $psrRequest);
-        Context::set(ResponseInterface::class, new Response());
+        RequestContext::set($psrRequest);
+        ResponseContext::set(new Response());
         $container = Mockery::mock(ContainerInterface::class);
         $container->shouldReceive('get')->with(Waiter::class)->andReturn(new Waiter());
         ApplicationContext::setContainer($container);