Merge pull request #560 from greg0ire/prepare-phpunit-upgrade

Prepare phpunit upgrade

Author: greg0ire

phpunit.xml.dist

@@ -3,18 +3,22 @@
          xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
          colors="true"
          beStrictAboutOutputDuringTests="true"
-         beStrictAboutTodoAnnotatedTests="true"
-         bootstrap="vendor/autoload.php"
+         displayDetailsOnTestsThatTriggerDeprecations="true"
+         failOnDeprecation="true"
 >
     <testsuites>
         <testsuite name="Doctrine Data Fixtures Test Suite">
             <directory>./tests</directory>
         </testsuite>
     </testsuites>
 
-    <coverage>
+    <php>
+        <env name="DOCTRINE_DEPRECATIONS" value="trigger"/>
+    </php>
+
+    <source ignoreSuppressionOfDeprecations="true">
         <include>
             <directory>./src</directory>
         </include>
-    </coverage>
+    </source>
 </phpunit>

tests/Common/DataFixtures/BaseTestCase.php

@@ -11,9 +11,6 @@
 
 use function method_exists;
 
-/**
- * Base test class
- */
 abstract class BaseTestCase extends TestCase
 {
     /**

tests/Common/DataFixtures/Executor/ORMExecutorSharedFixtureTest.php

@@ -10,6 +10,7 @@
 use Doctrine\ORM\Tools\SchemaTool;
 use Doctrine\Tests\Common\DataFixtures\TestEntity\Role;
 use Doctrine\Tests\Common\DataFixtures\TestEntity\User;
+use PHPUnit\Framework\Attributes\IgnoreDeprecations;
 use PHPUnit\Framework\MockObject\MockObject;
 
 /**
@@ -20,6 +21,7 @@ class ORMExecutorSharedFixtureTest extends BaseTestCase
     public const TEST_ENTITY_ROLE = Role::class;
     public const TEST_ENTITY_USER = User::class;
 
+    #[IgnoreDeprecations]
     public function testFixtureExecution(): void
     {
         $em       = $this->getMockSqliteEntityManager();
@@ -39,6 +41,7 @@ public function testFixtureExecution(): void
         $executor->execute([$fixture], true);
     }
 
+    #[IgnoreDeprecations]
     public function testSharedFixtures(): void
     {
         $em         = $this->getMockSqliteEntityManager();

tests/Common/DataFixtures/Executor/PHPCRExecutorTest.php

@@ -10,16 +10,13 @@
 use Doctrine\ODM\PHPCR\DocumentManager;
 use Doctrine\Tests\Common\DataFixtures\BaseTestCase;
 use Exception;
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\MockObject\MockObject;
 use Throwable;
 
 use function class_exists;
 
-/**
- * Tests for {@see \Doctrine\Common\DataFixtures\Executor\PHPCRExecutor}
- *
- * @covers \Doctrine\Common\DataFixtures\Executor\PHPCRExecutor
- */
+#[CoversClass(PHPCRExecutor::class)]
 class PHPCRExecutorTest extends BaseTestCase
 {
     public function testExecuteSingleFixtureWithNoPurge(): void
@@ -33,9 +30,9 @@ public function testExecuteSingleFixtureWithNoPurge(): void
             ->expects($this->once())
             ->method('transactional')
             ->with($this->isType('callable'))
-            ->will($this->returnCallback(static function ($callback) use ($dm) {
+            ->willReturnCallback(static function ($callback) use ($dm) {
                 return $callback($dm);
-            }));
+            });
 
         $executor->execute([$fixture], true);
     }
@@ -53,9 +50,9 @@ public function testExecuteMultipleFixturesWithNoPurge(): void
             ->expects($this->once())
             ->method('transactional')
             ->with($this->isType('callable'))
-            ->will($this->returnCallback(static function ($callback) use ($dm) {
+            ->willReturnCallback(static function ($callback) use ($dm) {
                 return $callback($dm);
-            }));
+            });
 
         $executor->execute([$fixture1, $fixture2], true);
     }
@@ -72,9 +69,9 @@ public function testExecuteFixtureWithPurge(): void
             ->expects($this->once())
             ->method('transactional')
             ->with($this->isType('callable'))
-            ->will($this->returnCallback(static function ($callback) use ($dm) {
+            ->willReturnCallback(static function ($callback) use ($dm) {
                 return $callback($dm);
-            }));
+            });
         $purger->expects($this->once())->method('purge');
 
         $executor->execute([$fixture], false);
