Remove stream entities and update GridFS operations

Author: jmikola

tests/UnifiedSpecTests/Constraint/IsStream.php

@@ -36,7 +36,6 @@
 use function logicalOr;
 use function range;
 use function sprintf;
-use function stream_get_contents;
 use function strpos;
 use const PHP_INT_SIZE;
 

tests/UnifiedSpecTests/Constraint/IsStreamTest.php

@@ -16,18 +16,13 @@
 use function assertInternalType;
 use function assertNotEmpty;
 use function assertNotFalse;
-use function assertRegExp;
 use function assertStringStartsWith;
 use function count;
 use function current;
 use function explode;
-use function fopen;
-use function fwrite;
-use function hex2bin;
 use function implode;
 use function key;
 use function parse_url;
-use function rewind;
 use function strlen;
 use function strpos;
 use function substr_replace;
@@ -100,10 +95,6 @@ public function createEntities(array $entities)
                     $this->createBucket($id, $def);
                     break;
 
-                case 'stream':
-                    $this->createStream($id, $def);
-                    break;
-
                 default:
                     throw new LogicException('Unsupported entity type: ' . $type);
             }
@@ -294,21 +285,6 @@ private function createBucket(string $id, stdClass $o)
         $this->entityMap->set($id, $database->selectGridFSBucket($options), $databaseId);
     }
 
-    private function createStream(string $id, stdClass $o)
-    {
-        Util::assertHasOnlyKeys($o, ['id', 'hexBytes']);
-
-        $hexBytes = $o->hexBytes ?? null;
-        assertInternalType('string', $hexBytes);
-        assertRegExp('/^([0-9a-fA-F]{2})*$/', $hexBytes);
-
-        $stream = fopen('php://temp', 'w+b');
-        fwrite($stream, hex2bin($hexBytes));
-        rewind($stream);
-
-        $this->entityMap->set($id, $stream);
-    }
-
     private static function prepareCollectionOrDatabaseOptions(array $options) : array
     {
         Util::assertHasOnlyKeys($options, ['readConcern', 'readPreference', 'writeConcern']);

tests/UnifiedSpecTests/Constraint/Matches.php

@@ -10,7 +10,6 @@
 use MongoDB\Driver\Session;
 use MongoDB\GridFS\Bucket;
 use MongoDB\Tests\UnifiedSpecTests\Constraint\IsBsonType;
-use MongoDB\Tests\UnifiedSpecTests\Constraint\IsStream;
 use PHPUnit\Framework\Assert;
 use PHPUnit\Framework\Constraint\Constraint;
 use function array_key_exists;
@@ -130,8 +129,7 @@ private static function isSupportedType() : Constraint
                 isInstanceOf(Session::class),
                 isInstanceOf(Bucket::class),
                 isInstanceOf(ChangeStream::class),
-                IsBsonType::any(),
-                new IsStream()
+                IsBsonType::any()
             );
         }
 

tests/UnifiedSpecTests/Context.php

@@ -6,9 +6,9 @@
 use MongoDB\Client;
 use MongoDB\Collection;
 use MongoDB\Database;
-use MongoDB\GridFS\Bucket;
 use MongoDB\Driver\Server;
 use MongoDB\Driver\Session;
+use MongoDB\GridFS\Bucket;
 use MongoDB\Model\IndexInfo;
 use MongoDB\Operation\FindOneAndReplace;
 use MongoDB\Operation\FindOneAndUpdate;
@@ -26,16 +26,23 @@
 use function assertNotContains;
 use function assertNotNull;
 use function assertNull;
+use function assertObjectHasAttribute;
+use function assertRegExp;
 use function assertSame;
 use function assertThat;
 use function current;
 use function equalTo;
+use function fopen;
+use function fwrite;
 use function get_class;
+use function hex2bin;
 use function iterator_to_array;
 use function key;
 use function logicalOr;
 use function MongoDB\with_transaction;
 use function property_exists;
+use function rewind;
+use function stream_get_contents;
 use function strtolower;
 
 final class Operation
@@ -161,11 +168,7 @@ private function execute()
         }
 
         if ($result instanceof Traversable && ! $result instanceof ChangeStream) {
-            return iterator_to_array($result, false);
-        }
-
-        if (is_resource($result) && get_resource_type($result) === 'stream') {
-            return stream_get_contents($result, -1, 0);
+            return iterator_to_array($result);
         }
 
         return $result;
@@ -427,13 +430,26 @@ private function executeForBucket(Bucket $bucket)
         switch ($this->name) {
             case 'delete':
                 return $bucket->delete($args['id']);
-            case 'openDownloadStream':
-                return $bucket->openDownloadStream($args['id']);
-            case 'uploadFromStream':
+            case 'downloadByName':
+                return stream_get_contents($bucket->openDownloadStream(
+                    $args['filename'],
+                    array_diff_key($args, ['filename' => 1])
+                ));
+            case 'download':
+                return stream_get_contents($bucket->openDownloadStream($args['id']));
+            case 'uploadWithId':
+                $args['_id'] = $args['id'];
+                unset($args['id']);
+
+                // Fall through
+
+            case 'upload':
+                $args = self::prepareUploadArguments($args);
+
                 return $bucket->uploadFromStream(
                     $args['filename'],
-                    $this->entityMap[$args['source']],
-                    array_diff_key($args, ['filename' => 1, 'source'])
+                    $args['source'],
+                    array_diff_key($args, ['filename' => 1, 'source' => 1])
                 );
             default:
                 Assert::fail('Unsupported bucket operation: ' . $this->name);
@@ -527,7 +543,7 @@ private function prepareArguments() : array
         return Util::prepareCommonOptions($args);
     }
 
-    private function prepareBulkWriteRequest(stdClass $request) : array
+    private static function prepareBulkWriteRequest(stdClass $request) : array
     {
         $request = (array) $request;
         assertCount(1, $request);
@@ -569,4 +585,23 @@ private function prepareBulkWriteRequest(stdClass $request) : array
                 Assert::fail('Unsupported bulk write request: ' . $type);
         }
     }
+
+    private static function prepareUploadArguments(array $args) : array
+    {
+        $source = $args['source'] ?? null;
+        assertInternalType('object', $source);
+        assertObjectHasAttribute('$$hexBytes', $source);
+        Util::assertHasOnlyKeys($source, ['$$hexBytes']);
+        $hexBytes = $source->{'$$hexBytes'};
+        assertInternalType('string', $hexBytes);
+        assertRegExp('/^([0-9a-fA-F]{2})*$/', $hexBytes);
+
+        $stream = fopen('php://temp', 'w+b');
+        fwrite($stream, hex2bin($hexBytes));
+        rewind($stream);
+
+        $args['source'] = $stream;
+
+        return $args;
+    }
 }