Merge branch 'hotfix/148'

Close #148

Author: weierophinney

CHANGELOG.md

@@ -28,6 +28,9 @@ All notable changes to this project will be documented in this file, in reverse
 - [#142](https://github.com/zendframework/zend-diactoros/pull/142) updates the
   exceptions thrown by `HeaderSecurity` to include the header name and/or
   value.
+- [#148](https://github.com/zendframework/zend-diactoros/pull/148) fixes several
+  stream operations to ensure they raise exceptions when the internal pointer
+  is at an invalid position.
 
 ## 1.3.3 - 2016-01-04
 

src/RelativeStream.php

@@ -10,6 +10,7 @@
 namespace Zend\Diactoros;
 
 use Psr\Http\Message\StreamInterface;
+use RuntimeException;
 
 /**
  * Class RelativeStream
@@ -131,6 +132,9 @@ public function isWritable()
      */
     public function write($string)
     {
+        if ($this->tell() < 0) {
+            throw new RuntimeException('Invalid pointer position');
+        }
         return $this->decoratedStream->write($string);
     }
 
@@ -147,6 +151,9 @@ public function isReadable()
      */
     public function read($length)
     {
+        if ($this->tell() < 0) {
+            throw new RuntimeException('Invalid pointer position');
+        }
         return $this->decoratedStream->read($length);
     }
 
@@ -155,6 +162,9 @@ public function read($length)
      */
     public function getContents()
     {
+        if ($this->tell() < 0) {
+            throw new RuntimeException('Invalid pointer position');
+        }
         return $this->decoratedStream->getContents();
     }
 

test/RelativeStreamTest.php

@@ -21,6 +21,7 @@ class RelativeStreamTest extends TestCase
     public function testToString()
     {
         $decorated = $this->prophesize('Zend\Diactoros\Stream');
+        $decorated->tell()->willReturn(100);
         $decorated->seek(100, SEEK_SET)->shouldBeCalled();
         $decorated->getContents()->shouldBeCalled()->willReturn('foobarbaz');
 
@@ -112,6 +113,7 @@ public function testRewind()
     public function testWrite()
     {
         $decorated = $this->prophesize('Zend\Diactoros\Stream');
+        $decorated->tell()->willReturn(100);
         $decorated->write("foobaz")->shouldBeCalled()->willReturn(6);
         $stream = new RelativeStream($decorated->reveal(), 100);
         $ret = $stream->write("foobaz");
@@ -121,6 +123,7 @@ public function testWrite()
     public function testRead()
     {
         $decorated = $this->prophesize('Zend\Diactoros\Stream');
+        $decorated->tell()->willReturn(100);
         $decorated->read(3)->shouldBeCalled()->willReturn("foo");
         $stream = new RelativeStream($decorated->reveal(), 100);
         $ret = $stream->read(3);
@@ -130,6 +133,7 @@ public function testRead()
     public function testGetContents()
     {
         $decorated = $this->prophesize('Zend\Diactoros\Stream');
+        $decorated->tell()->willReturn(100);
         $decorated->getContents()->shouldBeCalled()->willReturn("foo");
         $stream = new RelativeStream($decorated->reveal(), 100);
         $ret = $stream->getContents();
@@ -144,4 +148,34 @@ public function testGetMetadata()
         $ret = $stream->getMetadata("bar");
         $this->assertEquals("foo", $ret);
     }
+
+    public function testWriteRaisesExceptionWhenPointerIsBehindOffset()
+    {
+        $this->setExpectedException('RuntimeException', 'Invalid pointer position');
+        $decorated = $this->prophesize('Zend\Diactoros\Stream');
+        $decorated->tell()->shouldBeCalled()->willReturn(0);
+        $decorated->write("foobaz")->shouldNotBeCalled();
+        $stream = new RelativeStream($decorated->reveal(), 100);
+        $stream->write("foobaz");
+    }
+
+    public function testReadRaisesExceptionWhenPointerIsBehindOffset()
+    {
+        $this->setExpectedException('RuntimeException', 'Invalid pointer position');
+        $decorated = $this->prophesize('Zend\Diactoros\Stream');
+        $decorated->tell()->shouldBeCalled()->willReturn(0);
+        $decorated->read(3)->shouldNotBeCalled();
+        $stream = new RelativeStream($decorated->reveal(), 100);
+        $stream->read(3);
+    }
+
+    public function testGetContentsRaisesExceptionWhenPointerIsBehindOffset()
+    {
+        $this->setExpectedException('RuntimeException', 'Invalid pointer position');
+        $decorated = $this->prophesize('Zend\Diactoros\Stream');
+        $decorated->tell()->shouldBeCalled()->willReturn(0);
+        $decorated->getContents()->shouldNotBeCalled();
+        $stream = new RelativeStream($decorated->reveal(), 100);
+        $stream->getContents();
+    }
 }