@@ -92,9 +89,9 @@ public function testExecuteFixtureWithoutPurge(): void
             ->expects($this->once())
             ->method('transactional')
             ->with($this->isType('callable'))
-            ->will($this->returnCallback(static function ($callback) use ($dm) {
+            ->willReturnCallback(static function ($callback) use ($dm) {
                 return $callback($dm);
-            }));
+            });
         $purger->expects($this->never())->method('purge');
 
         $executor->execute([$fixture], true);

tests/Common/DataFixtures/ProxyReferenceRepositoryTest.php

@@ -13,10 +13,8 @@
 use Doctrine\Tests\Common\DataFixtures\TestEntity\Role;
 use Doctrine\Tests\Common\DataFixtures\TestTypes\UuidType;
 use Doctrine\Tests\Common\DataFixtures\TestValueObjects\Uuid;
+use PHPUnit\Framework\Attributes\IgnoreDeprecations;
 
-/**
- * Test ProxyReferenceRepository.
- */
 class ProxyReferenceRepositoryTest extends BaseTestCase
 {
     public const TEST_ENTITY_ROLE = Role::class;
@@ -33,12 +31,15 @@ public static function setUpBeforeClass(): void
         Type::addType('uuid', UuidType::class);
     }
 
+    #[IgnoreDeprecations]
     public function testReferenceEntry(): void
     {
         $em   = $this->getMockSqliteEntityManager();
         $role = new TestEntity\Role();
         $role->setName('admin');
         $meta = $em->getClassMetadata(self::TEST_ENTITY_ROLE);
+
+        // getPropertyAccessor() is not available with Doctrine < 3.4
         $meta->getReflectionProperty('id')->setValue($role, 1);
 
         $referenceRepo = new ProxyReferenceRepository($em);
@@ -72,7 +73,7 @@ public function testReferenceIdentityPopulation(): void
 
         $referenceRepository->expects($this->once())
             ->method('getReferenceNames')
-            ->will($this->returnValue(['admin-role']));
+            ->willReturn(['admin-role']);
 
         $referenceRepository->expects($this->once())
             ->method('setReferenceIdentity')
@@ -131,6 +132,7 @@ public function testReferenceReconstruction(): void
         $this->assertInstanceOf(Proxy::class, $ref);
     }
 
+    #[IgnoreDeprecations]
     public function testReconstructionOfCustomTypedId(): void
     {
         $em                  = $this->getMockSqliteEntityManager();

tests/Common/DataFixtures/ReferenceRepositoryTest.php

@@ -15,6 +15,7 @@
 use Doctrine\Tests\Common\DataFixtures\TestEntity\User;
 use Doctrine\Tests\Mock\ForwardCompatibleEntityManager;
 use OutOfBoundsException;
+use PHPUnit\Framework\Attributes\IgnoreDeprecations;
 
 use function sprintf;
 
@@ -131,7 +132,7 @@ public function testUndefinedReference(): void
         $referenceRepository->getReference('foo', Role::class);
     }
 
-    /** @group legacy */
+    #[IgnoreDeprecations]
     public function testLegacyUndefinedReference(): void
     {
         $referenceRepository = new ReferenceRepository($this->getMockSqliteEntityManager());

tests/Common/DataFixtures/Sorter/TopologicalSorterTest.php

@@ -8,6 +8,7 @@
 use Doctrine\Common\DataFixtures\Sorter\TopologicalSorter;
 use Doctrine\ORM\Mapping\ClassMetadata;
 use Doctrine\Tests\Common\DataFixtures\BaseTestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 use RuntimeException;
 
 /**
@@ -16,9 +17,8 @@
  * Note: When writing tests here consider that a lot of graph
  *       constellations can have many valid orderings, so you may want to
  *       build a graph that has only 1 valid order to simplify your tests
- *
- * @covers \Doctrine\Common\DataFixtures\Sorter\TopologicalSorter
  */
+#[CoversClass(TopologicalSorter::class)]
 class TopologicalSorterTest extends BaseTestCase
 {
     public function testSuccessSortLinearDependency(): void

tests/Common/DataFixtures/Sorter/VertexTest.php

@@ -7,8 +7,9 @@
 use Doctrine\Common\DataFixtures\Sorter\Vertex;
 use Doctrine\ORM\Mapping\ClassMetadata;
 use Doctrine\Tests\Common\DataFixtures\BaseTestCase;
+use PHPUnit\Framework\Attributes\CoversClass;
 
-/** @covers \Doctrine\Common\DataFixtures\Sorter\Vertex */
+#[CoversClass(Vertex::class)]
 class VertexTest extends BaseTestCase
 {
     public function testNode(): void