Merge pull request #2042 from doctrine/feature/phpunit-8

Update to PHPUnit 8
doctrine · Jul 11, 2019 · 85c5ae3 · 85c5ae3
2 parents a50624c + 14e26a2
commit 85c5ae3
Show file tree

Hide file tree

Showing 36 changed files with 49 additions and 50 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,4 +8,5 @@ phpunit.xml
 composer.lock
 vendor/
 .phpcs-cache
+.phpunit.result.cache
 phpcs.xml
diff --git a/composer.json b/composer.json
@@ -39,7 +39,7 @@
         "doctrine/coding-standard": "^5.0",
         "jmikola/geojson": "^1.0",
         "phpstan/phpstan": "^0.10.3",
-        "phpunit/phpunit": "^7.4"
+        "phpunit/phpunit": "^8.2"
     },
     "autoload": {
         "psr-4": { "Doctrine\\ODM\\MongoDB\\": "lib/Doctrine/ODM/MongoDB" }

diff --git a/tests/Doctrine/ODM/MongoDB/Tests/Aggregation/Stage/GraphLookupTest.php b/tests/Doctrine/ODM/MongoDB/Tests/Aggregation/Stage/GraphLookupTest.php
@@ -24,7 +24,7 @@ class GraphLookupTest extends BaseTest
 {
     use AggregationTestTrait;
 
-    public function setUp()
+    public function setUp() : void
     {
         parent::setUp();
         $this->requireMongoDB34('$graphLookup tests require at least MongoDB 3.4.0');

diff --git a/tests/Doctrine/ODM/MongoDB/Tests/Aggregation/Stage/LookupTest.php b/tests/Doctrine/ODM/MongoDB/Tests/Aggregation/Stage/LookupTest.php
@@ -14,7 +14,7 @@
 
 class LookupTest extends BaseTest
 {
-    public function setUp()
+    public function setUp() : void
     {
         parent::setUp();
         $this->requireMongoDB32('$lookup tests require at least MongoDB 3.2.0');

diff --git a/tests/Doctrine/ODM/MongoDB/Tests/BaseTest.php b/tests/Doctrine/ODM/MongoDB/Tests/BaseTest.php
@@ -28,13 +28,13 @@ abstract class BaseTest extends TestCase
     /** @var UnitOfWork */
     protected $uow;
 
-    public function setUp()
+    public function setUp() : void
     {
         $this->dm  = $this->createTestDocumentManager();
         $this->uow = $this->dm->getUnitOfWork();
     }
 
-    public function tearDown()
+    public function tearDown() : void
     {
         if (! $this->dm) {
             return;

diff --git a/tests/Doctrine/ODM/MongoDB/Tests/Functional/AtomicSetTest.php b/tests/Doctrine/ODM/MongoDB/Tests/Functional/AtomicSetTest.php
@@ -27,19 +27,19 @@ class AtomicSetTest extends BaseTest
     /** @var CommandLogger */
     private $logger;
 
-    public function setUp()
+    public function setUp() : void
     {
         parent::setUp();
 
         $this->logger = new CommandLogger();
         $this->logger->register();
     }
 
-    public function tearDown()
+    public function tearDown() : void
     {
         $this->logger->unregister();
 
-        return parent::tearDown();
+        parent::tearDown();
     }
 
     public function testAtomicInsertAndUpdate()

diff --git a/tests/Doctrine/ODM/MongoDB/Tests/Functional/CommitImprovementTest.php b/tests/Doctrine/ODM/MongoDB/Tests/Functional/CommitImprovementTest.php
@@ -20,19 +20,19 @@ class CommitImprovementTest extends BaseTest
     /** @var CommandLogger */
     private $logger;
 
-    public function setUp()
+    public function setUp() : void
     {
         parent::setUp();
 
         $this->logger = new CommandLogger();
         $this->logger->register();
     }
 
-    public function tearDown()
+    public function tearDown() : void
     {
         $this->logger->unregister();
 
-        return parent::tearDown();
+        parent::tearDown();
     }
 
     public function testInsertIncludesAllNestedCollections()

diff --git a/tests/Doctrine/ODM/MongoDB/Tests/Functional/CustomTypeTest.php b/tests/Doctrine/ODM/MongoDB/Tests/Functional/CustomTypeTest.php
@@ -16,7 +16,7 @@
 
 class CustomTypeTest extends BaseTest
 {
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass() : void
     {
         Type::addType('date_collection', DateCollectionType::class);
     }

diff --git a/tests/Doctrine/ODM/MongoDB/Tests/Functional/DiscriminatorsDefaultValueTest.php b/tests/Doctrine/ODM/MongoDB/Tests/Functional/DiscriminatorsDefaultValueTest.php
@@ -9,7 +9,7 @@
 
 class ReferenceDiscriminatorsDefaultValueTest extends BaseTest
 {
-    public function setUp()
+    public function setUp() : void
     {
         parent::setUp();
     }

diff --git a/tests/Doctrine/ODM/MongoDB/Tests/Functional/DocumentPersisterTest.php b/tests/Doctrine/ODM/MongoDB/Tests/Functional/DocumentPersisterTest.php
@@ -19,7 +19,7 @@ class DocumentPersisterTest extends BaseTest
     /** @var DocumentPersister */
     private $documentPersister;
 
-    public function setUp()
+    public function setUp() : void
     {
         parent::setUp();
 

diff --git a/tests/Doctrine/ODM/MongoDB/Tests/Functional/EcommerceTest.php b/tests/Doctrine/ODM/MongoDB/Tests/Functional/EcommerceTest.php
@@ -13,7 +13,7 @@
 
 class EcommerceTest extends BaseTest
 {
-    public function setUp()
+    public function setUp() : void
     {
         parent::setUp();
 

diff --git a/tests/Doctrine/ODM/MongoDB/Tests/Functional/EnsureShardingTest.php b/tests/Doctrine/ODM/MongoDB/Tests/Functional/EnsureShardingTest.php
@@ -16,7 +16,7 @@
  */
 class EnsureShardingTest extends BaseTest
 {
-    public function setUp()
+    public function setUp() : void
     {
         parent::setUp();
 

diff --git a/tests/Doctrine/ODM/MongoDB/Tests/Functional/FilterTest.php b/tests/Doctrine/ODM/MongoDB/Tests/Functional/FilterTest.php
@@ -13,7 +13,7 @@
 
 class FilterTest extends BaseTest
 {
-    public function setUp()
+    public function setUp() : void
     {
         parent::setUp();
 

diff --git a/tests/Doctrine/ODM/MongoDB/Tests/Functional/PersistentCollectionCloneTest.php b/tests/Doctrine/ODM/MongoDB/Tests/Functional/PersistentCollectionCloneTest.php
@@ -14,7 +14,7 @@ class PersistentCollectionCloneTest extends BaseTest
     private $user1;
     private $user2;
 
-    public function setUp()
+    public function setUp() : void
     {
         parent::setUp();
 

diff --git a/tests/Doctrine/ODM/MongoDB/Tests/Functional/QueryTest.php b/tests/Doctrine/ODM/MongoDB/Tests/Functional/QueryTest.php
@@ -23,7 +23,7 @@
 
 class QueryTest extends BaseTest
 {
-    public function setUp()
+    public function setUp() : void
     {
         parent::setUp();
 

diff --git a/tests/Doctrine/ODM/MongoDB/Tests/Functional/ReadPreferenceTest.php b/tests/Doctrine/ODM/MongoDB/Tests/Functional/ReadPreferenceTest.php
@@ -14,7 +14,7 @@
 
 class ReadPreferenceTest extends BaseTest
 {
-    public function setUp()
+    public function setUp() : void
     {
         parent::setUp();
 

diff --git a/tests/Doctrine/ODM/MongoDB/Tests/Functional/ReferenceDiscriminatorsTest.php b/tests/Doctrine/ODM/MongoDB/Tests/Functional/ReferenceDiscriminatorsTest.php
@@ -9,7 +9,7 @@
 
 class ReferenceDiscriminatorsTest extends BaseTest
 {
-    public function setUp()
+    public function setUp() : void
     {
         parent::setUp();
         $this->dm->getSchemaManager()->ensureDocumentIndexes(CommentableAction::class);

diff --git a/tests/Doctrine/ODM/MongoDB/Tests/Functional/RepositoriesTest.php b/tests/Doctrine/ODM/MongoDB/Tests/Functional/RepositoriesTest.php
@@ -10,7 +10,7 @@
 
 class RepositoriesTest extends BaseTest
 {
-    public function setUp()
+    public function setUp() : void
     {
         parent::setUp();
 

diff --git a/tests/Doctrine/ODM/MongoDB/Tests/Functional/ShardKeyTest.php b/tests/Doctrine/ODM/MongoDB/Tests/Functional/ShardKeyTest.php
@@ -19,7 +19,7 @@ class ShardKeyTest extends BaseTest
     /** @var CommandLogger */
     private $logger;
 
-    public function setUp()
+    public function setUp() : void
     {
         parent::setUp();
 
@@ -32,11 +32,11 @@ public function setUp()
         $this->logger->register();
     }
 
-    public function tearDown()
+    public function tearDown() : void
     {
         $this->logger->unregister();
 
-        return parent::tearDown();
+        parent::tearDown();
     }
 
     public function testUpdateAfterSave()

diff --git a/tests/Doctrine/ODM/MongoDB/Tests/Functional/SimpleReferencesTest.php b/tests/Doctrine/ODM/MongoDB/Tests/Functional/SimpleReferencesTest.php
@@ -18,7 +18,7 @@ class SimpleReferencesTest extends BaseTest
     private $user;
     private $test;
 
-    public function setUp()
+    public function setUp() : void
     {
         parent::setUp();
 

diff --git a/tests/Doctrine/ODM/MongoDB/Tests/Functional/Ticket/GH1138Test.php b/tests/Doctrine/ODM/MongoDB/Tests/Functional/Ticket/GH1138Test.php
@@ -15,19 +15,19 @@ class GH1138Test extends BaseTest
     /** @var CommandLogger */
     private $logger;
 
-    public function setUp()
+    public function setUp() : void
     {
         parent::setUp();
 
         $this->logger = new CommandLogger();
         $this->logger->register();
     }
 
-    public function tearDown()
+    public function tearDown() : void
     {
         $this->logger->unregister();
 
-        return parent::tearDown();
+        parent::tearDown();
     }
 
     public function testUpdatingDocumentBeforeItsInsertionShouldNotEntailMultipleQueries()

diff --git a/tests/Doctrine/ODM/MongoDB/Tests/Functional/Ticket/GH1229Test.php b/tests/Doctrine/ODM/MongoDB/Tests/Functional/Ticket/GH1229Test.php
@@ -21,7 +21,7 @@ class GH1229Test extends BaseTest
     /**
      * {@inheritdoc}
      */
-    public function setUp()
+    public function setUp() : void
     {
         parent::setUp();
 

diff --git a/tests/Doctrine/ODM/MongoDB/Tests/Functional/Ticket/GH593Test.php b/tests/Doctrine/ODM/MongoDB/Tests/Functional/Ticket/GH593Test.php
@@ -13,7 +13,7 @@
 
 class GH593Test extends BaseTest
 {
-    public function setUp()
+    public function setUp() : void
     {
         parent::setUp();
 

diff --git a/tests/Doctrine/ODM/MongoDB/Tests/Functional/Ticket/GH596Test.php b/tests/Doctrine/ODM/MongoDB/Tests/Functional/Ticket/GH596Test.php
@@ -9,7 +9,7 @@
 
 class GH596Test extends BaseTest
 {
-    public function setUp()
+    public function setUp() : void
     {
         parent::setUp();
 

diff --git a/tests/Doctrine/ODM/MongoDB/Tests/Functional/Ticket/MODM166Test.php b/tests/Doctrine/ODM/MongoDB/Tests/Functional/Ticket/MODM166Test.php
@@ -14,14 +14,13 @@
 
 class MODM166Test extends BaseTest
 {
-    public function setUp()
+    public function setUp() : void
     {
         parent::setUp();
 
         $this->listener = new MODM166EventListener();
         $evm            = $this->dm->getEventManager();
         $evm->addEventListener(Events::onFlush, $this->listener);
-        return $this->dm;
     }
 
     public function testUpdateCollectionDuringOnFlushAndRecomputSingleDocumentChangeSet()

diff --git a/tests/Doctrine/ODM/MongoDB/Tests/Functional/Ticket/MODM167Test.php b/tests/Doctrine/ODM/MongoDB/Tests/Functional/Ticket/MODM167Test.php
@@ -12,14 +12,13 @@
 
 class MODM167Test extends BaseTest
 {
-    public function setUp()
+    public function setUp() : void
     {
         parent::setUp();
 
         $this->listener = new MODM167EventListener();
         $evm            = $this->dm->getEventManager();
         $evm->addEventListener(Events::onFlush, $this->listener);
-        return $this->dm;
     }
 
     public function testDetatchNewDocumentDuringOnFlush()

diff --git a/tests/Doctrine/ODM/MongoDB/Tests/Mapping/BasicInheritanceMappingTest.php b/tests/Doctrine/ODM/MongoDB/Tests/Mapping/BasicInheritanceMappingTest.php
@@ -15,7 +15,7 @@ class BasicInheritanceMappingTest extends BaseTest
 {
     private $factory;
 
-    public function setUp()
+    public function setUp() : void
     {
         parent::setUp();
         $this->factory = new ClassMetadataFactory();

diff --git a/tests/Doctrine/ODM/MongoDB/Tests/Mapping/Driver/AbstractDriverTest.php b/tests/Doctrine/ODM/MongoDB/Tests/Mapping/Driver/AbstractDriverTest.php
@@ -28,12 +28,12 @@ abstract class AbstractDriverTest extends TestCase
 {
     protected $driver;
 
-    public function setUp()
+    public function setUp() : void
     {
         // implement driver setup and metadata read
     }
 
-    public function tearDown()
+    public function tearDown() : void
     {
         unset($this->driver);
     }

diff --git a/tests/Doctrine/ODM/MongoDB/Tests/Mapping/Driver/XmlDriverTest.php b/tests/Doctrine/ODM/MongoDB/Tests/Mapping/Driver/XmlDriverTest.php
@@ -14,7 +14,7 @@
 
 class XmlDriverTest extends AbstractDriverTest
 {
-    public function setUp()
+    public function setUp() : void
     {
         $this->driver = new XmlDriver(__DIR__ . '/fixtures/xml');
     }

diff --git a/tests/Doctrine/ODM/MongoDB/Tests/Mapping/ShardKeyInheritanceMappingTest.php b/tests/Doctrine/ODM/MongoDB/Tests/Mapping/ShardKeyInheritanceMappingTest.php
@@ -13,7 +13,7 @@ class ShardKeyInheritanceMappingTest extends BaseTest
     /** @var ClassMetadataFactory */
     private $factory;
 
-    public function setUp()
+    public function setUp() : void
     {
         parent::setUp();
         $this->factory = new ClassMetadataFactory();

diff --git a/tests/Doctrine/ODM/MongoDB/Tests/Mapping/Symfony/AbstractDriverTest.php b/tests/Doctrine/ODM/MongoDB/Tests/Mapping/Symfony/AbstractDriverTest.php
@@ -64,13 +64,13 @@ public function testFindMappingNamespaceNotFound()
         $driver->getLocator()->findMappingFile('MyOtherNamespace\MySubnamespace\Document\Foo');
     }
 
-    protected function setUp()
+    protected function setUp() : void
     {
         $this->dir = sys_get_temp_dir() . '/abstract_driver_test';
         @mkdir($this->dir, 0775, true);
     }
 
-    protected function tearDown()
+    protected function tearDown() : void
     {
         $iterator = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($this->dir), RecursiveIteratorIterator::CHILD_FIRST);
 

diff --git a/...trine/ODM/MongoDB/Tests/PersistentCollection/DefaultPersistentCollectionGeneratorTest.php b/...trine/ODM/MongoDB/Tests/PersistentCollection/DefaultPersistentCollectionGeneratorTest.php
@@ -16,7 +16,7 @@ class DefaultPersistentCollectionGeneratorTest extends BaseTest
     /** @var DefaultPersistentCollectionGenerator */
     private $generator;
 
-    public function setUp()
+    public function setUp() : void
     {
         parent::setUp();
         $this->generator = new DefaultPersistentCollectionGenerator(

diff --git a/tests/Doctrine/ODM/MongoDB/Tests/Persisters/PersistenceBuilderTest.php b/tests/Doctrine/ODM/MongoDB/Tests/Persisters/PersistenceBuilderTest.php
@@ -21,13 +21,13 @@ class PersistenceBuilderTest extends BaseTest
 {
     private $pb;
 
-    public function setUp()
+    public function setUp() : void
     {
         parent::setUp();
         $this->pb = $this->dm->getUnitOfWork()->getPersistenceBuilder();
     }
 
-    public function tearDown()
+    public function tearDown() : void
     {
         unset($this->pb);
         parent::tearDown();

diff --git a/tests/Doctrine/ODM/MongoDB/Tests/Query/QueryExpressionVisitorTest.php b/tests/Doctrine/ODM/MongoDB/Tests/Query/QueryExpressionVisitorTest.php
@@ -19,7 +19,7 @@ class QueryExpressionVisitorTest extends BaseTest
     private $queryBuilder;
     private $visitor;
 
-    public function setUp()
+    public function setUp() : void
     {
         parent::setUp();
         $this->queryBuilder = $this->dm->createQueryBuilder(Bar::class);