Completed
Pull Request — master (#22)
by Andreas
53:11 queued 16:49
created
lib/Mongo/MongoGridFSFile.php 2 patches
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -126,6 +126,9 @@
 block discarded – undo
126 126
         );
127 127
     }
128 128
 
129
+    /**
130
+     * @param resource $handle
131
+     */
129 132
     private function writeFromRessource($handle)
130 133
     {
131 134
 
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -75,7 +75,7 @@
 block discarded – undo
75 75
             $filename = 'file';
76 76
         }
77 77
 
78
-        if (! $handle = fopen($filename, 'w')) {
78
+        if ( ! $handle = fopen($filename, 'w')) {
79 79
             trigger_error(E_ERROR, 'Can not open the destination file');
80 80
             return 0;
81 81
         }
Please login to merge, or discard this patch.
lib/Mongo/MongoGridFS.php 2 patches
Doc Comments   +5 added lines, -6 removed lines patch added patch discarded remove patch
@@ -106,7 +106,6 @@  discard block
 block discarded – undo
106 106
      * @link http://php.net/manual/en/mongogridfs.find.php
107 107
      * @param array $query The query
108 108
      * @param array $fields Fields to return
109
-     * @param array $options Options for the find command
110 109
      * @return MongoGridFSCursor A MongoGridFSCursor
111 110
      */
112 111
     public function find(array $query = [], array $fields = [])
@@ -155,7 +154,7 @@  discard block
 block discarded – undo
155 154
      * @param string $filename The name of the file
156 155
      * @param array $extra Other metadata to add to the file saved
157 156
      * @param array $options An array of options for the insert operations executed against the chunks and files collections.
158
-     * @return mixed Returns the _id of the saved object
157
+     * @return MongoId Returns the _id of the saved object
159 158
      */
160 159
     public function put($filename, array $extra = [], array $options = [])
161 160
     {
@@ -190,7 +189,7 @@  discard block
 block discarded – undo
190 189
      * @param string $bytes A string of bytes to store
191 190
      * @param array $extra Other metadata to add to the file saved
192 191
      * @param array $options Options for the store. "safe": Check that this store succeeded
193
-     * @return mixed The _id of the object saved
192
+     * @return MongoId The _id of the object saved
194 193
      */
195 194
     public function storeBytes($bytes, array $extra = [], array $options = [])
196 195
     {
@@ -214,7 +213,7 @@  discard block
 block discarded – undo
214 213
      * @param string $filename The name of the file
215 214
      * @param array $extra Other metadata to add to the file saved
216 215
      * @param array $options Options for the store. "safe": Check that this store succeeded
217
-     * @return mixed Returns the _id of the saved object
216
+     * @return MongoId Returns the _id of the saved object
218 217
      * @throws MongoGridFSException
219 218
      * @throws Exception
220 219
      */
@@ -265,7 +264,7 @@  discard block
 block discarded – undo
265 264
      * @link http://www.php.net/manual/en/mongogridfs.storeupload.php
266 265
      * @param string $name The name attribute of the uploaded file, from <input type="file" name="something"/>.
267 266
      * @param array $metadata An array of extra fields for the uploaded file.
268
-     * @return mixed Returns the _id of the uploaded file.
267
+     * @return null|MongoId Returns the _id of the uploaded file.
269 268
      * @throws MongoGridFSException
270 269
      */
271 270
     public function storeUpload($name, array $metadata = [])
@@ -388,7 +387,7 @@  discard block
 block discarded – undo
388 387
     /**
389 388
      * Returns the MD5 string for a file previously stored to the database
390 389
      *
391
-     * @param $id
390
+     * @param MongoId $id
392 391
      * @return string
393 392
      */
394 393
     private function getMd5ForFile($id)
Please login to merge, or discard this patch.
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -231,10 +231,10 @@  discard block
 block discarded – undo
231 231
             ];
232 232
 
233 233
             $handle = fopen($filename, 'r');
234
-            if (! $handle) {
234
+            if ( ! $handle) {
235 235
                 throw new MongoGridFSException('could not open file: ' . $filename);
236 236
             }
237
-        } elseif (! is_resource($filename)) {
237
+        } elseif ( ! is_resource($filename)) {
238 238
             throw new \Exception('first argument must be a string or stream resource');
239 239
         } else {
240 240
             $handle = $filename;
@@ -245,10 +245,10 @@  discard block
 block discarded – undo
245 245
 
246 246
         // Add length and MD5 if they were not present before
247 247
         $update = [];
248
-        if (! isset($record['length'])) {
248
+        if ( ! isset($record['length'])) {
249 249
             $update['length'] = $length;
250 250
         }
251
-        if (! isset($record['md5'])) {
251
+        if ( ! isset($record['md5'])) {
252 252
             $update['md5'] = $this->getMd5ForFile($file['_id']);
253 253
         }
254 254
 
@@ -270,10 +270,10 @@  discard block
 block discarded – undo
270 270
      */
271 271
     public function storeUpload($name, array $metadata = [])
272 272
     {
273
-        if (! isset($_FILES[$name]) || $_FILES[$name]['error'] !== UPLOAD_ERR_OK) {
273
+        if ( ! isset($_FILES[$name]) || $_FILES[$name]['error'] !== UPLOAD_ERR_OK) {
274 274
             throw new MongoGridFSException("Could not find uploaded file $name");
275 275
         }
276
-        if (! isset($_FILES[$name]['tmp_name'])) {
276
+        if ( ! isset($_FILES[$name]['tmp_name'])) {
277 277
             throw new MongoGridFSException("Couldn't find tmp_name in the \$_FILES array. Are you sure the upload worked?");
278 278
         }
279 279
 
@@ -355,7 +355,7 @@  discard block
 block discarded – undo
355 355
         $chunkSize = $record['chunkSize'];
356 356
 
357 357
         rewind($handle);
358
-        while (! feof($handle)) {
358
+        while ( ! feof($handle)) {
359 359
             $data = stream_get_contents($handle, $chunkSize);
360 360
             $this->insertChunk($fileId, $data, $i++);
361 361
             $written += strlen($data);
Please login to merge, or discard this patch.