PHPLIB-462: Fix PHPUnit hook methods for different versions

alcaeus · alcaeus · commit d7aed71c4f9e · 2019-08-09T10:19:25.000+02:00
diff --git a/composer.json b/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/" },
diff --git a/tests/ClientFunctionalTest.php b/tests/ClientFunctionalTest.php
@@ -6,15 +6,18 @@
 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();
 
diff --git a/tests/Collection/CrudSpecFunctionalTest.php b/tests/Collection/CrudSpecFunctionalTest.php
@@ -11,6 +11,7 @@
 use IteratorIterator;
 use LogicException;
 use MultipleIterator;
+use Symfony\Bridge\PhpUnit\SetUpTearDownTrait;
 
 /**
  * CRUD spec functional tests.
@@ -19,9 +20,11 @@
  */
 class CrudSpecFunctionalTest extends FunctionalTestCase
 {
+    use SetUpTearDownTrait;
+
     private $expectedCollection;
 
-    public function setUp()
+    private function doSetUp()
     {
         parent::setUp();
 
diff --git a/tests/Collection/FunctionalTestCase.php b/tests/Collection/FunctionalTestCase.php
@@ -5,15 +5,18 @@
 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 @@ public function setUp()
         $this->dropCollection();
     }
 
-    public function tearDown()
+    private function doTearDown()
     {
         if ($this->hasFailed()) {
             return;
diff --git a/tests/Database/FunctionalTestCase.php b/tests/Database/FunctionalTestCase.php
@@ -4,15 +4,18 @@
 
 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();
 
diff --git a/tests/DocumentationExamplesTest.php b/tests/DocumentationExamplesTest.php
@@ -11,6 +11,7 @@
 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 @@
  */
 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;
diff --git a/tests/FunctionalTestCase.php b/tests/FunctionalTestCase.php
@@ -15,23 +15,26 @@
 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();
 
         $this->manager = new Manager(static::getUri());
         $this->configuredFailPoints = [];
     }
 
-    public function tearDown()
+    private function doTearDown()
     {
         $this->disableFailPoints();
 
diff --git a/tests/GridFS/FunctionalTestCase.php b/tests/GridFS/FunctionalTestCase.php
@@ -5,17 +5,20 @@
 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();
 
diff --git a/tests/GridFS/ReadableStreamFunctionalTest.php b/tests/GridFS/ReadableStreamFunctionalTest.php
@@ -9,15 +9,18 @@
 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();
 
diff --git a/tests/GridFS/SpecFunctionalTest.php b/tests/GridFS/SpecFunctionalTest.php
@@ -13,6 +13,7 @@
 use IteratorIterator;
 use LogicException;
 use MultipleIterator;
+use Symfony\Bridge\PhpUnit\SetUpTearDownTrait;
 
 /**
  * GridFS spec functional tests.
@@ -21,10 +22,12 @@
  */
 class SpecFunctionalTest extends FunctionalTestCase
 {
+    use SetUpTearDownTrait;
+
     private $expectedChunksCollection;
     private $expectedFilesCollection;
 
-    public function setUp()
+    private function doSetUp()
     {
         parent::setUp();
 
diff --git a/tests/GridFS/StreamWrapperFunctionalTest.php b/tests/GridFS/StreamWrapperFunctionalTest.php
@@ -4,13 +4,16 @@
 
 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();
 
diff --git a/tests/GridFS/WritableStreamFunctionalTest.php b/tests/GridFS/WritableStreamFunctionalTest.php
@@ -5,15 +5,18 @@
 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();
 
diff --git a/tests/Model/ChangeStreamIteratorTest.php b/tests/Model/ChangeStreamIteratorTest.php
@@ -11,12 +11,15 @@
 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();
 
diff --git a/tests/Model/IndexInfoFunctionalTest.php b/tests/Model/IndexInfoFunctionalTest.php
@@ -4,20 +4,23 @@
 
 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();
 
         $this->collection = new Collection($this->manager, $this->getDatabaseName(), $this->getCollectionName());
         $this->collection->drop();
     }
 
-    public function tearDown()
+    private function doTearDown()
     {
         if ($this->hasFailed()) {
             return;
diff --git a/tests/Operation/BulkWriteFunctionalTest.php b/tests/Operation/BulkWriteFunctionalTest.php
@@ -12,12 +12,15 @@
 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();
 
diff --git a/tests/Operation/DeleteFunctionalTest.php b/tests/Operation/DeleteFunctionalTest.php
@@ -10,12 +10,15 @@
 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();
 
diff --git a/tests/Operation/FunctionalTestCase.php b/tests/Operation/FunctionalTestCase.php
@@ -8,20 +8,23 @@
 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;
diff --git a/tests/Operation/InsertManyFunctionalTest.php b/tests/Operation/InsertManyFunctionalTest.php
@@ -10,12 +10,15 @@
 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();
 
diff --git a/tests/Operation/InsertOneFunctionalTest.php b/tests/Operation/InsertOneFunctionalTest.php
@@ -10,12 +10,15 @@
 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();
 
diff --git a/tests/Operation/UpdateFunctionalTest.php b/tests/Operation/UpdateFunctionalTest.php
diff --git a/tests/Operation/WatchFunctionalTest.php b/tests/Operation/WatchFunctionalTest.php
diff --git a/tests/SpecTests/FunctionalTestCase.php b/tests/SpecTests/FunctionalTestCase.php
diff --git a/tests/SpecTests/TransactionsSpecTest.php b/tests/SpecTests/TransactionsSpecTest.php

Original file line number	Diff line number	Diff line change
`@@ -5,15 +5,18 @@`
`5`	`5`	`use MongoDB\Collection;`
`6`	`6`	`use MongoDB\Driver\WriteConcern;`
`7`	`7`	`use MongoDB\Tests\FunctionalTestCase as BaseFunctionalTestCase;`
	`8`	`+use Symfony\Bridge\PhpUnit\SetUpTearDownTrait;`
`8`	`9`
`9`	`10`	`/**`
`10`	`11`	`* Base class for Collection functional tests.`
`11`	`12`	`*/`
`12`	`13`	`abstract class FunctionalTestCase extends BaseFunctionalTestCase`
`13`	`14`	`{`
	`15`	`+ use SetUpTearDownTrait;`
	`16`	`+`
`14`	`17`	`protected $collection;`
`15`	`18`
`16`		`- public function setUp()`
	`19`	`+ private function doSetUp()`
`17`	`20`	`{`
`18`	`21`	`parent::setUp();`
`19`	`22`
`@@ -22,7 +25,7 @@ public function setUp()`
`22`	`25`	`$this->dropCollection();`
`23`	`26`	`}`
`24`	`27`
`25`		`- public function tearDown()`
	`28`	`+ private function doTearDown()`
`26`	`29`	`{`
`27`	`30`	`if ($this->hasFailed()) {`
`28`	`31`	`return;`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@`
`11`	`11`	`use MongoDB\Driver\WriteConcern;`
`12`	`12`	`use MongoDB\Driver\Exception\ConnectionTimeoutException;`
`13`	`13`	`use MongoDB\Operation\DropCollection;`
	`14`	`+use Symfony\Bridge\PhpUnit\SetUpTearDownTrait;`
`14`	`15`
`15`	`16`	`/**`
`16`	`17`	`* Documentation examples to be parsed for inclusion in the MongoDB manual.`
`@@ -21,14 +22,16 @@`
`21`	`22`	`*/`
`22`	`23`	`class DocumentationExamplesTest extends FunctionalTestCase`
`23`	`24`	`{`
`24`		`- public function setUp()`
	`25`	`+ use SetUpTearDownTrait;`
	`26`	`+`
	`27`	`+ private function doSetUp()`
`25`	`28`	`{`
`26`	`29`	`parent::setUp();`
`27`	`30`
`28`	`31`	`$this->dropCollection();`
`29`	`32`	`}`
`30`	`33`
`31`		`- public function tearDown()`
	`34`	`+ private function doTearDown()`
`32`	`35`	`{`
`33`	`36`	`if ($this->hasFailed()) {`
`34`	`37`	`return;`
Original file line number	Diff line number	Diff line change
`@@ -15,23 +15,26 @@`
`15`	`15`	`use MongoDB\Operation\DropCollection;`
`16`	`16`	`use InvalidArgumentException;`
`17`	`17`	`use stdClass;`
	`18`	`+use Symfony\Bridge\PhpUnit\SetUpTearDownTrait;`
`18`	`19`	`use UnexpectedValueException;`
`19`	`20`
`20`	`21`	`abstract class FunctionalTestCase extends TestCase`
`21`	`22`	`{`
	`23`	`+ use SetUpTearDownTrait;`
	`24`	`+`
`22`	`25`	`protected $manager;`
`23`	`26`
`24`	`27`	`private $configuredFailPoints = [];`
`25`	`28`
`26`		`- public function setUp()`
	`29`	`+ private function doSetUp()`
`27`	`30`	`{`
`28`	`31`	`parent::setUp();`
`29`	`32`
`30`	`33`	`$this->manager = new Manager(static::getUri());`
`31`	`34`	`$this->configuredFailPoints = [];`
`32`	`35`	`}`
`33`	`36`
`34`		`- public function tearDown()`
	`37`	`+ private function doTearDown()`
`35`	`38`	`{`
`36`	`39`	`$this->disableFailPoints();`
`37`	`40`