PHPLIB-462: Fix PHPUnit hook methods for different versions

composer.json

@@ -16,7 +16,8 @@
         "ext-mongodb": "^1.6"
     },
     "require-dev": {
-        "phpunit/phpunit": "^5.7.27 || ^6.4 || ^8.3"
+        "phpunit/phpunit": "^5.7.27 || ^6.4 || ^8.3",
+        "symfony/phpunit-bridge": "^4.4@dev"
     },
     "autoload": {
         "psr-4": { "MongoDB\\": "src/" },

tests/ClientFunctionalTest.php

@@ -6,15 +6,18 @@ use MongoDB\Client;
 use MongoDB\Driver\BulkWrite;
 use MongoDB\Driver\Command;
 use MongoDB\Model\DatabaseInfo;
+use Symfony\Bridge\PhpUnit\SetUpTearDownTrait;
 
 /**
  * Functional tests for the Client class.
  */
 class ClientFunctionalTest extends FunctionalTestCase
 {
+    use SetUpTearDownTrait;
+
     private $client;
 
-    public function setUp()
+    private function doSetUp()
     {
         parent::setUp();
 

tests/Collection/CrudSpecFunctionalTest.php

@@ -11,6 +11,7 @@ use MongoDB\Operation\FindOneAndReplace;
 use IteratorIterator;
 use LogicException;
 use MultipleIterator;
+use Symfony\Bridge\PhpUnit\SetUpTearDownTrait;
 
 /**
  * CRUD spec functional tests.
@@ -19,9 +20,11 @@ use MultipleIterator;
  */
 class CrudSpecFunctionalTest extends FunctionalTestCase
 {
+    use SetUpTearDownTrait;
+
     private $expectedCollection;
 
-    public function setUp()
+    private function doSetUp()
     {
         parent::setUp();
 

tests/Collection/FunctionalTestCase.php

@@ -5,15 +5,18 @@ namespace MongoDB\Tests\Collection;
 use MongoDB\Collection;
 use MongoDB\Driver\WriteConcern;
 use MongoDB\Tests\FunctionalTestCase as BaseFunctionalTestCase;
+use Symfony\Bridge\PhpUnit\SetUpTearDownTrait;
 
 /**
  * Base class for Collection functional tests.
  */
 abstract class FunctionalTestCase extends BaseFunctionalTestCase
 {
+    use SetUpTearDownTrait;
+
     protected $collection;
 
-    public function setUp()
+    private function doSetUp()
     {
         parent::setUp();
 
@@ -22,7 +25,7 @@ abstract class FunctionalTestCase extends BaseFunctionalTestCase
         $this->dropCollection();
     }
 
-    public function tearDown()
+    private function doTearDown()
     {
         if ($this->hasFailed()) {
             return;

tests/Database/FunctionalTestCase.php

@@ -4,15 +4,18 @@ namespace MongoDB\Tests\Database;
 
 use MongoDB\Database;
 use MongoDB\Tests\FunctionalTestCase as BaseFunctionalTestCase;
+use Symfony\Bridge\PhpUnit\SetUpTearDownTrait;
 
 /**
  * Base class for Database functional tests.
  */
 abstract class FunctionalTestCase extends BaseFunctionalTestCase
 {
+    use SetUpTearDownTrait;
+
     protected $database;
 
-    public function setUp()
+    private function doSetUp()
     {
         parent::setUp();
 

tests/DocumentationExamplesTest.php

@@ -11,6 +11,7 @@ use MongoDB\Driver\Server;
 use MongoDB\Driver\WriteConcern;
 use MongoDB\Driver\Exception\ConnectionTimeoutException;
 use MongoDB\Operation\DropCollection;
+use Symfony\Bridge\PhpUnit\SetUpTearDownTrait;
 
 /**
  * Documentation examples to be parsed for inclusion in the MongoDB manual.
@@ -21,14 +22,16 @@ use MongoDB\Operation\DropCollection;
  */
 class DocumentationExamplesTest extends FunctionalTestCase
 {
-    public function setUp()
+    use SetUpTearDownTrait;
+
+    private function doSetUp()
     {
         parent::setUp();
 
         $this->dropCollection();
     }
 
-    public function tearDown()
+    private function doTearDown()
     {
         if ($this->hasFailed()) {
             return;

tests/FunctionalTestCase.php

@@ -15,15 +15,18 @@ use MongoDB\Operation\DatabaseCommand;
 use MongoDB\Operation\DropCollection;
 use InvalidArgumentException;
 use stdClass;
+use Symfony\Bridge\PhpUnit\SetUpTearDownTrait;
 use UnexpectedValueException;
 
 abstract class FunctionalTestCase extends TestCase
 {
+    use SetUpTearDownTrait;
+
     protected $manager;
 
     private $configuredFailPoints = [];
 
-    public function setUp()
+    private function doSetUp()
     {
         parent::setUp();
 
@@ -31,7 +34,7 @@ abstract class FunctionalTestCase extends TestCase
         $this->configuredFailPoints = [];
     }
 
-    public function tearDown()
+    private function doTearDown()
     {
         $this->disableFailPoints();
 

tests/GridFS/FunctionalTestCase.php

@@ -5,17 +5,20 @@ namespace MongoDB\Tests\GridFS;
 use MongoDB\Collection;
 use MongoDB\GridFS\Bucket;
 use MongoDB\Tests\FunctionalTestCase as BaseFunctionalTestCase;
+use Symfony\Bridge\PhpUnit\SetUpTearDownTrait;
 
 /**
  * Base class for GridFS functional tests.
  */
 abstract class FunctionalTestCase extends BaseFunctionalTestCase
 {
+    use SetUpTearDownTrait;
+
     protected $bucket;
     protected $chunksCollection;
     protected $filesCollection;
 
-    public function setUp()
+    private function doSetUp()
     {
         parent::setUp();
 

tests/GridFS/ReadableStreamFunctionalTest.php

@@ -9,15 +9,18 @@ use MongoDB\GridFS\ReadableStream;
 use MongoDB\GridFS\Exception\CorruptFileException;
 use MongoDB\Tests\CommandObserver;
 use stdClass;
+use Symfony\Bridge\PhpUnit\SetUpTearDownTrait;
 
 /**
  * Functional tests for the internal ReadableStream class.
  */
 class ReadableStreamFunctionalTest extends FunctionalTestCase
 {
+    use SetUpTearDownTrait;
+
     private $collectionWrapper;
 
-    public function setUp()
+    private function doSetUp()
     {
         parent::setUp();
 

tests/GridFS/SpecFunctionalTest.php

@@ -13,6 +13,7 @@ use Exception;
 use IteratorIterator;
 use LogicException;
 use MultipleIterator;
+use Symfony\Bridge\PhpUnit\SetUpTearDownTrait;
 
 /**
  * GridFS spec functional tests.
@@ -21,10 +22,12 @@ use MultipleIterator;
  */
 class SpecFunctionalTest extends FunctionalTestCase
 {
+    use SetUpTearDownTrait;
+
     private $expectedChunksCollection;
     private $expectedFilesCollection;
 
-    public function setUp()
+    private function doSetUp()
     {
         parent::setUp();
 

tests/GridFS/StreamWrapperFunctionalTest.php

@@ -4,13 +4,16 @@ namespace MongoDB\Tests\GridFS;
 
 use MongoDB\BSON\Binary;
 use MongoDB\BSON\UTCDateTime;
+use Symfony\Bridge\PhpUnit\SetUpTearDownTrait;
 
 /**
  * Functional tests for the internal StreamWrapper class.
  */
 class StreamWrapperFunctionalTest extends FunctionalTestCase
 {
-    public function setUp()
+    use SetUpTearDownTrait;
+
+    private function doSetUp()
     {
         parent::setUp();
 

tests/GridFS/WritableStreamFunctionalTest.php

@@ -5,15 +5,18 @@ namespace MongoDB\Tests\GridFS;
 use MongoDB\Exception\InvalidArgumentException;
 use MongoDB\GridFS\CollectionWrapper;
 use MongoDB\GridFS\WritableStream;
+use Symfony\Bridge\PhpUnit\SetUpTearDownTrait;
 
 /**
  * Functional tests for the internal WritableStream class.
  */
 class WritableStreamFunctionalTest extends FunctionalTestCase
 {
+    use SetUpTearDownTrait;
+
     private $collectionWrapper;
 
-    public function setUp()
+    private function doSetUp()
     {
         parent::setUp();
 

tests/Model/ChangeStreamIteratorTest.php

@@ -11,12 +11,15 @@ use MongoDB\Operation\CreateCollection;
 use MongoDB\Operation\DropCollection;
 use MongoDB\Tests\CommandObserver;
 use MongoDB\Tests\FunctionalTestCase;
+use Symfony\Bridge\PhpUnit\SetUpTearDownTrait;
 
 class ChangeStreamIteratorTest extends FunctionalTestCase
 {
+    use SetUpTearDownTrait;
+
     private $collection;
 
-    public function setUp()
+    private function doSetUp()
     {
         parent::setUp();
 

tests/Model/IndexInfoFunctionalTest.php

@@ -4,12 +4,15 @@ namespace MongoDB\Tests\Model;
 
 use MongoDB\Collection;
 use MongoDB\Tests\FunctionalTestCase;
+use Symfony\Bridge\PhpUnit\SetUpTearDownTrait;
 
 class IndexInfoFunctionalTest extends FunctionalTestCase
 {
+    use SetUpTearDownTrait;
+
     private $collection;
 
-    public function setUp()
+    private function doSetUp()
     {
         parent::setUp();
 
@@ -17,7 +20,7 @@ class IndexInfoFunctionalTest extends FunctionalTestCase
         $this->collection->drop();
     }
 
-    public function tearDown()
+    private function doTearDown()
     {
         if ($this->hasFailed()) {
             return;

tests/Operation/BulkWriteFunctionalTest.php

@@ -12,12 +12,15 @@ use MongoDB\Model\BSONDocument;
 use MongoDB\Operation\BulkWrite;
 use MongoDB\Tests\CommandObserver;
 use stdClass;
+use Symfony\Bridge\PhpUnit\SetUpTearDownTrait;
 
 class BulkWriteFunctionalTest extends FunctionalTestCase
 {
+    use SetUpTearDownTrait;
+
     private $collection;
 
-    public function setUp()
+    private function doSetUp()
     {
         parent::setUp();
 

tests/Operation/DeleteFunctionalTest.php

@@ -10,12 +10,15 @@ use MongoDB\Exception\BadMethodCallException;
 use MongoDB\Operation\Delete;
 use MongoDB\Tests\CommandObserver;
 use stdClass;
+use Symfony\Bridge\PhpUnit\SetUpTearDownTrait;
 
 class DeleteFunctionalTest extends FunctionalTestCase
 {
+    use SetUpTearDownTrait;
+
     private $collection;
 
-    public function setUp()
+    private function doSetUp()
     {
         parent::setUp();
 

tests/Operation/FunctionalTestCase.php

@@ -8,20 +8,23 @@ use MongoDB\Driver\ReadPreference;
 use MongoDB\Driver\WriteConcern;
 use MongoDB\Operation\DropCollection;
 use MongoDB\Tests\FunctionalTestCase as BaseFunctionalTestCase;
+use Symfony\Bridge\PhpUnit\SetUpTearDownTrait;
 
 /**
  * Base class for Operation functional tests.
  */
 abstract class FunctionalTestCase extends BaseFunctionalTestCase
 {
-    public function setUp()
+    use SetUpTearDownTrait;
+
+    private function doSetUp()
     {
         parent::setUp();
 
         $this->dropCollection();
     }
 
-    public function tearDown()
+    private function doTearDown()
     {
         if ($this->hasFailed()) {
             return;

tests/Operation/InsertManyFunctionalTest.php

@@ -10,12 +10,15 @@ use MongoDB\Model\BSONDocument;
 use MongoDB\Operation\InsertMany;
 use MongoDB\Tests\CommandObserver;
 use stdClass;
+use Symfony\Bridge\PhpUnit\SetUpTearDownTrait;
 
 class InsertManyFunctionalTest extends FunctionalTestCase
 {
+    use SetUpTearDownTrait;
+
     private $collection;
 
-    public function setUp()
+    private function doSetUp()
     {
         parent::setUp();
 

tests/Operation/InsertOneFunctionalTest.php

@@ -10,12 +10,15 @@ use MongoDB\Model\BSONDocument;
 use MongoDB\Operation\InsertOne;
 use MongoDB\Tests\CommandObserver;
 use stdClass;
+use Symfony\Bridge\PhpUnit\SetUpTearDownTrait;
 
 class InsertOneFunctionalTest extends FunctionalTestCase
 {
+    use SetUpTearDownTrait;
+
     private $collection;
 
-    public function setUp()
+    private function doSetUp()
     {
         parent::setUp();
 

tests/Operation/UpdateFunctionalTest.php

@@ -10,12 +10,15 @@ use MongoDB\Exception\BadMethodCallException;
 use MongoDB\Operation\Update;
 use MongoDB\Tests\CommandObserver;
 use stdClass;
+use Symfony\Bridge\PhpUnit\SetUpTearDownTrait;
 
 class UpdateFunctionalTest extends FunctionalTestCase
 {
+    use SetUpTearDownTrait;
+
     private $collection;
 
-    public function setUp()
+    private function doSetUp()
     {
         parent::setUp();
 

tests/Operation/WatchFunctionalTest.php

@@ -19,14 +19,17 @@ use MongoDB\Operation\Watch;
 use MongoDB\Tests\CommandObserver;
 use stdClass;
 use ReflectionClass;
+use Symfony\Bridge\PhpUnit\SetUpTearDownTrait;
 
 class WatchFunctionalTest extends FunctionalTestCase
 {
+    use SetUpTearDownTrait;
+
     private static $wireVersionForStartAtOperationTime = 7;
 
     private $defaultOptions = ['maxAwaitTimeMS' => 500];
 
-    public function setUp()
+    private function doSetUp()
     {
         parent::setUp();
 

tests/SpecTests/FunctionalTestCase.php

@@ -17,6 +17,7 @@ use IteratorIterator;
 use LogicException;
 use MultipleIterator;
 use stdClass;
+use Symfony\Bridge\PhpUnit\SetUpTearDownTrait;
 use UnexpectedValueException;
 
 /**
@@ -26,20 +27,22 @@ use UnexpectedValueException;
  */
 class FunctionalTestCase extends BaseFunctionalTestCase
 {
+    use SetUpTearDownTrait;
+
     const TOPOLOGY_SINGLE = 'single';
     const TOPOLOGY_REPLICASET = 'replicaset';
     const TOPOLOGY_SHARDED = 'sharded';
 
     private $context;
 
-    public function setUp()
+    private function doSetUp()
     {
         parent::setUp();
 
         $this->context = null;
     }
 
-    public function tearDown()
+    private function doTearDown()
     {
         $this->context = null;
 

tests/SpecTests/TransactionsSpecTest.php

@@ -12,6 +12,7 @@ use MongoDB\Driver\Server;
 use MongoDB\Driver\WriteConcern;
 use MongoDB\Driver\Exception\ServerException;
 use stdClass;
+use Symfony\Bridge\PhpUnit\SetUpTearDownTrait;
 
 /**
  * Transactions spec tests.
@@ -20,6 +21,8 @@ use stdClass;
  */
 class TransactionsSpecTest extends FunctionalTestCase
 {
+    use SetUpTearDownTrait;
+
     const INTERRUPTED = 11601;
 
     /* In addition to the useMultipleMongoses tests, these should all pass
@@ -38,14 +41,14 @@ class TransactionsSpecTest extends FunctionalTestCase
         'transaction-options: readConcern snapshot in startTransaction options' => 'PHPLIB does not properly inherit readConcern for transactions',
     ];
 
-    public static function setUpBeforeClass()
+    private static function doSetUpBeforeClass()
     {
         parent::setUpBeforeClass();
 
         static::killAllSessions();
     }
 
-    public function tearDown()
+    private function doTearDown()
     {
         if ($this->hasFailed()) {
             static::killAllSessions();