Merge pull request #40 from chadicus/bug/rewind-request-body

Bug/rewind request body

.scrutinizer.yml

@@ -1,27 +1,23 @@
 filter:
     excluded_paths:
         - 'vendor/*'
-        - 'tests/*'
 before_commands:
     - 'composer install --prefer-source'
-checks:
-    php:
-        custom_coding_standard:
-            git_repository: 'https://github.com/chadicus/coding-standard'
-            git_version: '971fac1625463a72df0034fbfdd263561f2ccb4f'
-            ruleset_path: 'Chadicus/ruleset.xml'
+build:
+    tests:
+        override:
+            - phpcs-run --standard=./vendor/chadicus/coding-standard/Chadicus/ruleset.xml
 tools:
     php_analyzer: true
     php_mess_detector: true
     sensiolabs_security_checker: true
     php_loc:
         excluded_dirs:
             - vendor
-            - tests
     php_pdepend: true
     php_sim: true
 build_failure_conditions:
-    - 'elements.rating(<= B).new.exists'          
-    - 'issues.label("coding-style").new.exists'  
-    - 'issues.severity(>= MAJOR).new.exists' 
+    - 'elements.rating(< B).new.exists'
+    - 'issues.label("coding-style").new.exists'
+    - 'issues.severity(>= MAJOR).new.exists'
     - 'project.metric("scrutinizer.quality", < 6)'

src/RequestBridge.php

@@ -18,14 +18,17 @@ class RequestBridge
      */
     final public static function toOAuth2(ServerRequestInterface $request)
     {
+        $contents = $request->getBody()->getContents();
+        $request->getBody()->rewind();
+
         return new OAuth2\Request(
             (array)$request->getQueryParams(),
             (array)$request->getParsedBody(),
             $request->getAttributes(),
             $request->getCookieParams(),
             self::convertUploadedFiles($request->getUploadedFiles()),
             $request->getServerParams(),
-            (string)$request->getBody(),
+            $contents,
             self::cleanupHeaders($request->getHeaders())
         );
     }

tests/RequestBridgeTest.php

@@ -153,4 +153,28 @@ public function toOAuth2WithAuthorization()
 
         $this->assertSame('Bearer abc123', $oauth2Request->headers('AUTHORIZATION'));
     }
+
+    /**
+     * Verify that steam contents of a passed request is preserved (read and rewound).
+     *
+     * @test
+     * @covers ::toOAuth2
+     *
+     * @return void
+     */
+    public function toOAuth2BodyContentsOfRequestPreserved()
+    {
+        $uri = 'https://example.com/foos';
+
+        $temp = tmpfile();
+        fwrite($temp, 'foo');
+        rewind($temp);
+
+        $psr7Request = new ServerRequest([], [], $uri, 'POST', $temp);
+
+        $oauth2Request = RequestBridge::toOAuth2($psr7Request);
+
+        $this->assertSame('foo', $psr7Request->getBody()->getContents());
+        $this->assertSame('foo', $oauth2Request->getContent());
+    }
 }