Merge pull request #191

Author: jmikola

src/GridFS/Bucket.php

@@ -85,10 +85,10 @@ public function __construct(Manager $manager, $databaseName, array $options = []
      * If the files collection document is not found, this method will still
      * attempt to delete orphaned chunks.
      *
-     * @param ObjectId $id ObjectId of the file
+     * @param mixed $id File ID
      * @throws FileNotFoundException
      */
-    public function delete(ObjectId $id)
+    public function delete($id)
     {
         $file = $this->collectionWrapper->findFileById($id);
         $this->collectionWrapper->deleteFileAndChunksById($id);
@@ -101,11 +101,11 @@ public function delete(ObjectId $id)
     /**
      * Writes the contents of a GridFS file to a writable stream.
      *
-     * @param ObjectId $id          ObjectId of the file
+     * @param mixed    $id          File ID
      * @param resource $destination Writable Stream
      * @throws FileNotFoundException
      */
-    public function downloadToStream(ObjectId $id, $destination)
+    public function downloadToStream($id, $destination)
     {
         $file = $this->collectionWrapper->findFileById($id);
 
@@ -136,7 +136,7 @@ public function downloadToStream(ObjectId $id, $destination)
      *  * -2 = the second most recent revision
      *  * -1 = the most recent revision
      *
-     * @param string   $filename    File name
+     * @param string   $filename    Filename
      * @param resource $destination Writable Stream
      * @param array    $options     Download options
      * @throws FileNotFoundException
@@ -208,11 +208,11 @@ public function getIdFromStream($stream)
     /**
      * Opens a readable stream for reading a GridFS file.
      *
-     * @param ObjectId $id ObjectId of the file
+     * @param mixed $id File ID
      * @return resource
      * @throws FileNotFoundException
      */
-    public function openDownloadStream(ObjectId $id)
+    public function openDownloadStream($id)
     {
         $file = $this->collectionWrapper->findFileById($id);
 
@@ -242,7 +242,7 @@ public function openDownloadStream(ObjectId $id)
      *  * -2 = the second most recent revision
      *  * -1 = the most recent revision
      *
-     * @param string $filename File name
+     * @param string $filename Filename
      * @param array  $options  Download options
      * @return resource
      * @throws FileNotFoundException
@@ -268,7 +268,7 @@ public function openDownloadStreamByName($filename, array $options = [])
      *  * chunkSizeBytes (integer): The chunk size in bytes. Defaults to the
      *    bucket's chunk size.
      *
-     * @param string $filename File name
+     * @param string $filename Filename
      * @param array  $options  Upload options
      * @return resource
      */
@@ -291,11 +291,11 @@ public function openUploadStream($filename, array $options = [])
     /**
      * Renames the GridFS file with the specified ID.
      *
-     * @param ObjectId $id          ID of the file to rename
-     * @param string   $newFilename New file name
+     * @param mixed  $id          File ID
+     * @param string $newFilename New filename
      * @throws FileNotFoundException
      */
-    public function rename(ObjectId $id, $newFilename)
+    public function rename($id, $newFilename)
     {
         $updateResult = $this->collectionWrapper->updateFilenameForId($id, $newFilename);
 
@@ -325,10 +325,10 @@ public function rename(ObjectId $id, $newFilename)
      *  * chunkSizeBytes (integer): The chunk size in bytes. Defaults to the
      *    bucket's chunk size.
      *
-     * @param string   $filename File name
+     * @param string   $filename Filename
      * @param resource $source   Readable stream
      * @param array    $options  Stream options
-     * @return ObjectId
+     * @return ObjectId ID of the newly created GridFS file
      * @throws InvalidArgumentException
      */
     public function uploadFromStream($filename, $source, array $options = [])

src/GridFS/WritableStream.php

@@ -48,7 +48,7 @@ class WritableStream
      *    collection document.
      *
      * @param CollectionWrapper $collectionWrapper GridFS collection wrapper
-     * @param string            $filename          File name
+     * @param string            $filename          Filename
      * @param array             $options           Upload options
      * @throws InvalidArgumentException
      */