Merge pull request #219

Author: jmikola

src/GridFS/StreamWrapper.php

@@ -2,6 +2,8 @@
 
 namespace MongoDB\GridFS;
 
+use Exception;
+
 /**
  * Stream wrapper for reading and writing a GridFS file.
  *
@@ -57,6 +59,10 @@ public function stream_close()
      */
     public function stream_eof()
     {
+        if ( ! $this->stream instanceof ReadableStream) {
+            return false;
+        }
+
         return $this->stream->isEOF();
     }
 
@@ -93,12 +99,20 @@ public function stream_open($path, $mode, $options, &$openedPath)
      * 
      * @see http://php.net/manual/en/streamwrapper.stream-read.php
      * @param integer $count Number of bytes to read
-     * @return string 
+     * @return string
      */
     public function stream_read($count)
     {
-        // TODO: Ensure that $this->stream is a ReadableStream
-        return $this->stream->downloadNumBytes($count);
+        if ( ! $this->stream instanceof ReadableStream) {
+            return '';
+        }
+
+        try {
+            return $this->stream->downloadNumBytes($count);
+        } catch (Exception $e) {
+            trigger_error(sprintf('%s: %s', get_class($e), $e->getMessage()), \E_USER_WARNING);
+            return false;
+        }
     }
 
     /**
@@ -122,14 +136,20 @@ public function stream_stat()
      *
      * @see http://php.net/manual/en/streamwrapper.stream-write.php
      * @param string $data Data to write
-     * @return integer The number of bytes successfully stored
+     * @return integer The number of bytes written
      */
     public function stream_write($data)
     {
-        // TODO: Ensure that $this->stream is a WritableStream
-        $this->stream->insertChunks($data);
+        if ( ! $this->stream instanceof WritableStream) {
+            return 0;
+        }
 
-        return strlen($data);
+        try {
+            return $this->stream->insertChunks($data);
+        } catch (Exception $e) {
+            trigger_error(sprintf('%s: %s', get_class($e), $e->getMessage()), \E_USER_WARNING);
+            return false;
+        }
     }
 
     /**

src/GridFS/WritableStream.php

@@ -184,11 +184,6 @@ public function insertChunks($toWrite)
         return $readBytes;
     }
 
-    public function isEOF()
-    {
-        return $this->isClosed;
-    }
-
     private function abort()
     {
         $this->collectionWrapper->deleteChunksByFilesId($this->file['_id']);

tests/GridFS/BucketFunctionalTest.php

@@ -125,7 +125,7 @@ public function testDeleteStillRemovesChunksIfFileDoesNotExist($input, $expected
     }
 
     /**
-     * @expectedException MongoDB\GridFS\Exception\CorruptFileException
+     * @expectedException PHPUnit_Framework_Error_Warning
      */
     public function testDownloadingFileWithMissingChunk()
     {
@@ -137,7 +137,7 @@ public function testDownloadingFileWithMissingChunk()
     }
 
     /**
-     * @expectedException MongoDB\GridFS\Exception\CorruptFileException
+     * @expectedException PHPUnit_Framework_Error_Warning
      */
     public function testDownloadingFileWithUnexpectedChunkIndex()
     {
@@ -152,7 +152,7 @@ public function testDownloadingFileWithUnexpectedChunkIndex()
     }
 
     /**
-     * @expectedException MongoDB\GridFS\Exception\CorruptFileException
+     * @expectedException PHPUnit_Framework_Error_Warning
      */
     public function testDownloadingFileWithUnexpectedChunkSize()
     {

tests/GridFS/SpecFunctionalTest.php

@@ -6,9 +6,9 @@
 use MongoDB\BSON\Binary;
 use MongoDB\BSON\ObjectId;
 use MongoDB\BSON\UTCDateTime;
-use MongoDB\Exception\RuntimeException;
 use MongoDB\Operation\BulkWrite;
 use DateTime;
+use Exception;
 use IteratorIterator;
 use LogicException;
 use MultipleIterator;
@@ -50,7 +50,7 @@ public function testSpecification(array $initialData, array $test)
 
         try {
             $result = $this->executeAct($test['act']);
-        } catch (RuntimeException $e) {
+        } catch (Exception $e) {
             $result = $e;
         }
 
@@ -333,7 +333,10 @@ private function getExceptionClassForError($error)
 
             case 'ChunkIsMissing':
             case 'ChunkIsWrongSize':
-                return 'MongoDB\GridFS\Exception\CorruptFileException';
+                /* Although ReadableStream throws a CorruptFileException, the
+                 * stream wrapper will convert it to a PHP error of type
+                 * E_USER_WARNING. */
+                return 'PHPUnit_Framework_Error_Warning';
 
             default:
                 throw new LogicException('Unsupported error: ' . $error);