Enforce immutability

Tests/Factory/HttpFoundationFactoryTest.php

@@ -19,15 +19,21 @@ public function setup()
 
     public function testCreateRequest()
     {
-        $serverRequest = new ServerRequest(array('country' => 'France'));
-        $serverRequest->withQueryParams(array('url' => 'http://les-tilleuls.coop'));
-        $serverRequest->withParsedBody(array('url' => 'http://dunglas.fr'));
-
         $stdClass = new \stdClass();
-        $serverRequest->withAttribute('custom', $stdClass);
-
-        $serverRequest->withCookieParams(array('city' => 'Lille'));
-        $serverRequest->withBody(new Stream('The body'));
+        $serverRequest = new ServerRequest(
+            '1.1',
+            array(),
+            new Stream('The body'),
+            '/about/kevin',
+            'GET',
+            'http://les-tilleuls.coop/about/kevin',
+            array('country' => 'France'),
+            array('city' => 'Lille'),
+            array('url' => 'http://les-tilleuls.coop'),
+            array(),
+            array('url' => 'http://dunglas.fr'),
+            array('custom' => $stdClass)
+        );
 
         $symfonyRequest = $this->factory->createRequest($serverRequest);
 
@@ -39,14 +45,43 @@ public function testCreateRequest()
         $this->assertEquals('The body', $symfonyRequest->getContent());
     }
 
-    public function testCreateRequestWithNonArrayParsedBody()
+    public function testCreateRequestWithNullParsedBody()
     {
-        $serverRequest = new ServerRequest();
+        $serverRequest = new ServerRequest(
+            '1.1',
+            array(),
+            new Stream(),
+            '/',
+            'GET',
+            null,
+            array(),
+            array(),
+            array(),
+            array(),
+            null,
+            array()
+        );
 
-        $serverRequest->withParsedBody(null);
         $this->assertCount(0, $this->factory->createRequest($serverRequest)->request);
+    }
+
+    public function testCreateRequestWithObjectParsedBody()
+    {
+        $serverRequest = new ServerRequest(
+            '1.1',
+            array(),
+            new Stream(),
+            '/',
+            'GET',
+            null,
+            array(),
+            array(),
+            array(),
+            array(),
+            new \stdClass(),
+            array()
+        );
 
-        $serverRequest->withParsedBody(new \stdClass());
         $this->assertCount(0, $this->factory->createRequest($serverRequest)->request);
     }
 
@@ -55,4 +90,3 @@ public function testCreateResponse()
 
     }
 }
-

Tests/Fixtures/Message.php

@@ -16,9 +16,11 @@ class Message implements MessageInterface
     private $headers = array();
     private $body;
 
-    public function __construct()
+    public function __construct($version = '1.1', array $headers = array(), StreamInterface $body = null)
     {
-        $this->body = new Stream();
+        $this->version = $version;
+        $this->headers = $headers;
+        $this->body = null === $body ? new Stream() : $body;
     }
 
     public function getProtocolVersion()
@@ -28,7 +30,7 @@ public function getProtocolVersion()
 
     public function withProtocolVersion($version)
     {
-        $this->version = $version;
+        throw \BadMethodCallException('Not implemented.');
     }
 
     public function getHeaders()
@@ -53,23 +55,17 @@ public function getHeaderLine($name)
 
     public function withHeader($name, $value)
     {
-        if (!is_array($value)) {
-            $value = array($value);
-        }
-
-        $this->headers[$name] = $value;
+        throw \BadMethodCallException('Not implemented.');
     }
 
     public function withAddedHeader($name, $value)
     {
-        $this->headers[$name][] = $value;
+        throw \BadMethodCallException('Not implemented.');
     }
 
     public function withoutHeader($name)
     {
-        if ($this->hasHeader($name)) {
-            unset($this->headers[$name]);
-        }
+        throw \BadMethodCallException('Not implemented.');
     }
 
     public function getBody()
