QA: WS / CS

Author: thekid

src/main/php/io/archive/zip/ZipFileInputStream.class.php

@@ -8,18 +8,15 @@
  * certain length.
  */
 class ZipFileInputStream implements InputStream {
-  protected 
-    $reader      = null,
-    $start       = 0,
-    $pos         = 0,
-    $length      = 0;
+  protected $reader, $start, $length;
+  protected $pos= 0;
 
   /**
    * Constructor
    *
-   * @param   io.archive.zip.AbstractZipReaderImpl reader
-   * @param   int start
-   * @param   int length
+   * @param  io.archive.zip.AbstractZipReaderImpl $reader
+   * @param  int $start
+   * @param  int $length
    */
   public function __construct(AbstractZipReaderImpl $reader, $start, $length) {
     $this->reader= $reader;
@@ -30,16 +27,18 @@ public function __construct(AbstractZipReaderImpl $reader, $start, $length) {
   /**
    * Read a string
    *
-   * @param   int limit default 8192
-   * @return  string
+   * @param  int $limit default 8192
+   * @return string
+   * @throws io.IOException on EOF
    */
   public function read($limit= 8192) {
     if (0 === $this->pos) {
       $this->reader->streamPosition($this->start);
     } else if ($this->pos >= $this->length) {
       throw new IOException('EOF');
     }
-    $chunk= $this->reader->streamRead(min($limit, $this->length- $this->pos));
+
+    $chunk= $this->reader->streamRead(min($limit, $this->length - $this->pos));
     $l= strlen($chunk);
     $this->pos+= $l;
     $this->reader->skip-= $l;
@@ -50,6 +49,7 @@ public function read($limit= 8192) {
    * Returns the number of bytes that can be read from this stream 
    * without blocking.
    *
+   * @return int
    */
   public function available() {
     return $this->pos < $this->length ? $this->reader->streamAvailable() : 0;
@@ -58,6 +58,7 @@ public function available() {
   /**
    * Close this buffer
    *
+   * @return void
    */
   public function close() {
     // NOOP, leave underlying stream open