Merge pull request #43 from Tobion/guzzle-tests

fix guzzle test suite

Author: dbu

src/RequestIntegrationTest.php

@@ -65,11 +65,28 @@ public function testMethod()
         $this->assertNotSameObject($this->request, $request);
         $this->assertEquals($this->request, $original, 'Request object MUST not be mutated');
         $this->assertEquals('POST', $request->getMethod());
+    }
+
+    public function testMethodIsCaseSensitive()
+    {
+        if (isset($this->skippedTests[__FUNCTION__])) {
+            $this->markTestSkipped($this->skippedTests[__FUNCTION__]);
+        }
 
         $request = $this->request->withMethod('head');
         $this->assertEquals('head', $request->getMethod());
     }
 
+    public function testMethodIsExtendable()
+    {
+        if (isset($this->skippedTests[__FUNCTION__])) {
+            $this->markTestSkipped($this->skippedTests[__FUNCTION__]);
+        }
+
+        $request = $this->request->withMethod('CUSTOM');
+        $this->assertEquals('CUSTOM', $request->getMethod());
+    }
+
     /**
      * @dataProvider getInvalidMethods
      */

src/ServerRequestIntegrationTest.php

@@ -117,15 +117,16 @@ public function validParsedBodyParams()
      */
     public function testGetParsedBodyInvalid($value)
     {
-        $this->expectException('\InvalidArgumentException');
-
         if (isset($this->skippedTests[__FUNCTION__])) {
             $this->markTestSkipped($this->skippedTests[__FUNCTION__]);
         }
 
-        $new = $this->serverRequest->withParsedBody($value);
-        $this->assertNull($this->serverRequest->getParsedBody(), 'withParsedBody MUST be immutable');
-        $this->assertEquals($value, $new->getParsedBody());
+        try {
+            $this->serverRequest->withParsedBody($value);
+            $this->fail('Should not be accepted');
+        } catch (\InvalidArgumentException $e) {
+            $this->assertNull($this->serverRequest->getParsedBody(), 'withParsedBody MUST be immutable');
+        }
     }
 
     public function invalidParsedBodyParams()

src/StreamIntegrationTest.php

@@ -241,12 +241,12 @@ public function testRewind()
      */
     public function testRewindNotSeekable()
     {
-        $this->expectException('\RuntimeException');
-
         if (isset($this->skippedTests[__FUNCTION__])) {
             $this->markTestSkipped($this->skippedTests[__FUNCTION__]);
         }
 
+        $this->expectException(\RuntimeException::class);
+
         $url = 'https://raw.githubusercontent.com/php-http/multipart-stream-builder/master/tests/Resources/httplug.png';
         $resource = fopen($url, 'r');
         $stream = $this->createStream($resource);

tests/Guzzle/RequestTest.php

@@ -7,8 +7,22 @@
 
 class RequestTest extends RequestIntegrationTest
 {
+    protected $skippedTests = [
+        'testMethodIsCaseSensitive' => 'methods are uppercased for BC',
+    ];
+
     public function createSubject()
     {
         return new Request('GET', '/');
     }
+
+    public function getInvalidHeaderArguments()
+    {
+        $testCases = parent::getInvalidHeaderArguments();
+
+        // Guzzle accepts false as value for BC
+        unset($testCases[3]);
+
+        return $testCases;
+    }
 }

tests/Guzzle/ResponseTest.php

@@ -11,4 +11,14 @@ public function createSubject()
     {
         return new Response();
     }
+
+    public function getInvalidHeaderArguments()
+    {
+        $testCases = parent::getInvalidHeaderArguments();
+
+        // Guzzle accepts false as value for BC
+        unset($testCases[3]);
+
+        return $testCases;
+    }
 }

tests/Guzzle/ServerRequestTest.php

@@ -7,6 +7,32 @@
 
 class ServerRequestTest extends ServerRequestIntegrationTest
 {
+    /**
+     * Guzzle accepts more types for parsed body.
+     *
+     * ServerRequestInterface::withParsedBody says
+     * > The data IS NOT REQUIRED to come from $_POST, but MUST be the results of
+     * > deserializing the request body content. Deserialization/parsing returns
+     * > structured data, and, as such, this method ONLY accepts arrays or objects,
+     * > or a null value if nothing was available to parse.
+     * > As an example, if content negotiation determines that the request data
+     * > is a JSON payload, this method could be used to create a request
+     * > instance with the deserialized parameters.
+     *
+     * A JSON body payload can also be a json string, a json int etc. So withParsedBody would also need to accept that as well. Those two sentences contradict each other.
+     * According to a slack discussion, this was based on rfc4627
+     * > A JSON text is a serialized object or array.
+     *
+     * But that is outdated since since rfc7158 in 2013 which does not limit it to array or object anymore. See current https://tools.ietf.org/html/rfc8259
+     *
+     * > A JSON text is a serialized value. Note that certain previous
+     * > specifications of JSON constrained a JSON text to be an object or an
+     * > array.
+     */
+    protected $skippedTests = [
+        'testGetParsedBodyInvalid' => 'more types are accepted per rfc7158',
+    ];
+
     public function createSubject()
     {
         return new ServerRequest('GET', '/', [], null, '1.1', $_SERVER);