feat(Req): getHeader 支持键名包含 -，如 Access-Control-Request-Method

twinh · Mar 31, 2024 · 6436091 · 6436091
1 parent 0873253
commit 6436091
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/lib/Req.php b/lib/Req.php
@@ -937,7 +937,7 @@ protected function hasHeader(string $name): bool
      */
     protected function getHeader(string $name): ?string
     {
-        $name = 'HTTP_' . strtoupper($name);
+        $name = 'HTTP_' . strtoupper(strtr($name, '-', '_'));
         return $this->servers[$name] ?? null;
     }
 

diff --git a/tests/unit/ReqTest.php b/tests/unit/ReqTest.php
@@ -1153,12 +1153,14 @@ public function testGetHeaderAndHasHeader()
             'servers' => [
                 'HTTP_ORIGIN' => 'https://test.com',
                 'HTTP_TEST' => 'test',
+                'HTTP_ACCESS_CONTROL_REQUEST_METHOD' => 'GET',
                 'ORIGIN' => 'https://test2.com',
             ],
         ]);
         $this->assertSame('https://test.com', $req->getHeader('ORIGIN'));
         $this->assertSame('https://test.com', $req->getHeader('origin'));
         $this->assertSame('test', $req->getHeader('test'));
+        $this->assertSame('GET', $req->getHeader('Access-Control-Request-Method'));
         $this->assertNull($req->getHeader('test2'));
 
         $this->assertTrue($req->hasHeader('ORIGIN'));