@@ -79,6 +75,6 @@ public function getBody()
 
     public function withBody(StreamInterface $body)
     {
-        $this->body = $body;
+        throw \BadMethodCallException('Not implemented.');
     }
 }

Tests/Fixtures/ServerRequest.php

@@ -3,28 +3,37 @@
 namespace Symfony\Bridge\PsrHttpMessage\Tests\Fixtures;
 
 use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Message\StreamInterface;
 use Psr\Http\Message\UriInterface;
 
 /**
  * @author Kévin Dunglas <dunglas@gmail.com>
  */
 class ServerRequest extends Message implements ServerRequestInterface
 {
-    private $requestTarget = '/';
-    private $method = 'GET';
+    private $requestTarget ;
+    private $method;
     private $uri;
-    private $server = array();
-    private $cookies = array();
-    private $query = array();
-    private $uploadedFiles = array();
-    private $data = null;
-    private $attributes = array();
+    private $server;
+    private $cookies;
+    private $query;
+    private $uploadedFiles;
+    private $data;
+    private $attributes;
 
-    public function __construct($server = array())
+    public function __construct($version = '1.1', array $headers = array(), StreamInterface $body = null, $requestTarget = '/', $method = 'GET', $uri = null, array $server = array(), array $cookies = array(), array $query = array(), array $uploadedFiles = array(), $data = null, array $attributes = array())
     {
-        parent::__construct();
+        parent::__construct($version, $headers, $body);
 
+        $this->requestTarget = $requestTarget;
+        $this->method = $method;
+        $this->uri = $uri;
         $this->server = $server;
+        $this->cookies = $cookies;
+        $this->query = $query;
+        $this->uploadedFiles = $uploadedFiles;
+        $this->data = $data;
+        $this->attributes = $attributes;
     }
 
     public function getRequestTarget()
@@ -34,7 +43,7 @@ public function getRequestTarget()
 
     public function withRequestTarget($requestTarget)
     {
-        $this->requestTarget = $requestTarget;
+        throw \BadMethodCallException('Not implemented.');
     }
 
     public function getMethod()
@@ -44,7 +53,6 @@ public function getMethod()
 
     public function withMethod($method)
     {
-        $this->method = $method;
     }
 
     public function getUri()
@@ -54,7 +62,7 @@ public function getUri()
 
     public function withUri(UriInterface $uri, $preserveHost = false)
     {
-        $this->uri = $uri;
+        throw \BadMethodCallException('Not implemented.');
     }
 
     public function getServerParams()
@@ -69,7 +77,7 @@ public function getCookieParams()
 
     public function withCookieParams(array $cookies)
     {
-        $this->cookies = $cookies;
+        throw \BadMethodCallException('Not implemented.');
     }
 
     public function getQueryParams()
@@ -79,7 +87,7 @@ public function getQueryParams()
 
     public function withQueryParams(array $query)
     {
-        $this->query = $query;
+        throw \BadMethodCallException('Not implemented.');
     }
 
     public function getUploadedFiles()
@@ -89,7 +97,7 @@ public function getUploadedFiles()
 
     public function withUploadedFiles(array $uploadedFiles)
     {
-        $this->uploadedFiles = $uploadedFiles;
+        throw \BadMethodCallException('Not implemented.');
     }
 
     public function getParsedBody()
@@ -99,7 +107,7 @@ public function getParsedBody()
 
     public function withParsedBody($data)
     {
-        $this->data = $data;
+        throw \BadMethodCallException('Not implemented.');
     }
 
     public function getAttributes()
@@ -114,13 +122,11 @@ public function getAttribute($name, $default = null)
 
     public function withAttribute($name, $value)
     {
-        $this->attributes[$name] = $value;
+        throw \BadMethodCallException('Not implemented.');
     }
 
     public function withoutAttribute($name)
     {
-        if ($this->getAttribute($name)) {
-            unset($this->attributes[$name]);
-        }
+        throw \BadMethodCallException('Not implemented.');
     }
 }