Merge pull request #49 from svycka/patch-1

set request method
chadicus · Jan 22, 2020 · 5f64852 · 5f64852
2 parents 4c2bb3a + 8d383c8
commit 5f64852
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 1 deletion.
diff --git a/src/RequestBridge.php b/src/RequestBridge.php
@@ -28,7 +28,7 @@ final public static function toOAuth2(ServerRequestInterface $request)
             $request->getAttributes(),
             $request->getCookieParams(),
             self::convertUploadedFiles($request->getUploadedFiles()),
-            $request->getServerParams(),
+            array_merge($request->getServerParams(), ['REQUEST_METHOD' => $request->getMethod()]),
             $contents,
             self::cleanupHeaders($request->getHeaders())
         );

diff --git a/tests/RequestBridgeTest.php b/tests/RequestBridgeTest.php
@@ -230,4 +230,24 @@ public function toOAuth2WithMultipleFiles()
             $oauth2Request->files
         );
     }
+
+    /**
+     * Verify that sets request method.
+     *
+     * @test
+     * @covers ::toOAuth2
+     *
+     * @return void
+     */
+    public function toOAuth2RequestMethodPreserved()
+    {
+        $uri = 'https://example.com/foos';
+
+        $psr7Request = new ServerRequest([], [], $uri, 'POST', 'php://input');
+
+        $oauth2Request = RequestBridge::toOAuth2($psr7Request);
+
+        $this->assertSame('POST', $psr7Request->getMethod());
+        $this->assertSame('POST', $oauth2Request->server('REQUEST_METHOD'));
+    }
 }