PHPLIB-294: Make test suite compatible with PHPUnit 6.4

Author: kvwalker

composer.json

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

tests/GridFS/BucketFunctionalTest.php

@@ -19,13 +19,14 @@ class BucketFunctionalTest extends FunctionalTestCase
 {
     public function testValidConstructorOptions()
     {
-        new Bucket($this->manager, $this->getDatabaseName(), [
+        $bucket = new Bucket($this->manager, $this->getDatabaseName(), [
             'bucketName' => 'test',
             'chunkSizeBytes' => 8192,
             'readConcern' => new ReadConcern(ReadConcern::LOCAL),
             'readPreference' => new ReadPreference(ReadPreference::RP_PRIMARY),
             'writeConcern' => new WriteConcern(WriteConcern::MAJORITY, 1000),
         ]);
+        $this->assertSame('test', $bucket->getBucketName());
     }
 
     /**

tests/GridFS/ReadableStreamFunctionalTest.php

@@ -40,7 +40,9 @@ public function setUp()
 
     public function testValidConstructorFileDocument()
     {
-        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,34 @@ public function provideFileIdAndExpectedBytes()
         ];
     }
 
+    public function provideFilteredFileIdAndExpectedBytes()
+    {
+        return [
+            ['length-0', 2, ''],
+            ['length-0-with-empty-chunk', 2, ''],
+            ['length-2', 2, 'ab'],
+            ['length-2', 4, 'ab'],
+            ['length-8', 2, 'ab'],
+            ['length-8', 4, 'abcd'],
+            ['length-8', 6, 'abcdef'],
+            ['length-8', 8, 'abcdefgh'],
+            ['length-8', 10, 'abcdefgh'],
+            ['length-10', 2, 'ab'],
+            ['length-10', 4, 'abcd'],
+            ['length-10', 6, 'abcdef'],
+            ['length-10', 8, 'abcdefgh'],
+            ['length-10', 10, 'abcdefghij'],
+            ['length-10', 12, 'abcdefghij'],
+        ];
+    }
+
     /**
-     * @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/WritableStreamFunctionalTest.php

@@ -21,11 +21,12 @@ public function setUp()
 
     public function testValidConstructorOptions()
     {
-        new WritableStream($this->collectionWrapper, 'filename', [
+        $stream = new WritableStream($this->collectionWrapper, 'filename', [
             '_id' => 'custom-id',
             'chunkSizeBytes' => 2,
             'metadata' => ['foo' => 'bar'],
         ]);
+        $this->assertSame(0, $stream->getSize());
     }
 
     /**

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,5 @@
 } else {
     throw new Exception('Can\'t find autoload.php. Did you install dependencies with Composer?');
 }
+
+class_alias("PHPUnit\Framework\Error\Warning", "PHPUnit_Framework_Error_Warning");