Merge pull request #301

Author: jmikola

src/GridFS/Bucket.php

@@ -529,8 +529,8 @@ private function getRawFileDocumentForStream($stream)
 
         $metadata = stream_get_meta_data($stream);
 
-        if (!$metadata['wrapper_data'] instanceof StreamWrapper) {
-            throw InvalidArgumentException::invalidType('$stream wrapper data', $metadata['wrapper_data'], 'MongoDB\Driver\GridFS\StreamWrapper');
+        if ( ! isset ($metadata['wrapper_data']) || ! $metadata['wrapper_data'] instanceof StreamWrapper) {
+            throw InvalidArgumentException::invalidType('$stream wrapper data', isset($metadata['wrapper_data']) ? $metadata['wrapper_data'] : null, 'MongoDB\Driver\GridFS\StreamWrapper');
         }
 
         return $metadata['wrapper_data']->getFile();

tests/GridFS/BucketFunctionalTest.php

@@ -194,7 +194,7 @@ public function testDownloadToStreamShouldRequireDestinationStream($destination)
 
     public function provideInvalidStreamValues()
     {
-        return $this->wrapValuesForDataProvider([null, 123, 'foo', [], hash_init('md5')]);
+        return $this->wrapValuesForDataProvider($this->getInvalidStreamValues());
     }
 
     /**
@@ -407,13 +407,18 @@ public function testGetFileDocumentForStreamWithWritableStream()
 
     /**
      * @expectedException MongoDB\Exception\InvalidArgumentException
-     * @dataProvider provideInvalidStreamValues
+     * @dataProvider provideInvalidGridFSStreamValues
      */
-    public function testGetFileDocumentForStreamShouldRequireStreamResource($stream)
+    public function testGetFileDocumentForStreamShouldRequireGridFSStreamResource($stream)
     {
         $this->bucket->getFileDocumentForStream($stream);
     }
 
+    public function provideInvalidGridFSStreamValues()
+    {
+        return $this->wrapValuesForDataProvider(array_merge($this->getInvalidStreamValues(), [$this->createStream()]));
+    }
+
     public function testGetFileIdForStreamUsesTypeMap()
     {
         $stream = $this->bucket->openUploadStream('filename', ['_id' => ['x' => 1]]);
@@ -441,9 +446,9 @@ public function testGetFileIdForStreamWithWritableStream()
 
     /**
      * @expectedException MongoDB\Exception\InvalidArgumentException
-     * @dataProvider provideInvalidStreamValues
+     * @dataProvider provideInvalidGridFSStreamValues
      */
-    public function testGetFileIdForStreamShouldRequireStreamResource($stream)
+    public function testGetFileIdForStreamShouldRequireGridFSStreamResource($stream)
     {
         $this->bucket->getFileIdForStream($stream);
     }
@@ -714,4 +719,14 @@ private function assertIndexExists($collectionName, $indexName, $callback = null
             call_user_func($callback, $foundIndex);
         }
     }
+
+    /**
+     * Return a list of invalid stream values.
+     *
+     * @return array
+     */
+    private function getInvalidStreamValues()
+    {
+        return [null, 123, 'foo', [], hash_init('md5')];
+    }
 }