-
-
Notifications
You must be signed in to change notification settings - Fork 2k
gh-1838 added checks for pipe streams #1872
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
1431b30
gh-1838 added checks for pipe streams
llvdl e60867c
gh-1838 added tests
llvdl 6503787
gh-1838 added Stream::isSeekableForward and seekForward
llvdl 89a18a3
gh-1838 removed check for isPipe from Stream::isSeekable
llvdl 0199b88
gh-1838 fixes for hhvm
llvdl 2e5a54b
gh-1838 fixed comment
llvdl 3882722
gh-1838 refactor: renamed member variable
llvdl File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,158 @@ | ||
| <?php | ||
| /** | ||
| * Slim Framework (http://slimframework.com) | ||
| * | ||
| * @link https://github.com/slimphp/Slim | ||
| * @copyright Copyright (c) 2011-2016 Josh Lockhart | ||
| * @license https://github.com/slimphp/Slim/blob/master/LICENSE.md (MIT License) | ||
| */ | ||
| namespace Slim\Tests\Http; | ||
|
|
||
| use Slim\Http\Stream; | ||
|
|
||
| class StreamTest extends \PHPUnit_Framework_TestCase | ||
| { | ||
| /** | ||
| * @var resource pipe stream file handle | ||
| */ | ||
| private $pipeFh; | ||
|
|
||
| /** | ||
| * @var Stream | ||
| */ | ||
| private $pipeStream; | ||
|
|
||
| public function tearDown() | ||
| { | ||
| if ($this->pipeFh != null) { | ||
| stream_get_contents($this->pipeFh); // prevent broken pipe error message | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * @covers Slim\Http\Stream::isPipe | ||
| */ | ||
| public function testIsPipe() | ||
| { | ||
| $this->openPipeStream(); | ||
|
|
||
| $this->assertTrue($this->pipeStream->isPipe()); | ||
|
|
||
| $this->pipeStream->detach(); | ||
| $this->assertFalse($this->pipeStream->isPipe()); | ||
|
|
||
| $fhFile = fopen(__FILE__, 'r'); | ||
| $fileStream = new Stream($fhFile); | ||
| $this->assertFalse($fileStream->isPipe()); | ||
| } | ||
|
|
||
| /** | ||
| * @covers Slim\Http\Stream::isReadable | ||
| */ | ||
| public function testIsPipeReadable() | ||
| { | ||
| $this->openPipeStream(); | ||
|
|
||
| $this->assertTrue($this->pipeStream->isReadable()); | ||
| } | ||
|
|
||
| /** | ||
| * @covers Slim\Http\Stream::isSeekable | ||
| */ | ||
| public function testPipeIsNotSeekable() | ||
| { | ||
| $this->openPipeStream(); | ||
|
|
||
| $this->assertFalse($this->pipeStream->isSeekable()); | ||
| } | ||
|
|
||
| /** | ||
| * @covers Slim\Http\Stream::seek | ||
| * @expectedException \RuntimeException | ||
| */ | ||
| public function testCannotSeekPipe() | ||
| { | ||
| $this->openPipeStream(); | ||
|
|
||
| $this->pipeStream->seek(0); | ||
| } | ||
|
|
||
| /** | ||
| * @covers Slim\Http\Stream::tell | ||
| * @expectedException \RuntimeException | ||
| */ | ||
| public function testCannotTellPipe() | ||
| { | ||
| $this->openPipeStream(); | ||
|
|
||
| $this->pipeStream->tell(); | ||
| } | ||
|
|
||
| /** | ||
| * @covers Slim\Http\Stream::rewind | ||
| * @expectedException \RuntimeException | ||
| */ | ||
| public function testCannotRewindPipe() | ||
| { | ||
| $this->openPipeStream(); | ||
|
|
||
| $this->pipeStream->rewind(); | ||
| } | ||
|
|
||
| /** | ||
| * @covers Slim\Http\Stream::getSize | ||
| */ | ||
| public function testPipeGetSizeYieldsNull() | ||
| { | ||
| $this->openPipeStream(); | ||
|
|
||
| $this->assertNull($this->pipeStream->getSize()); | ||
| } | ||
|
|
||
| /** | ||
| * @covers Slim\Http\Stream::close | ||
| */ | ||
| public function testClosePipe() | ||
| { | ||
| $this->openPipeStream(); | ||
|
|
||
| stream_get_contents($this->pipeFh); // prevent broken pipe error message | ||
| $this->pipeStream->close(); | ||
| $this->pipeFh = null; | ||
|
|
||
| $this->assertFalse($this->pipeStream->isPipe()); | ||
| } | ||
|
|
||
| /** | ||
| * @covers Slim\Http\Stream::__toString | ||
| */ | ||
| public function testPipeToString() | ||
| { | ||
| $this->openPipeStream(); | ||
|
|
||
| $this->assertSame('', (string) $this->pipeStream); | ||
| } | ||
|
|
||
| /** | ||
| * @covers Slim\Http\Stream::getContents | ||
| */ | ||
|
|
||
| public function testPipeGetContents() | ||
| { | ||
| $this->openPipeStream(); | ||
|
|
||
| $contents = trim($this->pipeStream->getContents()); | ||
| $this->assertSame('12', $contents); | ||
| } | ||
|
|
||
| /** | ||
| * Opens the pipe stream | ||
| * | ||
| * @see StreamTest::pipeStream | ||
| */ | ||
| private function openPipeStream() | ||
| { | ||
| $this->pipeFh = popen('echo 12', 'r'); | ||
| $this->pipeStream = new Stream($this->pipeFh); | ||
| } | ||
| } |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you add info on what this particular mode means?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I expanded the comment