Update existing test instead of creating a new identical one

Author: GromNaN

tests/GridFS/BucketFunctionalTest.php

@@ -23,6 +23,7 @@
 use function array_merge;
 use function call_user_func;
 use function current;
+use function escapeshellarg;
 use function exec;
 use function fclose;
 use function fopen;
@@ -39,7 +40,7 @@
 use function strncasecmp;
 use function substr;
 
-use const PHP_EOL;
+use const PHP_BINARY;
 use const PHP_OS;
 
 /**
@@ -853,21 +854,33 @@ public function testDanglingOpenWritableStream(): void
             $this->markTestSkipped('Test does not apply to Windows');
         }
 
-        $path = __DIR__ . '/../../vendor/autoload.php';
-        $command = <<<CMD
-php -r "require '$path'; \\\$stream = (new MongoDB\Client)->test->selectGridFSBucket()->openUploadStream('filename', ['disableMD5' => true]);" 2>&1
-CMD;
+        $code = <<<'PHP'
+            require '%s';
+            $client = new \MongoDB\Client(getenv('MONGODB_URI') ?: 'mongodb://127.0.0.1:27017/?serverSelectionTimeoutMS=100');
+            $database = $client->selectDatabase(getenv('MONGODB_DATABASE') ?: 'phplib_test');
+            $gridfs = $database->selectGridFSBucket();
+            $stream = $gridfs->openUploadStream('hello.txt');
+            fwrite($stream, 'Hello MongoDB!');
+            PHP;
 
         @exec(
-            $command,
+            implode(' ', [
+                PHP_BINARY,
+                '-r',
+                escapeshellarg(sprintf($code, __DIR__ . '/../../vendor/autoload.php')),
+                '2>&1',
+            ]),
             $output,
             $return,
         );
 
+        $this->assertSame([], $output);
         $this->assertSame(0, $return);
-        $output = implode(PHP_EOL, $output);
 
-        $this->assertSame('', $output);
+        $fileDocument = $this->filesCollection->findOne(['filename' => 'hello.txt']);
+
+        $this->assertNotNull($fileDocument);
+        $this->assertSame(14, $fileDocument->length);
     }
 
     /**

tests/GridFS/StreamWrapperFunctionalTest.php

@@ -5,16 +5,13 @@
 use MongoDB\BSON\Binary;
 use MongoDB\BSON\UTCDateTime;
 
-use function escapeshellarg;
-use function exec;
 use function fclose;
 use function feof;
 use function fread;
 use function fseek;
 use function fstat;
 use function fwrite;
 
-use const PHP_BINARY;
 use const SEEK_CUR;
 use const SEEK_END;
 use const SEEK_SET;
@@ -207,18 +204,4 @@ public function testWritableStreamWrite(): void
 
         $this->assertSame(6, fwrite($stream, 'foobar'));
     }
-
-    public function testAutocloseOnScriptEnd(): void
-    {
-        $command = PHP_BINARY . ' ' . escapeshellarg(__DIR__ . '/scripts/stream-autoclose.php');
-        exec($command, $output, $exitCode);
-
-        $this->assertSame([], $output);
-        $this->assertSame(0, $exitCode);
-
-        $fileDocument = $this->filesCollection->findOne(['filename' => 'hello.txt']);
-
-        $this->assertNotNull($fileDocument);
-        $this->assertSame(14, $fileDocument->length);
-    }
 }