Merge branch 'master' into 2.1-merge

# Conflicts: #	src/validation/composer.json

Author: limingxinleo

tests/SwooleStreamTest.php

@@ -30,7 +30,7 @@ public function testSwooleFileStream()
  $swooleResponse = Mockery::mock(SwooleResponse::class);
  $file = __FILE__;
  $swooleResponse->shouldReceive('sendfile')->with($file)->once()->andReturn(null);
- $swooleResponse->shouldReceive('status')->with(Mockery::any())->once()->andReturn(200);
+ $swooleResponse->shouldReceive('status')->with(200, '')->once()->andReturn(200);
 
  $response = new Response();
  $response = $response->withBody(new SwooleFileStream($file));
@@ -44,7 +44,7 @@ public function testSwooleStream()
  $swooleResponse = Mockery::mock(SwooleResponse::class);
  $content = '{"id":1}';
  $swooleResponse->shouldReceive('end')->with($content)->once()->andReturn(null);
- $swooleResponse->shouldReceive('status')->with(Mockery::any())->once()->andReturn(200);
+ $swooleResponse->shouldReceive('status')->with(200, '')->once()->andReturn(200);
  $swooleResponse->shouldReceive('header')->with('TOKEN', 'xxx')->once()->andReturn(null);
 
  $response = new Response();