Bugfixes

Author: Nyholm

src/MessageTrait.php

@@ -43,7 +43,6 @@ public function testGetHeaders()
         $message = $message->withAddedHeader('content-type', 'text/plain');
         $headers = $message->getHeaders();
 
-        $this->assertCount(1, $headers);
         $this->assertTrue(isset($headers['content-type']));
         $this->assertCount(2, $headers['content-type']);
     }
@@ -91,9 +90,9 @@ public function testGetHeaderLine()
 
         $message = $this->getMessage()->withAddedHeader('content-type', 'text/html');
         $message = $message->withAddedHeader('content-type', 'text/plain');
-        $this->assertEquals('text/html, text/plain', $message->getHeaderLine('content-type'));
-        $this->assertEquals('text/html, text/plain', $message->getHeaderLine('Content-Type'));
-        $this->assertEquals('text/html, text/plain', $message->getHeaderLine('CONTENT-TYPE'));
+        $this->assertRegExp('|text/html, ?text/plain|', $message->getHeaderLine('content-type'));
+        $this->assertRegExp('|text/html, ?text/plain|', $message->getHeaderLine('Content-Type'));
+        $this->assertRegExp('|text/html, ?text/plain|', $message->getHeaderLine('CONTENT-TYPE'));
 
         $this->assertEquals('', $message->getHeaderLine('Bar'));
     }
@@ -128,8 +127,8 @@ public function testWithAddedHeader()
 
         $message = $this->getMessage()->withAddedHeader('content-type', 'text/html');
         $message = $message->withAddedHeader('CONTENT-type', 'text/plain');
-        $this->assertEquals('text/html, text/plain', $message->getHeaderLine('content-type'));
-        $this->assertEquals('text/html, text/plain', $message->getHeaderLine('Content-Type'));
+        $this->assertRegExp('|text/html, ?text/plain|', $message->getHeaderLine('content-type'));
+        $this->assertRegExp('|text/html, ?text/plain|', $message->getHeaderLine('Content-Type'));
     }
 
     public function testWithoutHeader()
@@ -141,17 +140,17 @@ public function testWithoutHeader()
         }
 
         $message = $this->getMessage()->withAddedHeader('content-type', 'text/html');
-        $message = $message->withAddedHeader('Age', 0);
+        $message = $message->withAddedHeader('Age', '0');
         $message = $message->withAddedHeader('X-Foo', 'bar');
 
         $headers = $message->getHeaders();
-        $this->assertCount(3, $headers);
+        $headerCount = count($headers);
         $this->assertTrue(isset($headers['Age']));
 
         // Remove a header
         $message = $message->withoutHeader('age');
         $headers = $message->getHeaders();
-        $this->assertCount(2, $headers);
+        $this->assertCount($headerCount-1, $headers);
         $this->assertFalse(isset($headers['Age']));
     }
 

tests/Zend/RequestTest.php

@@ -9,6 +9,6 @@ class RequestTest extends RequestIntegrationTest
 {
     public function createSubject()
     {
-        return new Request();
+        return new Request('/', 'GET');
     }
 }

tests/Zend/UploadedFileTest.php

@@ -10,7 +10,8 @@ class UploadedFileTest extends UploadedFileIntegrationTest
 {
     public function createSubject()
     {
-        $stream = new Stream('Foobar');
+        $stream = new Stream('php://memory', 'rw');
+        $stream->write('foobar');
 
         return new UploadedFile($stream, $stream->getSize(), UPLOAD_ERR_OK);
     }