Merge pull request #311 from thekid/feature/streams-value

Make all InputStream & OutputStream implementations implement Value

Author: thekid

src/main/php/io/streams/BufferedInputStream.class.php

@@ -1,19 +1,24 @@
 <?php namespace io\streams;
 
+use lang\Value;
+use util\Comparison;
+
 /**
  * Buffered InputStream
+ *
+ * @test  net.xp_framework.unittest.io.streams.BufferedInputStreamTest
  */
-class BufferedInputStream implements InputStream {
-  protected 
-    $in   = null,
-    $buf  = '',
-    $size = 0;
+class BufferedInputStream implements InputStream, Value {
+  use Comparison;
+
+  protected $in, $size;
+  protected $buf= '';
 
   /**
    * Constructor
    *
-   * @param   io.streams.InputStream in
-   * @param   int size default 512
+   * @param  io.streams.InputStream $in
+   * @param  int $size
    */
   public function __construct($in, $size= 512) {
     $this->in= $in;
@@ -61,6 +66,7 @@ public function available() {
    * @return void
    */
   public function close() {
+    // NOOP
   }
 
   /** @return string */

src/main/php/io/streams/BufferedOutputStream.class.php

@@ -1,16 +1,21 @@
 <?php namespace io\streams;
 
+use lang\Value;
+use util\Comparison;
+
 /**
  * OuputStream that writes to another OutputStream but buffers the
  * results internally. This means not every single byte passed to
  * write() will be written.
+ * 
+ * @test  net.xp_framework.unittest.io.streams.BufferedOutputStreamTest
  */
-class BufferedOutputStream implements OutputStream {
-  protected 
-    $out  = null,
-    $buf  = '',
-    $size = 0;
-  
+class BufferedOutputStream implements OutputStream, Value {
+  use Comparison;
+
+  protected $out, $size;
+  protected $buf= '';
+
   /**
    * Constructor
    *

src/main/php/io/streams/Bz2CompressingOutputStream.class.php

@@ -1,30 +1,37 @@
 <?php namespace io\streams;
 
+use io\IOException;
+use lang\{Value, IllegalArgumentException};
+use util\Comparison;
+
 /**
  * OuputStream that compresses content using bzip2
  *
  * @ext   bz2
  * @test  xp://net.xp_framework.unittest.io.streams.Bz2CompressingOutputStreamTest
  */
-class Bz2CompressingOutputStream implements OutputStream {
-  protected $out= null;
+class Bz2CompressingOutputStream implements OutputStream, Value {
+  use Comparison;
+
+  protected $out;
 
   /**
    * Constructor
    *
-   * @param   io.streams.OutputStream out
-   * @param   int level default 6
-   * @throws  lang.IllegalArgumentException if the level is not between 0 and 9
+   * @param  io.streams.OutputStream $out
+   * @param  int $level
+   * @throws lang.IllegalArgumentException if the level is not between 0 and 9
    */
   public function __construct(OutputStream $out, $level= 6) {
     if ($level < 0 || $level > 9) {
-      throw new \lang\IllegalArgumentException('Level '.$level.' out of range [0..9]');
+      throw new IllegalArgumentException('Level '.$level.' out of range [0..9]');
     }
+
     $this->out= Streams::writeableFd($out);
     if (!stream_filter_append($this->out, 'bzip2.compress', STREAM_FILTER_WRITE, ['blocks' => $level])) {
       fclose($this->out);
       $this->out= null;
-      throw new \io\IOException('Could not append stream filter');
+      throw new IOException('Could not append stream filter');
     }
   }
 

src/main/php/io/streams/Bz2DecompressingInputStream.class.php

@@ -1,23 +1,29 @@
 <?php namespace io\streams;
 
+use io\IOException;
+use lang\Value;
+use util\Comparison;
+
 /**
  * InputStream that decompresses 
  *
  * @ext   bz2
- * @test  xp://net.xp_framework.unittest.io.streams.Bz2DecompressingInputStreamTest
+ * @test  net.xp_framework.unittest.io.streams.Bz2DecompressingInputStreamTest
  */
-class Bz2DecompressingInputStream implements InputStream {
-  protected $in = null;
+class Bz2DecompressingInputStream implements InputStream, Value {
+  use Comparison;
+
+  protected $in;
 
   /**
    * Constructor
    *
-   * @param   io.streams.InputStream in
+   * @param  io.streams.InputStream $in
    */
   public function __construct(InputStream $in) {
     $this->in= Streams::readableFd($in);
     if (!stream_filter_append($this->in, 'bzip2.decompress', STREAM_FILTER_READ)) {
-      throw new \io\IOException('Could not append stream filter');
+      throw new IOException('Could not append stream filter');
     }
   }
 

src/main/php/io/streams/ChannelInputStream.class.php

@@ -1,20 +1,22 @@
 <?php namespace io\streams;
 
 use io\IOException;
+use lang\Value;
+use util\Comparison;
 
 /**
  * Input stream that reads from one of the "stdin", "input" channels
  * provided as PHP input/output streams.
  *
- * @test  xp://net.xp_framework.unittest.io.streams.ChannelStreamTest
+ * @test  net.xp_framework.unittest.io.streams.ChannelStreamTest
  * @see   php://wrappers
- * @see   xp://io.streams.ChannelOutputStream
+ * @see   io.streams.ChannelOutputStream
  */
-class ChannelInputStream implements InputStream {
-  protected
-    $name = null,
-    $fd   = null;
-  
+class ChannelInputStream implements InputStream, Value {
+  use Comparison;
+
+  protected $fd, $name;
+
   /**
    * Constructor
    *
@@ -25,6 +27,7 @@ public function __construct($arg) {
       if (!($this->fd= fopen('php://'.$arg, 'rb'))) {
         throw new IOException('Could not open '.$arg.' channel for reading');
       }
+      $this->name= $arg;
     } else if (is_resource($arg)) {
       $this->fd= $arg;
       $this->name= '#'.(int)$arg;

src/main/php/io/streams/ChannelOutputStream.class.php

@@ -1,19 +1,21 @@
 <?php namespace io\streams;
 
 use io\IOException;
+use lang\Value;
+use util\Comparison;
 
 /**
  * Output stream that writes to one of the "stdout", "stderr", "output"
  * channels provided as PHP input/output streams.
  *
- * @test  xp://net.xp_framework.unittest.io.streams.ChannelStreamTest
+ * @test  net.xp_framework.unittest.io.streams.ChannelStreamTest
  * @see   php://wrappers
- * @see   xp://io.streams.ChannelInputStream
+ * @see   io.streams.ChannelInputStream
  */
-class ChannelOutputStream implements OutputStream {
-  protected
-    $name = null,
-    $fd   = null;
+class ChannelOutputStream implements OutputStream, Value {
+  use Comparison;
+
+  protected $fd, $name;
 
   /**
    * Constructor
@@ -22,9 +24,10 @@ class ChannelOutputStream implements OutputStream {
    */
   public function __construct($arg) {
     if ('stdout' === $arg || 'stderr' === $arg || 'output' === $arg) {
-      if (!($this->fd= fopen('php://'.$arg, 'rb'))) {
-        throw new IOException('Could not open '.$arg.' channel for reading');
+      if (!($this->fd= fopen('php://'.$arg, 'wb'))) {
+        throw new IOException('Could not open '.$arg.' channel for writing');
       }
+      $this->name= $arg;
     } else if (is_resource($arg)) {
       $this->fd= $arg;
       $this->name= '#'.(int)$arg;

src/main/php/io/streams/ConsoleInputStream.class.php

@@ -1,5 +1,8 @@
 <?php namespace io\streams;
 
+use lang\Value;
+use util\Comparison;
+
 /**
  * InputStream that reads from the console
  *
@@ -8,7 +11,9 @@
  * $in= new ConsoleInputStream(STDIN);
  * ```
  */
-class ConsoleInputStream implements InputStream {
+class ConsoleInputStream implements InputStream, Value {
+  use Comparison;
+
   private $descriptor, $close;
 
   /**

src/main/php/io/streams/ConsoleOutputStream.class.php

@@ -1,5 +1,8 @@
 <?php namespace io\streams;
 
+use lang\Value;
+use util\Comparison;
+
 /**
  * OuputStream that writes to the console
  *
@@ -9,7 +12,9 @@
  * $err= new ConsoleOutputStream(STDERR);
  * ```
  */
-class ConsoleOutputStream implements OutputStream {
+class ConsoleOutputStream implements OutputStream, Value {
+  use Comparison;
+
   private $descriptor, $close;
 
   /**

src/main/php/io/streams/DeflatingOutputStream.class.php

@@ -1,12 +1,17 @@
 <?php namespace io\streams;
 
+use lang\Value;
+use util\Comparison;
+
 /**
  * OuputStream that deflates 
  *
  * @ext   zlib
- * @test  xp://net.xp_framework.unittest.io.streams.DeflatingOutputStreamTest
+ * @test  net.xp_framework.unittest.io.streams.DeflatingOutputStreamTest
  */
-class DeflatingOutputStream implements OutputStream {
+class DeflatingOutputStream implements OutputStream, Value {
+  use Comparison;
+
   protected $out= null;
 
   /**

src/main/php/io/streams/FileInputStream.class.php

@@ -1,13 +1,17 @@
 <?php namespace io\streams;
 
 use io\File;
+use lang\Value;
+use util\Comparison;
 
 /**
  * InputStream that reads from a file
  *
  * @test     xp://net.xp_framework.unittest.io.streams.FileInputStreamTest
  */
-class FileInputStream implements InputStream, Seekable {
+class FileInputStream implements InputStream, Seekable, Value {
+  use Comparison;
+
   protected $file;
 
   /**