Merge pull request #489

Author: kvwalker

composer.json

@@ -16,7 +16,7 @@
         "ext-mongodb": "^1.4.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^4.8.36"
+        "phpunit/phpunit": "^4.8.36 || ^6.4"
     },
     "autoload": {
         "psr-4": { "MongoDB\\": "src/" },

tests/GridFS/BucketFunctionalTest.php

@@ -17,6 +17,9 @@
  */
 class BucketFunctionalTest extends FunctionalTestCase
 {
+    /**
+     * @doesNotPerformAssertions
+     */
     public function testValidConstructorOptions()
     {
         new Bucket($this->manager, $this->getDatabaseName(), [
@@ -138,7 +141,7 @@ public function testDeleteStillRemovesChunksIfFileDoesNotExist($input, $expected
     }
 
     /**
-     * @expectedException PHPUnit_Framework_Error_Warning
+     * @expectedException PHPUnit\Framework\Error\Warning
      */
     public function testDownloadingFileWithMissingChunk()
     {
@@ -150,7 +153,7 @@ public function testDownloadingFileWithMissingChunk()
     }
 
     /**
-     * @expectedException PHPUnit_Framework_Error_Warning
+     * @expectedException PHPUnit\Framework\Error\Warning
      */
     public function testDownloadingFileWithUnexpectedChunkIndex()
     {
@@ -165,7 +168,7 @@ public function testDownloadingFileWithUnexpectedChunkIndex()
     }
 
     /**
-     * @expectedException PHPUnit_Framework_Error_Warning
+     * @expectedException PHPUnit\Framework\Error\Warning
      */
     public function testDownloadingFileWithUnexpectedChunkSize()
     {

tests/GridFS/ReadableStreamFunctionalTest.php

@@ -38,9 +38,11 @@ public function setUp()
         ]);
     }
 
-    public function testValidConstructorFileDocument()
+    public function testGetFile()
     {
-        new ReadableStream($this->collectionWrapper, (object) ['_id' => null, 'chunkSize' => 1, 'length' => 0]);
+        $fileDocument = (object) ['_id' => null, 'chunkSize' => 1, 'length' => 0];
+        $stream = new ReadableStream($this->collectionWrapper, $fileDocument);
+        $this->assertSame($fileDocument, $stream->getFile());
     }
 
     /**
@@ -108,14 +110,22 @@ public function provideFileIdAndExpectedBytes()
         ];
     }
 
+    public function provideFilteredFileIdAndExpectedBytes()
+    {
+        return array_filter($this->provideFileIdAndExpectedBytes(),
+            function(array $args) {
+                return $args[1] > 0;
+            }
+        );
+    }
+
     /**
-     * @dataProvider provideFileIdAndExpectedBytes
+     * @dataProvider provideFilteredFileIdAndExpectedBytes
      */
     public function testReadBytesCalledMultipleTimes($fileId, $length, $expectedBytes)
     {
         $fileDocument = $this->collectionWrapper->findFileById($fileId);
         $stream = new ReadableStream($this->collectionWrapper, $fileDocument);
-
         for ($i = 0; $i < $length; $i++) {
             $expectedByte = isset($expectedBytes[$i]) ? $expectedBytes[$i] : '';
             $this->assertSame($expectedByte, $stream->readBytes(1));

tests/GridFS/SpecFunctionalTest.php

@@ -330,7 +330,7 @@ private function getExceptionClassForError($error)
                 /* Although ReadableStream throws a CorruptFileException, the
                  * stream wrapper will convert it to a PHP error of type
                  * E_USER_WARNING. */
-                return 'PHPUnit_Framework_Error_Warning';
+                return 'PHPUnit\Framework\Error\Warning';
 
             default:
                 throw new LogicException('Unsupported error: ' . $error);

tests/GridFS/WritableStreamFunctionalTest.php

@@ -19,6 +19,9 @@ public function setUp()
         $this->collectionWrapper = new CollectionWrapper($this->manager, $this->getDatabaseName(), 'fs');
     }
 
+    /**
+     * @doesNotPerformAssertions
+     */
     public function testValidConstructorOptions()
     {
         new WritableStream($this->collectionWrapper, 'filename', [

tests/Operation/ReplaceOneTest.php

@@ -27,6 +27,7 @@ public function testConstructorReplacementArgumentTypeCheck($replacement)
 
     /**
      * @dataProvider provideReplacementDocuments
+     * @doesNotPerformAssertions
      */
     public function testConstructorReplacementArgument($replacement)
     {

tests/Operation/UpdateManyTest.php

@@ -27,6 +27,7 @@ public function testConstructorUpdateArgumentTypeCheck($update)
 
     /**
      * @dataProvider provideUpdateDocuments
+     * @doesNotPerformAssertions
      */
     public function testConstructorUpdateArgument($update)
     {

tests/Operation/UpdateOneTest.php

@@ -27,6 +27,7 @@ public function testConstructorUpdateArgumentTypeCheck($update)
 
     /**
      * @dataProvider provideUpdateDocuments
+     * @doesNotPerformAssertions
      */
     public function testConstructorUpdateArgument($update)
     {

tests/bootstrap.php

@@ -9,3 +9,7 @@
 } else {
     throw new Exception('Can\'t find autoload.php. Did you install dependencies with Composer?');
 }
+
+if ( ! class_exists('PHPUnit\Framework\Error\Warning')) {
+    class_alias('PHPUnit_Framework_Error_Warning', 'PHPUnit\Framework\Error\Warning');
+}