FIX compatibility issues with PSR library

Author: francerz

dev/Stream.php

@@ -14,12 +14,12 @@ public function __construct(string $content = '')
         $this->content = $content;
     }
 
-    public function __toString()
+    public function __toString(): string
     {
         return $this->content;
     }
 
-    public function close()
+    public function close(): void
     {
     }
 
@@ -28,27 +28,27 @@ public function detach()
         return null;
     }
 
-    public function getSize()
+    public function getSize(): ?int
     {
         return strlen($this->content);
     }
 
-    public function tell()
+    public function tell(): int
     {
         return $this->pointer;
     }
 
-    public function eof()
+    public function eof(): bool
     {
         return $this->tell() >= $this->getSize();
     }
 
-    public function isSeekable()
+    public function isSeekable(): bool
     {
         return true;
     }
 
-    public function seek($offset, $whence = SEEK_SET)
+    public function seek($offset, $whence = SEEK_SET): void
     {
         switch ($whence) {
             case SEEK_SET:
@@ -63,34 +63,35 @@ public function seek($offset, $whence = SEEK_SET)
         }
     }
 
-    public function rewind()
+    public function rewind(): void
     {
         $this->seek(0);
     }
 
-    public function isWritable()
+    public function isWritable(): bool
     {
         return false;
     }
 
-    public function write($string)
+    public function write($string): int
     {
+        return 0;
     }
 
-    public function isReadable()
+    public function isReadable(): bool
     {
         return true;
     }
 
-    public function read($length)
+    public function read($length): string
     {
         $bytes = substr($this->content, $this->pointer, $length);
         $this->pointer += $length;
         $this->pointer = min($this->pointer, $this->getSize());
         return $bytes;
     }
 
-    public function getContents()
+    public function getContents(): string
     {
         return $this->content;
     }

src/utils/StreamWrapper.php

@@ -14,72 +14,72 @@ public function __construct(StreamInterface $stream)
         $this->stream = $stream;
     }
 
-    public function __toString()
+    public function __toString(): string
     {
         return $this->stream->__toString();
     }
 
-    public function close()
+    public function close(): void
     {
-        return $this->stream->close();
+        $this->stream->close();
     }
 
     public function detach()
     {
         return $this->stream->detach();
     }
 
-    public function getSize()
+    public function getSize(): ?int
     {
         return $this->stream->getSize();
     }
 
-    public function tell()
+    public function tell(): int
     {
         return $this->stream->tell();
     }
 
-    public function eof()
+    public function eof(): bool
     {
         return $this->stream->eof();
     }
 
-    public function isSeekable()
+    public function isSeekable(): bool
     {
         return $this->stream->isSeekable();
     }
 
-    public function seek($offset, $whence = SEEK_SET)
+    public function seek($offset, $whence = SEEK_SET): void
     {
-        return $this->stream->seek($offset, $whence);
+        $this->stream->seek($offset, $whence);
     }
 
-    public function rewind()
+    public function rewind(): void
     {
-        return $this->stream->rewind();
+        $this->stream->rewind();
     }
 
-    public function isWritable()
+    public function isWritable(): bool
     {
         return $this->stream->isWritable();
     }
 
-    public function write($string)
+    public function write($string): int
     {
         return $this->stream->write($string);
     }
 
-    public function isReadable()
+    public function isReadable(): bool
     {
         return $this->stream->isReadable();
     }
 
-    public function read($length)
+    public function read($length): string
     {
         return $this->stream->read($length);
     }
 
-    public function getContents()
+    public function getContents(): string
     {
         return $this->stream->getContents();
     }