From bd5902415a2a7ec61b7adc356064892c947b0421 Mon Sep 17 00:00:00 2001 From: PJ Dietz Date: Thu, 2 Apr 2015 18:45:11 -0400 Subject: [PATCH] Rename StreamStream Stream --- src/Message/ServerRequest.php | 4 +- src/Stream/{StreamStream.php => Stream.php} | 2 +- src/Stream/StringStream.php | 2 +- test/tests/unit/Message/ServerRequestTest.php | 2 +- test/tests/unit/Stream/StingStreamTest.php | 2 +- test/tests/unit/Stream/StreamStreamTest.php | 120 +++++++++--------- 6 files changed, 66 insertions(+), 66 deletions(-) rename src/Stream/{StreamStream.php => Stream.php} (99%) diff --git a/src/Message/ServerRequest.php b/src/Message/ServerRequest.php index a88c516..bf5597b 100644 --- a/src/Message/ServerRequest.php +++ b/src/Message/ServerRequest.php @@ -4,7 +4,7 @@ namespace WellRESTed\Message; use Psr\Http\Message\ServerRequestInterface; use Psr\Http\Message\StreamableInterface; -use WellRESTed\Stream\StreamStream; +use WellRESTed\Stream\Stream; class ServerRequest extends Request implements ServerRequestInterface { @@ -334,7 +334,7 @@ class ServerRequest extends Request implements ServerRequestInterface */ protected function getStreamForBody() { - return new StreamStream(fopen("php://input", "r")); + return new Stream(fopen("php://input", "r")); } /** diff --git a/src/Stream/StreamStream.php b/src/Stream/Stream.php similarity index 99% rename from src/Stream/StreamStream.php rename to src/Stream/Stream.php index bfd6c2f..0b9e3fa 100644 --- a/src/Stream/StreamStream.php +++ b/src/Stream/Stream.php @@ -4,7 +4,7 @@ namespace WellRESTed\Stream; use Psr\Http\Message\StreamableInterface; -class StreamStream implements StreamableInterface +class Stream implements StreamableInterface { /** @var resource */ private $handle; diff --git a/src/Stream/StringStream.php b/src/Stream/StringStream.php index 5a4235a..63da573 100644 --- a/src/Stream/StringStream.php +++ b/src/Stream/StringStream.php @@ -2,7 +2,7 @@ namespace WellRESTed\Stream; -class StringStream extends StreamStream +class StringStream extends Stream { public function __construct($string = "") { diff --git a/test/tests/unit/Message/ServerRequestTest.php b/test/tests/unit/Message/ServerRequestTest.php index 723943b..784e221 100644 --- a/test/tests/unit/Message/ServerRequestTest.php +++ b/test/tests/unit/Message/ServerRequestTest.php @@ -9,7 +9,7 @@ use WellRESTed\Message\ServerRequest; * @uses WellRESTed\Message\Request * @uses WellRESTed\Message\Message * @uses WellRESTed\Message\HeaderCollection - * @uses WellRESTed\Stream\StreamStream + * @uses WellRESTed\Stream\Stream */ class ServerRequestTest extends \PHPUnit_Framework_TestCase { diff --git a/test/tests/unit/Stream/StingStreamTest.php b/test/tests/unit/Stream/StingStreamTest.php index 77d1725..8e4e16d 100644 --- a/test/tests/unit/Stream/StingStreamTest.php +++ b/test/tests/unit/Stream/StingStreamTest.php @@ -6,7 +6,7 @@ use WellRESTed\Stream\StringStream; /** * @covers WellRESTed\Stream\StringStream - * @uses WellRESTed\Stream\StreamStream + * @uses WellRESTed\Stream\Stream */ class StringStreamTest extends \PHPUnit_Framework_TestCase { diff --git a/test/tests/unit/Stream/StreamStreamTest.php b/test/tests/unit/Stream/StreamStreamTest.php index 44c74c6..f3bea4a 100644 --- a/test/tests/unit/Stream/StreamStreamTest.php +++ b/test/tests/unit/Stream/StreamStreamTest.php @@ -2,9 +2,9 @@ namespace WellRESTed\Test\Stream; -use WellRESTed\Stream\StreamStream; +use WellRESTed\Stream\Stream; -class StreamStreamTest extends \PHPUnit_Framework_TestCase +class StreamTest extends \PHPUnit_Framework_TestCase { private $handle; private $content = "Hello, world!"; @@ -23,26 +23,26 @@ class StreamStreamTest extends \PHPUnit_Framework_TestCase } /** - * @covers WellRESTed\Stream\StreamStream::__construct() + * @covers WellRESTed\Stream\Stream::__construct() */ public function testCreatesInstance() { - $stream = new StreamStream($this->handle); + $stream = new Stream($this->handle); $this->assertNotNull($stream); } /** - * @covers WellRESTed\Stream\StreamStream::__construct() + * @covers WellRESTed\Stream\Stream::__construct() * @expectedException \InvalidArgumentException */ public function testThrowsExceptiondWithoutHandle() { - new StreamStream(null); + new Stream(null); } /** - * @covers WellRESTed\Stream\StreamStream::__toString() - * @uses WellRESTed\Stream\StreamStream + * @covers WellRESTed\Stream\Stream::__toString() + * @uses WellRESTed\Stream\Stream */ public function testCastsToString() { @@ -52,13 +52,13 @@ class StreamStreamTest extends \PHPUnit_Framework_TestCase fwrite($h, $content); rewind($h); - $stream = new StreamStream($h); + $stream = new Stream($h); $this->assertEquals($content, (string) $stream); } /** - * @covers WellRESTed\Stream\StreamStream::__toString() - * @uses WellRESTed\Stream\StreamStream + * @covers WellRESTed\Stream\Stream::__toString() + * @uses WellRESTed\Stream\Stream */ public function testRewindsBeforeCastingToString() { @@ -67,71 +67,71 @@ class StreamStreamTest extends \PHPUnit_Framework_TestCase $h = fopen("php://memory", "w+"); fwrite($h, $content); - $stream = new StreamStream($h); + $stream = new Stream($h); $this->assertEquals($content, (string) $stream); } /** - * @covers WellRESTed\Stream\StreamStream::close() - * @uses WellRESTed\Stream\StreamStream + * @covers WellRESTed\Stream\Stream::close() + * @uses WellRESTed\Stream\Stream */ public function testClosesHandle() { - $stream = new StreamStream($this->handle); + $stream = new Stream($this->handle); $stream->close(); $this->assertFalse(is_resource($this->handle)); } /** - * @covers WellRESTed\Stream\StreamStream::detach() - * @uses WellRESTed\Stream\StreamStream + * @covers WellRESTed\Stream\Stream::detach() + * @uses WellRESTed\Stream\Stream */ public function testDetachReturnsHandle() { - $stream = new StreamStream($this->handle); + $stream = new Stream($this->handle); $h = $stream->detach(); $this->assertSame($this->handle, $h); } /** - * @covers WellRESTed\Stream\StreamStream::detach() - * @uses WellRESTed\Stream\StreamStream + * @covers WellRESTed\Stream\Stream::detach() + * @uses WellRESTed\Stream\Stream */ public function testDetachUnsetsInstanceVariable() { - $stream = new StreamStream($this->handle); + $stream = new Stream($this->handle); $stream->detach(); $this->assertNull($stream->detach()); } /** - * @covers WellRESTed\Stream\StreamStream::getSize - * @uses WellRESTed\Stream\StreamStream + * @covers WellRESTed\Stream\Stream::getSize + * @uses WellRESTed\Stream\Stream */ public function testReturnsNullForSize() { - $stream = new StreamStream($this->handle); + $stream = new Stream($this->handle); $this->assertNull($stream->getSize()); } /** - * @covers WellRESTed\Stream\StreamStream::tell - * @uses WellRESTed\Stream\StreamStream + * @covers WellRESTed\Stream\Stream::tell + * @uses WellRESTed\Stream\Stream */ public function testTellReturnsHandlePosition() { - $stream = new StreamStream($this->handle); + $stream = new Stream($this->handle); fseek($this->handle, 10); $this->assertEquals(10, $stream->tell()); } /** - * @covers WellRESTed\Stream\StreamStream::eof - * @uses WellRESTed\Stream\StreamStream + * @covers WellRESTed\Stream\Stream::eof + * @uses WellRESTed\Stream\Stream */ public function testReturnsOef() { - $stream = new StreamStream($this->handle); + $stream = new Stream($this->handle); $stream->rewind(); $this->assertFalse($stream->eof()); $stream->getContents(); @@ -139,100 +139,100 @@ class StreamStreamTest extends \PHPUnit_Framework_TestCase } /** - * @covers WellRESTed\Stream\StreamStream::isSeekable - * @uses WellRESTed\Stream\StreamStream + * @covers WellRESTed\Stream\Stream::isSeekable + * @uses WellRESTed\Stream\Stream */ public function testReadsSeekableStatusFromMetadata() { - $stream = new StreamStream($this->handle); + $stream = new Stream($this->handle); $metadata = stream_get_meta_data($this->handle); $seekable = $metadata["seekable"] == 1; $this->assertEquals($seekable, $stream->isSeekable()); } /** - * @covers WellRESTed\Stream\StreamStream::seek - * @uses WellRESTed\Stream\StreamStream + * @covers WellRESTed\Stream\Stream::seek + * @uses WellRESTed\Stream\Stream */ public function testSeeksToPosition() { - $stream = new StreamStream($this->handle); + $stream = new Stream($this->handle); $stream->seek(10); $this->assertEquals(10, ftell($this->handle)); } /** - * @covers WellRESTed\Stream\StreamStream::rewind - * @uses WellRESTed\Stream\StreamStream + * @covers WellRESTed\Stream\Stream::rewind + * @uses WellRESTed\Stream\Stream */ public function testRewindReturnsToBeginning() { - $stream = new StreamStream($this->handle); + $stream = new Stream($this->handle); $stream->seek(10); $stream->rewind(); $this->assertEquals(0, ftell($this->handle)); } /** - * @covers WellRESTed\Stream\StreamStream::write - * @uses WellRESTed\Stream\StreamStream + * @covers WellRESTed\Stream\Stream::write + * @uses WellRESTed\Stream\Stream */ public function testWritesToHandle() { $message = "\nThis is a stream."; - $stream = new StreamStream($this->handle); + $stream = new Stream($this->handle); $stream->write($message); $this->assertEquals($this->content . $message, (string) $stream); } /** - * @covers WellRESTed\Stream\StreamStream::read - * @uses WellRESTed\Stream\StreamStream + * @covers WellRESTed\Stream\Stream::read + * @uses WellRESTed\Stream\Stream */ public function testReadsFromStream() { - $stream = new StreamStream($this->handle); + $stream = new Stream($this->handle); $stream->seek(7); $string = $stream->read(5); $this->assertEquals("world", $string); } /** - * @covers WellRESTed\Stream\StreamStream::getContents - * @uses WellRESTed\Stream\StreamStream + * @covers WellRESTed\Stream\Stream::getContents + * @uses WellRESTed\Stream\Stream */ public function testReadsToEnd() { - $stream = new StreamStream($this->handle); + $stream = new Stream($this->handle); $stream->seek(7); $string = $stream->getContents(); $this->assertEquals("world!", $string); } /** - * @covers WellRESTed\Stream\StreamStream::getMetadata - * @uses WellRESTed\Stream\StreamStream + * @covers WellRESTed\Stream\Stream::getMetadata + * @uses WellRESTed\Stream\Stream */ public function testReturnsMetadataArray() { - $stream = new StreamStream($this->handle); + $stream = new Stream($this->handle); $this->assertEquals(stream_get_meta_data($this->handle), $stream->getMetadata()); } /** - * @covers WellRESTed\Stream\StreamStream::getMetadata - * @uses WellRESTed\Stream\StreamStream + * @covers WellRESTed\Stream\Stream::getMetadata + * @uses WellRESTed\Stream\Stream */ public function testReturnsMetadataItem() { - $stream = new StreamStream($this->handle); + $stream = new Stream($this->handle); $metadata = stream_get_meta_data($this->handle); $this->assertEquals($metadata["mode"], $stream->getMetadata("mode")); } /** - * @covers WellRESTed\Stream\StreamStream::isReadable - * @uses WellRESTed\Stream\StreamStream + * @covers WellRESTed\Stream\Stream::isReadable + * @uses WellRESTed\Stream\Stream * @dataProvider modeProvider */ public function testReturnsIsReadableForReadableStreams($mode, $readable, $writeable) @@ -243,13 +243,13 @@ class StreamStreamTest extends \PHPUnit_Framework_TestCase } fclose($this->handle); $this->handle = fopen($tmp, $mode); - $stream = new StreamStream($this->handle); + $stream = new Stream($this->handle); $this->assertEquals($readable, $stream->isReadable()); } /** - * @covers WellRESTed\Stream\StreamStream::isWritable - * @uses WellRESTed\Stream\StreamStream + * @covers WellRESTed\Stream\Stream::isWritable + * @uses WellRESTed\Stream\Stream * @dataProvider modeProvider */ public function testReturnsIsWritableForWritableStreams($mode, $readable, $writeable) @@ -260,7 +260,7 @@ class StreamStreamTest extends \PHPUnit_Framework_TestCase } fclose($this->handle); $this->handle = fopen($tmp, $mode); - $stream = new StreamStream($this->handle); + $stream = new Stream($this->handle); $this->assertEquals($writeable, $stream->isWritable()); }