Clientbase
/
wellrested
mirror of https://github.com/basemaster/wellrested.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename StreamStream Stream

This commit is contained in:
PJ Dietz 2015-04-02 18:45:11 -04:00
parent 4502df5c1c
commit bd5902415a
6 changed files with 66 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Message/ServerRequest.php
View File

@ -4,7 +4,7 @@ namespace WellRESTed\Message;
use Psr\Http\Message\ServerRequestInterface; use Psr\Http\Message\ServerRequestInterface;
use Psr\Http\Message\StreamableInterface; use Psr\Http\Message\StreamableInterface;
use WellRESTed\Stream\StreamStream; use WellRESTed\Stream\Stream;
class ServerRequest extends Request implements ServerRequestInterface class ServerRequest extends Request implements ServerRequestInterface
{ {
@ -334,7 +334,7 @@ class ServerRequest extends Request implements ServerRequestInterface
*/ */
protected function getStreamForBody() protected function getStreamForBody()
{ {
return new StreamStream(fopen("php://input", "r")); return new Stream(fopen("php://input", "r"));
} }
/** /**

2
src/Stream/StreamStream.php → src/Stream/Stream.php
View File

@ -4,7 +4,7 @@ namespace WellRESTed\Stream;
use Psr\Http\Message\StreamableInterface; use Psr\Http\Message\StreamableInterface;
class StreamStream implements StreamableInterface class Stream implements StreamableInterface
{ {
/** @var resource */ /** @var resource */
private $handle; private $handle;

2
src/Stream/StringStream.php
View File

@ -2,7 +2,7 @@
namespace WellRESTed\Stream; namespace WellRESTed\Stream;
class StringStream extends StreamStream class StringStream extends Stream
{ {
public function __construct($string = "") public function __construct($string = "")
{ {

2
test/tests/unit/Message/ServerRequestTest.php
View File

@ -9,7 +9,7 @@ use WellRESTed\Message\ServerRequest;
* @uses WellRESTed\Message\Request * @uses WellRESTed\Message\Request
* @uses WellRESTed\Message\Message * @uses WellRESTed\Message\Message
* @uses WellRESTed\Message\HeaderCollection * @uses WellRESTed\Message\HeaderCollection
* @uses WellRESTed\Stream\StreamStream * @uses WellRESTed\Stream\Stream
*/ */
class ServerRequestTest extends \PHPUnit_Framework_TestCase class ServerRequestTest extends \PHPUnit_Framework_TestCase
{ {

2
test/tests/unit/Stream/StingStreamTest.php
View File

@ -6,7 +6,7 @@ use WellRESTed\Stream\StringStream;
/** /**
* @covers WellRESTed\Stream\StringStream * @covers WellRESTed\Stream\StringStream
* @uses WellRESTed\Stream\StreamStream * @uses WellRESTed\Stream\Stream
*/ */
class StringStreamTest extends \PHPUnit_Framework_TestCase class StringStreamTest extends \PHPUnit_Framework_TestCase
{ {

120
test/tests/unit/Stream/StreamStreamTest.php
View File

@ -2,9 +2,9 @@
namespace WellRESTed\Test\Stream; 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 $handle;
private $content = "Hello, world!"; 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() public function testCreatesInstance()
{ {
$stream = new StreamStream($this->handle); $stream = new Stream($this->handle);
$this->assertNotNull($stream); $this->assertNotNull($stream);
} }
/** /**
* @covers WellRESTed\Stream\StreamStream::__construct() * @covers WellRESTed\Stream\Stream::__construct()
* @expectedException \InvalidArgumentException * @expectedException \InvalidArgumentException
*/ */
public function testThrowsExceptiondWithoutHandle() public function testThrowsExceptiondWithoutHandle()
{ {
new StreamStream(null); new Stream(null);
} }
/** /**
* @covers WellRESTed\Stream\StreamStream::__toString() * @covers WellRESTed\Stream\Stream::__toString()
* @uses WellRESTed\Stream\StreamStream * @uses WellRESTed\Stream\Stream
*/ */
public function testCastsToString() public function testCastsToString()
{ {
@ -52,13 +52,13 @@ class StreamStreamTest extends \PHPUnit_Framework_TestCase
fwrite($h, $content); fwrite($h, $content);
rewind($h); rewind($h);
$stream = new StreamStream($h); $stream = new Stream($h);
$this->assertEquals($content, (string) $stream); $this->assertEquals($content, (string) $stream);
} }
/** /**
* @covers WellRESTed\Stream\StreamStream::__toString() * @covers WellRESTed\Stream\Stream::__toString()
* @uses WellRESTed\Stream\StreamStream * @uses WellRESTed\Stream\Stream
*/ */
public function testRewindsBeforeCastingToString() public function testRewindsBeforeCastingToString()
{ {
@ -67,71 +67,71 @@ class StreamStreamTest extends \PHPUnit_Framework_TestCase
$h = fopen("php://memory", "w+"); $h = fopen("php://memory", "w+");
fwrite($h, $content); fwrite($h, $content);
$stream = new StreamStream($h); $stream = new Stream($h);
$this->assertEquals($content, (string) $stream); $this->assertEquals($content, (string) $stream);
} }
/** /**
* @covers WellRESTed\Stream\StreamStream::close() * @covers WellRESTed\Stream\Stream::close()
* @uses WellRESTed\Stream\StreamStream * @uses WellRESTed\Stream\Stream
*/ */
public function testClosesHandle() public function testClosesHandle()
{ {
$stream = new StreamStream($this->handle); $stream = new Stream($this->handle);
$stream->close(); $stream->close();
$this->assertFalse(is_resource($this->handle)); $this->assertFalse(is_resource($this->handle));
} }
/** /**
* @covers WellRESTed\Stream\StreamStream::detach() * @covers WellRESTed\Stream\Stream::detach()
* @uses WellRESTed\Stream\StreamStream * @uses WellRESTed\Stream\Stream
*/ */
public function testDetachReturnsHandle() public function testDetachReturnsHandle()
{ {
$stream = new StreamStream($this->handle); $stream = new Stream($this->handle);
$h = $stream->detach(); $h = $stream->detach();
$this->assertSame($this->handle, $h); $this->assertSame($this->handle, $h);
} }
/** /**
* @covers WellRESTed\Stream\StreamStream::detach() * @covers WellRESTed\Stream\Stream::detach()
* @uses WellRESTed\Stream\StreamStream * @uses WellRESTed\Stream\Stream
*/ */
public function testDetachUnsetsInstanceVariable() public function testDetachUnsetsInstanceVariable()
{ {
$stream = new StreamStream($this->handle); $stream = new Stream($this->handle);
$stream->detach(); $stream->detach();
$this->assertNull($stream->detach()); $this->assertNull($stream->detach());
} }
/** /**
* @covers WellRESTed\Stream\StreamStream::getSize * @covers WellRESTed\Stream\Stream::getSize
* @uses WellRESTed\Stream\StreamStream * @uses WellRESTed\Stream\Stream
*/ */
public function testReturnsNullForSize() public function testReturnsNullForSize()
{ {
$stream = new StreamStream($this->handle); $stream = new Stream($this->handle);
$this->assertNull($stream->getSize()); $this->assertNull($stream->getSize());
} }
/** /**
* @covers WellRESTed\Stream\StreamStream::tell * @covers WellRESTed\Stream\Stream::tell
* @uses WellRESTed\Stream\StreamStream * @uses WellRESTed\Stream\Stream
*/ */
public function testTellReturnsHandlePosition() public function testTellReturnsHandlePosition()
{ {
$stream = new StreamStream($this->handle); $stream = new Stream($this->handle);
fseek($this->handle, 10); fseek($this->handle, 10);
$this->assertEquals(10, $stream->tell()); $this->assertEquals(10, $stream->tell());
} }
/** /**
* @covers WellRESTed\Stream\StreamStream::eof * @covers WellRESTed\Stream\Stream::eof
* @uses WellRESTed\Stream\StreamStream * @uses WellRESTed\Stream\Stream
*/ */
public function testReturnsOef() public function testReturnsOef()
{ {
$stream = new StreamStream($this->handle); $stream = new Stream($this->handle);
$stream->rewind(); $stream->rewind();
$this->assertFalse($stream->eof()); $this->assertFalse($stream->eof());
$stream->getContents(); $stream->getContents();
@ -139,100 +139,100 @@ class StreamStreamTest extends \PHPUnit_Framework_TestCase
} }
/** /**
* @covers WellRESTed\Stream\StreamStream::isSeekable * @covers WellRESTed\Stream\Stream::isSeekable
* @uses WellRESTed\Stream\StreamStream * @uses WellRESTed\Stream\Stream
*/ */
public function testReadsSeekableStatusFromMetadata() public function testReadsSeekableStatusFromMetadata()
{ {
$stream = new StreamStream($this->handle); $stream = new Stream($this->handle);
$metadata = stream_get_meta_data($this->handle); $metadata = stream_get_meta_data($this->handle);
$seekable = $metadata["seekable"] == 1; $seekable = $metadata["seekable"] == 1;
$this->assertEquals($seekable, $stream->isSeekable()); $this->assertEquals($seekable, $stream->isSeekable());
} }
/** /**
* @covers WellRESTed\Stream\StreamStream::seek * @covers WellRESTed\Stream\Stream::seek
* @uses WellRESTed\Stream\StreamStream * @uses WellRESTed\Stream\Stream
*/ */
public function testSeeksToPosition() public function testSeeksToPosition()
{ {
$stream = new StreamStream($this->handle); $stream = new Stream($this->handle);
$stream->seek(10); $stream->seek(10);
$this->assertEquals(10, ftell($this->handle)); $this->assertEquals(10, ftell($this->handle));
} }
/** /**
* @covers WellRESTed\Stream\StreamStream::rewind * @covers WellRESTed\Stream\Stream::rewind
* @uses WellRESTed\Stream\StreamStream * @uses WellRESTed\Stream\Stream
*/ */
public function testRewindReturnsToBeginning() public function testRewindReturnsToBeginning()
{ {
$stream = new StreamStream($this->handle); $stream = new Stream($this->handle);
$stream->seek(10); $stream->seek(10);
$stream->rewind(); $stream->rewind();
$this->assertEquals(0, ftell($this->handle)); $this->assertEquals(0, ftell($this->handle));
} }
/** /**
* @covers WellRESTed\Stream\StreamStream::write * @covers WellRESTed\Stream\Stream::write
* @uses WellRESTed\Stream\StreamStream * @uses WellRESTed\Stream\Stream
*/ */
public function testWritesToHandle() public function testWritesToHandle()
{ {
$message = "\nThis is a stream."; $message = "\nThis is a stream.";
$stream = new StreamStream($this->handle); $stream = new Stream($this->handle);
$stream->write($message); $stream->write($message);
$this->assertEquals($this->content . $message, (string) $stream); $this->assertEquals($this->content . $message, (string) $stream);
} }
/** /**
* @covers WellRESTed\Stream\StreamStream::read * @covers WellRESTed\Stream\Stream::read
* @uses WellRESTed\Stream\StreamStream * @uses WellRESTed\Stream\Stream
*/ */
public function testReadsFromStream() public function testReadsFromStream()
{ {
$stream = new StreamStream($this->handle); $stream = new Stream($this->handle);
$stream->seek(7); $stream->seek(7);
$string = $stream->read(5); $string = $stream->read(5);
$this->assertEquals("world", $string); $this->assertEquals("world", $string);
} }
/** /**
* @covers WellRESTed\Stream\StreamStream::getContents * @covers WellRESTed\Stream\Stream::getContents
* @uses WellRESTed\Stream\StreamStream * @uses WellRESTed\Stream\Stream
*/ */
public function testReadsToEnd() public function testReadsToEnd()
{ {
$stream = new StreamStream($this->handle); $stream = new Stream($this->handle);
$stream->seek(7); $stream->seek(7);
$string = $stream->getContents(); $string = $stream->getContents();
$this->assertEquals("world!", $string); $this->assertEquals("world!", $string);
} }
/** /**
* @covers WellRESTed\Stream\StreamStream::getMetadata * @covers WellRESTed\Stream\Stream::getMetadata
* @uses WellRESTed\Stream\StreamStream * @uses WellRESTed\Stream\Stream
*/ */
public function testReturnsMetadataArray() public function testReturnsMetadataArray()
{ {
$stream = new StreamStream($this->handle); $stream = new Stream($this->handle);
$this->assertEquals(stream_get_meta_data($this->handle), $stream->getMetadata()); $this->assertEquals(stream_get_meta_data($this->handle), $stream->getMetadata());
} }
/** /**
* @covers WellRESTed\Stream\StreamStream::getMetadata * @covers WellRESTed\Stream\Stream::getMetadata
* @uses WellRESTed\Stream\StreamStream * @uses WellRESTed\Stream\Stream
*/ */
public function testReturnsMetadataItem() public function testReturnsMetadataItem()
{ {
$stream = new StreamStream($this->handle); $stream = new Stream($this->handle);
$metadata = stream_get_meta_data($this->handle); $metadata = stream_get_meta_data($this->handle);
$this->assertEquals($metadata["mode"], $stream->getMetadata("mode")); $this->assertEquals($metadata["mode"], $stream->getMetadata("mode"));
} }
/** /**
* @covers WellRESTed\Stream\StreamStream::isReadable * @covers WellRESTed\Stream\Stream::isReadable
* @uses WellRESTed\Stream\StreamStream * @uses WellRESTed\Stream\Stream
* @dataProvider modeProvider * @dataProvider modeProvider
*/ */
public function testReturnsIsReadableForReadableStreams($mode, $readable, $writeable) public function testReturnsIsReadableForReadableStreams($mode, $readable, $writeable)
@ -243,13 +243,13 @@ class StreamStreamTest extends \PHPUnit_Framework_TestCase
} }
fclose($this->handle); fclose($this->handle);
$this->handle = fopen($tmp, $mode); $this->handle = fopen($tmp, $mode);
$stream = new StreamStream($this->handle); $stream = new Stream($this->handle);
$this->assertEquals($readable, $stream->isReadable()); $this->assertEquals($readable, $stream->isReadable());
} }
/** /**
* @covers WellRESTed\Stream\StreamStream::isWritable * @covers WellRESTed\Stream\Stream::isWritable
* @uses WellRESTed\Stream\StreamStream * @uses WellRESTed\Stream\Stream
* @dataProvider modeProvider * @dataProvider modeProvider
*/ */
public function testReturnsIsWritableForWritableStreams($mode, $readable, $writeable) public function testReturnsIsWritableForWritableStreams($mode, $readable, $writeable)
@ -260,7 +260,7 @@ class StreamStreamTest extends \PHPUnit_Framework_TestCase
} }
fclose($this->handle); fclose($this->handle);
$this->handle = fopen($tmp, $mode); $this->handle = fopen($tmp, $mode);
$stream = new StreamStream($this->handle); $stream = new Stream($this->handle);
$this->assertEquals($writeable, $stream->isWritable()); $this->assertEquals($writeable, $stream->isWritable());
} }