read - may don`t specify length

IStream.php

@@ -4,8 +4,26 @@
 
 interface IStream
 {
-    public function read($length);
+    /**
+     * @param int $length
+     * @return string|bool
+     */
+    public function read($length = null);
+
+    /**
+     * @return string|bool
+     */
     public function readLine();
+
+    /**
+     * @param string $data
+     * @param int $length
+     * @return int
+     */
     public function write($data, $length = null);
+
+    /**
+     * @return bool
+     */
     public function isEOF();
 }

Stream.php

@@ -9,21 +9,42 @@ class Stream implements IStream
      */
     private $resource;
 
+    /**
+     * @param resource $resource
+     */
     public function __construct($resource)
     {
         $this->resource = $resource;
     }
 
-    public function read($length)
+    /**
+     * {@inheritdoc}
+     */
+    public function read($length = null)
     {
-        return fread($this->resource, $length);
+        if (!is_null($length)) {
+            return fread($this->resource, $length);
+        }
+
+        $result = '';
+        while (!feof($this->resource)) {
+            $result .= fread($this->resource, $this->dataSegment);
+        }
+
+        return $result;
     }
 
+    /**
+     * {@inheritdoc}
+     */
     public function readLine()
     {
         return fgets($this->resource);
     }
 
+    /**
+     * {@inheritdoc}
+     */
     public function write($data, $length = null)
     {
         if (is_null($length)) {
@@ -33,8 +54,13 @@ public function write($data, $length = null)
         return fwrite($this->resource, $data, $length);
     }
 
+    /**
+     * {@inheritdoc}
+     */
     public function isEOF()
     {
         return feof($this->resource);
     }
+
+    private $dataSegment = 10;
 }

StreamContainer.php

@@ -19,14 +19,18 @@ public function __construct(array $config = null)
         }
 
         foreach ($config as $streamName => $streamObj) {
-            if (!$streamObj instanceof IStream) {
+            if (!($streamObj instanceof IStream)) {
                 throw new NotValid($streamObj, $streamName . " don't implement IStream");
             }
 
             $this->streamList[$streamName] = $streamObj;
         }
     }
 
+    /**
+     * @param string $name
+     * @return mixed
+     */
     public function __get($name)
     {
         if (isset($this->streamList[$name])) {

StreamTest.php

@@ -2,36 +2,41 @@
 
 namespace axy\env;
 
+/**
+ * when we read - we read from start of data and remove what we read
+ * when we write - we concatenate to end
+ */
 class StreamTest implements IStream
 {
-    /**
-     * @var string
-     */
-    private $data;
-
     /**
      * @param string $data
      */
     public function __construct($data = '')
     {
-        $this->data = $data;
+        $this->writeData($data);
     }
 
     /**
-     * То что читаем из строки - удаляем
-     *
-     * @param int $length
-     *
-     * @return mixed
+     * {@inheritdoc}
      */
-    public function read($length)
+    public function read($length = null)
     {
+        if (is_null($length)) {
+            $result = $this->data;
+            $this->writeData(null);
+
+            return $result;
+        }
+
         $result = substr($this->data, 0, $length);
-        $this->data = substr($this->data, $length);
+        $this->writeData(substr($this->data, $length));
 
         return $result;
     }
 
+    /**
+     * {@inheritdoc}
+     */
     public function readLine()
     {
         if ($this->isEOF()) {
@@ -46,11 +51,14 @@ public function readLine()
         }
 
         $lineLength = strlen($result);
-        $this->data = substr($this->data, $lineLength);
+        $this->writeData(substr($this->data, $lineLength));
 
         return $result;
     }
 
+    /**
+     * {@inheritdoc}
+     */
     public function write($data, $length = null)
     {
         if (is_null($length)) {
@@ -59,13 +67,33 @@ public function write($data, $length = null)
             $write = substr($data, 0, $length);
         }
 
-        $this->data .= $write;
+        $this->writeData($this->data . $write);
 
         return strlen($write);
     }
 
+    /**
+     * {@inheritdoc}
+     */
     public function isEOF()
     {
-        return $this->data === '' || $this->data === false;
+        return $this->data === '';
+    }
+
+    /**
+     * @param mixed $data
+     */
+    private function writeData($data)
+    {
+        if (!is_string($data)) {
+            $data = '';
+        }
+
+        $this->data = $data;
     }
+
+    /**
+     * @var string
+     */
+    private $data;
 }

tests/EnvFunctionsTest.php

@@ -8,7 +8,6 @@
 
 use axy\env\Env;
 use axy\env\Stream;
-use axy\env\StreamContainer;
 
 /**
  * @SuppressWarnings(PHPMD.TooManyPublicMethods)
@@ -245,6 +244,22 @@ public function testStreamRead()
         $this->assertSame($string, $readResult);
     }
 
+    public function testStreamReadWithoutLength()
+    {
+        $string = "one\ntwo\nthree";
+        $resource = $this->getMemoryResourceWithString($string);
+        $stream = new Stream($resource);
+
+        $env = new Env([
+            'streams' => [
+                'stdin' => $stream
+            ]
+        ]);
+
+        $this->assertSame($string, $env->streams->stdin->read());
+    }
+
+
     public function testReadLine()
     {
         $string = "one line\ntwo line";

tests/StreamTestTest.php

@@ -22,6 +22,20 @@ public function testRead()
         $this->assertSame($string, $result);
     }
 
+    public function testReadWithoutLength()
+    {
+        $string = "one\ntwo\nthree";
+        $streamTest = new StreamTest($string);
+
+        $env = new Env([
+            'streams' => [
+                'stdin' => $streamTest
+            ]
+        ]);
+
+        $this->assertSame($string, $env->streams->stdin->read());
+    }
+
     public function testReadLine()
     {
         $string = "One line\nTwo line";