Merge branch 'hotfix/minimum-php-version'

Close #48
zendframework · Jun 4, 2015 · 1dce37e · 1dce37e
2 parents b6d2ffb + f816a1c
commit 1dce37e
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 16 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -9,6 +9,7 @@ cache:
 matrix:
   fast_finish: true
   include:
+    - php: 5.4
     - php: 5.5
       env:
         - EXECUTE_CS_CHECK=true

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,26 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
+## 1.0.3 - 2015-06-04
+
+### Added
+
+- [#48](https://github.com/zendframework/zend-diactoros/pull/48) drops the
+  minimum supported PHP version to 5.4, to allow an easier upgrade path for
+  Symfony 2.7 users, and potential Drupal 8 usage.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- Nothing.
+
 ## 1.0.2 - 2015-06-04
 
 ### Added

diff --git a/composer.json b/composer.json
@@ -20,7 +20,7 @@
     }
   },
   "require": {
-    "php": ">=5.5",
+    "php": ">=5.4",
     "psr/http-message": "~1.0"
   },
   "require-dev": {

diff --git a/test/RelativeStreamTest.php b/test/RelativeStreamTest.php
@@ -20,7 +20,7 @@ class RelativeStreamTest extends TestCase
 {
     public function testToString()
     {
-        $decorated = $this->prophesize(Stream::class);
+        $decorated = $this->prophesize('Zend\Diactoros\Stream');
         $decorated->seek(100, SEEK_SET)->shouldBeCalled();
         $decorated->getContents()->shouldBeCalled()->willReturn('foobarbaz');
 
@@ -31,15 +31,15 @@ public function testToString()
 
     public function testClose()
     {
-        $decorated = $this->prophesize(Stream::class);
+        $decorated = $this->prophesize('Zend\Diactoros\Stream');
         $decorated->close()->shouldBeCalled();
         $stream = new RelativeStream($decorated->reveal(), 100);
         $stream->close();
     }
 
     public function testDetach()
     {
-        $decorated = $this->prophesize(Stream::class);
+        $decorated = $this->prophesize('Zend\Diactoros\Stream');
         $decorated->detach()->shouldBeCalled()->willReturn(250);
         $stream = new RelativeStream($decorated->reveal(), 100);
         $ret = $stream->detach();
@@ -48,7 +48,7 @@ public function testDetach()
 
     public function testGetSize()
     {
-        $decorated = $this->prophesize(Stream::class);
+        $decorated = $this->prophesize('Zend\Diactoros\Stream');
         $decorated->getSize()->shouldBeCalled()->willReturn(250);
         $stream = new RelativeStream($decorated->reveal(), 100);
         $ret = $stream->getSize();
@@ -57,7 +57,7 @@ public function testGetSize()
 
     public function testTell()
     {
-        $decorated = $this->prophesize(Stream::class);
+        $decorated = $this->prophesize('Zend\Diactoros\Stream');
         $decorated->tell()->shouldBeCalled()->willReturn(188);
         $stream = new RelativeStream($decorated->reveal(), 100);
         $ret = $stream->tell();
@@ -66,7 +66,7 @@ public function testTell()
 
     public function testIsSeekable()
     {
-        $decorated = $this->prophesize(Stream::class);
+        $decorated = $this->prophesize('Zend\Diactoros\Stream');
         $decorated->isSeekable()->shouldBeCalled()->willReturn(true);
         $stream = new RelativeStream($decorated->reveal(), 100);
         $ret = $stream->isSeekable();
@@ -75,7 +75,7 @@ public function testIsSeekable()
 
     public function testIsWritable()
     {
-        $decorated = $this->prophesize(Stream::class);
+        $decorated = $this->prophesize('Zend\Diactoros\Stream');
         $decorated->isWritable()->shouldBeCalled()->willReturn(true);
         $stream = new RelativeStream($decorated->reveal(), 100);
         $ret = $stream->isWritable();
@@ -84,7 +84,7 @@ public function testIsWritable()
 
     public function testIsReadable()
     {
-        $decorated = $this->prophesize(Stream::class);
+        $decorated = $this->prophesize('Zend\Diactoros\Stream');
         $decorated->isReadable()->shouldBeCalled()->willReturn(false);
         $stream = new RelativeStream($decorated->reveal(), 100);
         $ret = $stream->isReadable();
@@ -93,7 +93,7 @@ public function testIsReadable()
 
     public function testSeek()
     {
-        $decorated = $this->prophesize(Stream::class);
+        $decorated = $this->prophesize('Zend\Diactoros\Stream');
         $decorated->seek(126, SEEK_SET)->shouldBeCalled()->willReturn(0);
         $stream = new RelativeStream($decorated->reveal(), 100);
         $ret = $stream->seek(26);
@@ -102,7 +102,7 @@ public function testSeek()
 
     public function testRewind()
     {
-        $decorated = $this->prophesize(Stream::class);
+        $decorated = $this->prophesize('Zend\Diactoros\Stream');
         $decorated->seek(100, SEEK_SET)->shouldBeCalled()->willReturn(0);
         $stream = new RelativeStream($decorated->reveal(), 100);
         $ret = $stream->rewind();
@@ -111,7 +111,7 @@ public function testRewind()
 
     public function testWrite()
     {
-        $decorated = $this->prophesize(Stream::class);
+        $decorated = $this->prophesize('Zend\Diactoros\Stream');
         $decorated->write("foobaz")->shouldBeCalled()->willReturn(6);
         $stream = new RelativeStream($decorated->reveal(), 100);
         $ret = $stream->write("foobaz");
@@ -120,7 +120,7 @@ public function testWrite()
 
     public function testRead()
     {
-        $decorated = $this->prophesize(Stream::class);
+        $decorated = $this->prophesize('Zend\Diactoros\Stream');
         $decorated->read(3)->shouldBeCalled()->willReturn("foo");
         $stream = new RelativeStream($decorated->reveal(), 100);
         $ret = $stream->read(3);
@@ -129,7 +129,7 @@ public function testRead()
 
     public function testGetContents()
     {
-        $decorated = $this->prophesize(Stream::class);
+        $decorated = $this->prophesize('Zend\Diactoros\Stream');
         $decorated->getContents()->shouldBeCalled()->willReturn("foo");
         $stream = new RelativeStream($decorated->reveal(), 100);
         $ret = $stream->getContents();
@@ -138,7 +138,7 @@ public function testGetContents()
 
     public function testGetMetadata()
     {
-        $decorated = $this->prophesize(Stream::class);
+        $decorated = $this->prophesize('Zend\Diactoros\Stream');
         $decorated->getMetadata("bar")->shouldBeCalled()->willReturn("foo");
         $stream = new RelativeStream($decorated->reveal(), 100);
         $ret = $stream->getMetadata("bar");

diff --git a/test/Request/SerializerTest.php b/test/Request/SerializerTest.php
@@ -324,6 +324,6 @@ public function testFromStreamStopsReadingAfterScanningHeader()
             }));
 
         $stream = Serializer::fromStream($stream);
-        $this->assertInstanceOf(RelativeStream::class, $stream->getBody());
+        $this->assertInstanceOf('Zend\Diactoros\RelativeStream', $stream->getBody());
     }
 }