Skip to content
This repository has been archived by the owner on Jan 16, 2019. It is now read-only.

Commit

Permalink
Merge pull request #48 from mikey179/master
Browse files Browse the repository at this point in the history
final work for 3.0.0
  • Loading branch information
mikey179 committed Jul 31, 2014
2 parents 960d8a1 + 2e57948 commit 48f030e
Show file tree
Hide file tree
Showing 19 changed files with 179 additions and 173 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
3.0.0 (2014-06-??)
3.0.0 (2014-07-31)
------------------

### BC breaks
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"stubbles/input": "~3.0"
},
"require-dev": {
"mikey179/vfsStream": "~1.2",
"mikey179/vfsStream": "~1.3",
"phpunit/phpunit": "~4.1"
},
"autoload": {
Expand Down
100 changes: 52 additions & 48 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions src/main/php/CommandInputStream.php
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class CommandInputStream extends ResourceInputStream
*
* @param resource $resource
* @param string $command optional
* @throws IllegalArgumentException
* @throws \stubbles\lang\exception\IllegalArgumentException
*/
public function __construct($resource, $command = null)
{
Expand Down Expand Up @@ -61,8 +61,8 @@ public function __destruct()
*
* @param int $length optional max amount of bytes to read
* @return string
* @throws IllegalStateException
* @throws IOException
* @throws \stubbles\lang\exception\IllegalStateException
* @throws \stubbles\lang\exception\IOException
*/
public function read($length = 8192)
{
Expand All @@ -85,7 +85,7 @@ public function read($length = 8192)
/**
* closes the stream
*
* @throws RuntimeException
* @throws \stubbles\lang\exception\RuntimeException
*/
public function close()
{
Expand Down
Loading

0 comments on commit 48f030e

Please sign in to comment.