Use array_filter for dataProvider

Author: kvwalker

composer.json

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

tests/GridFS/BucketFunctionalTest.php

@@ -17,16 +17,18 @@
  */
 class BucketFunctionalTest extends FunctionalTestCase
 {
+    /*
+     * @doesNotPerformAssertions
+     */
     public function testValidConstructorOptions()
     {
-        $bucket = new Bucket($this->manager, $this->getDatabaseName(), [
+        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

@@ -112,23 +112,12 @@ 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'],
-        ];
+        $filteredFiles = array_filter($this->provideFileIdAndExpectedBytes(),
+            function(array $args) {
+                return $args[1] > 0;
+            }
+        );
+        return $filteredFiles;
     }
 
     /**

tests/GridFS/WritableStreamFunctionalTest.php

@@ -19,14 +19,16 @@ public function setUp()
         $this->collectionWrapper = new CollectionWrapper($this->manager, $this->getDatabaseName(), 'fs');
     }
 
+    /*
+     * @doesNotPerformAssertions
+     */
     public function testValidConstructorOptions()
     {
-        $stream = new WritableStream($this->collectionWrapper, 'filename', [
+        new WritableStream($this->collectionWrapper, 'filename', [
             '_id' => 'custom-id',
             'chunkSizeBytes' => 2,
             'metadata' => ['foo' => 'bar'],
         ]);
-        $this->assertSame(0, $stream->getSize());
     }
 
     /**

tests/bootstrap.php

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