Merge remote-tracking branch 'origin/master' into 2.0

Author: huangzhhui

src/Server/Request.php

@@ -447,7 +447,7 @@ public function isAjax()
  */
  public function isXmlHttpRequest()
  {
- return $this->hasHeader('X-Requested-With') == 'XMLHttpRequest';
+ return $this->getHeaderLine('X-Requested-With') == 'XMLHttpRequest';
  }
 
  public function getSwooleRequest(): \Swoole\Http\Request

tests/MessageTraitTest.php

@@ -12,6 +12,7 @@
 namespace HyperfTest\HttpMessage;
 
 use Hyperf\HttpMessage\Base\Request;
+use Hyperf\HttpMessage\Server\Request as ServerRequest;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -29,11 +30,22 @@ public function testSetHeaders()
  'X-Id' => $id,
  'Version' => 1.0,
  1000 => 1000,
+ 'X-Requested-With' => 'XMLHttpRequest',
  ]);
 
  $this->assertSame($token, $request->getHeaderLine('X-Token'));
  $this->assertSame((string) $id, $request->getHeaderLine('X-Id'));
  $this->assertSame('1', $request->getHeaderLine('Version'));
  $this->assertSame('1000', $request->getHeaderLine('1000'));
+ $this->assertSame('XMLHttpRequest', $request->getHeaderLine('X-Requested-With'));
+ }
+
+ public function testIsXmlHttpRequest()
+ {
+ $request = new ServerRequest('GET', '/', [
+ 'X-Requested-With' => 'XMLHttpRequest',
+ ]);
+
+ $this->assertTrue($request->isXmlHttpRequest());
  }
 }