fixed compatibility with PHP7

Author: dracony

src/PHPixie/HTTP/Messages.php

@@ -91,7 +91,7 @@ public function stream($uri, $mode = 'r')
 
     public function stringStream($string = '')
     {
-        return new Messages\Stream\String($string);
+        return new Messages\Stream\StringStream($string);
     }
 
     public function uri($uri)

…/PHPixie/HTTP/Messages/Stream/String.php …ie/HTTP/Messages/Stream/StringStream.phpsrc/PHPixie/HTTP/Messages/Stream/String.php renamed to src/PHPixie/HTTP/Messages/Stream/StringStream.php src/PHPixie/HTTP/Messages/Stream/String.php renamed to src/PHPixie/HTTP/Messages/Stream/StringStream.php

@@ -5,7 +5,7 @@
 use Psr\Http\Message\StreamInterface;
 use RuntimeException;
 
-class String implements StreamInterface
+class StringStream implements StreamInterface
 {
     protected $string;
 

…ests/HTTP/Messages/Stream/StringTest.php …TTP/Messages/Stream/StringStreamTest.phptests/PHPixie/Tests/HTTP/Messages/Stream/StringTest.php renamed to tests/PHPixie/Tests/HTTP/Messages/Stream/StringStreamTest.php tests/PHPixie/Tests/HTTP/Messages/Stream/StringTest.php renamed to tests/PHPixie/Tests/HTTP/Messages/Stream/StringStreamTest.php

@@ -3,15 +3,15 @@
 namespace PHPixie\Tests\HTTP\Messages\Stream;
 
 /**
- * @coversDefaultClass PHPixie\HTTP\Messages\Stream\String
+ * @coversDefaultClass PHPixie\HTTP\Messages\Stream\StringStream
  */
-class StringTest extends \PHPixie\Tests\HTTP\Messages\StreamTest
+class StringStreamTest extends \PHPixie\Tests\HTTP\Messages\StreamTest
 {
     protected $string = 'pixie';
 
     public function setUp()
     {
-        $this->stream = new \PHPixie\HTTP\Messages\Stream\String($this->string);
+        $this->stream = new \PHPixie\HTTP\Messages\Stream\StringStream($this->string);
     }
 
     /**
@@ -20,7 +20,7 @@ public function setUp()
      */
     public function testConstruct()
     {
-        $stream = new \PHPixie\HTTP\Messages\Stream\String();
+        $stream = new \PHPixie\HTTP\Messages\Stream\StringStream();
         $this->assertSame('', (string) $stream);
     }
 

tests/PHPixie/Tests/HTTP/Messages/UploadedFile/ImplementationTest.php

@@ -104,16 +104,15 @@ public function testMove()
      */
     public function testInvalidFileSize()
     {
-        $this->file = 'not_existing';
-        $uploadedFile = $this->uploadedFile();
-        
         $methods = array(
-            'getClientMediaType',
-            'getSize'
+            'getClientMediaType' => 'getFileType',
+            'getSize'            => 'getFileSize'
         );
 
-        foreach($methods as $method) {
-            $this->assertException(function() use($uploadedFile) {
+        $uploadedFile = $this->uploadedFile;
+        foreach($methods as $method => $failMethod) {
+            $this->method($this->uploadedFile, $failMethod, false, array(), 0);
+            $this->assertException(function() use($uploadedFile, $method) {
                 $uploadedFile->$method();
             }, '\RuntimeException');
         }

tests/PHPixie/Tests/HTTP/MessagesTest.php

@@ -149,7 +149,7 @@ public function testStringStream()
         $stream = $this->messages->stringStream('test');
         $this->assertInstance(
             $stream,
-            '\PHPixie\HTTP\Messages\Stream\String',
+            '\PHPixie\HTTP\Messages\Stream\StringStream',
             array(
                 'string' => 'test'
             )
@@ -158,7 +158,7 @@ public function testStringStream()
         $stream = $this->messages->stringStream();
         $this->assertInstance(
             $stream,
-            '\PHPixie\HTTP\Messages\Stream\String',
+            '\PHPixie\HTTP\Messages\Stream\StringStream',
             array(
                 'string' => ''
             )

tests/PHPixie/Tests/HTTP/ResponsesTest.php

@@ -186,7 +186,7 @@ protected function prepareResponse($body, $headerArray = array(), $statusCode =
 
     protected function getStringStream()
     {
-        return $this->quickMock('\PHPixie\HTTP\Messages\Stream\String');
+        return $this->quickMock('\PHPixie\HTTP\Messages\Stream\StringStream');
     }
 
     protected function getStream()