Remove MockBuilderCompatibilityTools (#9814)

tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2359Test.php

@@ -15,16 +15,13 @@
 use Doctrine\ORM\Mapping\GeneratedValue;
 use Doctrine\ORM\Mapping\Id;
 use Doctrine\Persistence\Mapping\Driver\MappingDriver;
-use Doctrine\Tests\PHPUnitCompatibility\MockBuilderCompatibilityTools;
 use PHPUnit\Framework\TestCase;
 
 /**
  * @group DDC-2359
  */
 class DDC2359Test extends TestCase
 {
-    use MockBuilderCompatibilityTools;
-
     /**
      * Verifies that {@see \Doctrine\ORM\Mapping\ClassMetadataFactory::wakeupReflection} is
      * not called twice when loading metadata from a driver
@@ -35,12 +32,12 @@ public function testIssue(): void
         $mockMetadata  = $this->createMock(ClassMetadata::class);
         $entityManager = $this->createMock(EntityManager::class);
 
-        $metadataFactory = $this
-            ->getMockBuilderWithOnlyMethods(ClassMetadataFactory::class, ['newClassMetadataInstance', 'wakeupReflection'])
+        $metadataFactory = $this->getMockBuilder(ClassMetadataFactory::class)
+            ->onlyMethods(['newClassMetadataInstance', 'wakeupReflection'])
             ->getMock();
 
-        $configuration = $this
-            ->getMockBuilderWithOnlyMethods(Configuration::class, ['getMetadataDriverImpl'])
+        $configuration = $this->getMockBuilder(Configuration::class)
+            ->onlyMethods(['getMetadataDriverImpl'])
             ->getMock();
 
         $connection = $this->createMock(Connection::class);

tests/Doctrine/Tests/ORM/Hydration/ObjectHydratorTest.php

@@ -29,14 +29,11 @@
 use Doctrine\Tests\Models\Forum\ForumCategory;
 use Doctrine\Tests\Models\Hydration\EntityWithArrayDefaultArrayValueM2M;
 use Doctrine\Tests\Models\Hydration\SimpleEntity;
-use Doctrine\Tests\PHPUnitCompatibility\MockBuilderCompatibilityTools;
 
 use function count;
 
 class ObjectHydratorTest extends HydrationTestCase
 {
-    use MockBuilderCompatibilityTools;
-
     /**
      * @psalm-return list<array{mixed}>
      */
@@ -1038,7 +1035,8 @@ public function testCreatesProxyForLazyLoadingWithForeignKeys(): void
         $proxyInstance = new ECommerceShipping();
 
         // mocking the proxy factory
-        $proxyFactory = $this->getMockBuilderWithOnlyMethods(ProxyFactory::class, ['getProxy'])
+        $proxyFactory = $this->getMockBuilder(ProxyFactory::class)
+                             ->onlyMethods(['getProxy'])
                              ->disableOriginalConstructor()
                              ->getMock();
 
@@ -1086,7 +1084,8 @@ public function testCreatesProxyForLazyLoadingWithForeignKeysWithAliasedProductE
         $proxyInstance = new ECommerceShipping();
 
         // mocking the proxy factory
-        $proxyFactory = $this->getMockBuilderWithOnlyMethods(ProxyFactory::class, ['getProxy'])
+        $proxyFactory = $this->getMockBuilder(ProxyFactory::class)
+            ->onlyMethods(['getProxy'])
                              ->disableOriginalConstructor()
                              ->getMock();
 

tests/Doctrine/Tests/ORM/Id/SequenceGeneratorTest.php

@@ -9,12 +9,9 @@
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\ORM\Id\SequenceGenerator;
 use Doctrine\Tests\OrmTestCase;
-use Doctrine\Tests\PHPUnitCompatibility\MockBuilderCompatibilityTools;
 
 class SequenceGeneratorTest extends OrmTestCase
 {
-    use MockBuilderCompatibilityTools;
-
     public function testGeneration(): void
     {
         $sequenceGenerator = new SequenceGenerator('seq', 10);
@@ -23,7 +20,8 @@ public function testGeneration(): void
         $platform->method('getSequenceNextValSQL')
             ->willReturn('');
 
-        $connection = $this->getMockBuilderWithOnlyMethods(Connection::class, ['fetchOne', 'getDatabasePlatform'])
+        $connection = $this->getMockBuilder(Connection::class)
+            ->onlyMethods(['fetchOne', 'getDatabasePlatform'])
             ->setConstructorArgs([[], $this->createMock(Driver::class)])
             ->getMock();
         $connection->method('getDatabasePlatform')

tests/Doctrine/Tests/ORM/Mapping/ClassMetadataFactoryTest.php

@@ -41,7 +41,6 @@
 use Doctrine\Tests\Models\Quote\Phone;
 use Doctrine\Tests\Models\Quote\User;
 use Doctrine\Tests\OrmTestCase;
-use Doctrine\Tests\PHPUnitCompatibility\MockBuilderCompatibilityTools;
 use DoctrineGlobalArticle;
 use Exception;
 use InvalidArgumentException;
@@ -55,7 +54,6 @@
 
 class ClassMetadataFactoryTest extends OrmTestCase
 {
-    use MockBuilderCompatibilityTools;
     use VerifyDeprecations;
 
     public function testGetMetadataForSingleClass(): void

tests/Doctrine/Tests/ORM/Proxy/ProxyFactoryTest.php

@@ -20,7 +20,6 @@
 use Doctrine\Tests\Models\Company\CompanyPerson;
 use Doctrine\Tests\Models\ECommerce\ECommerceFeature;
 use Doctrine\Tests\OrmTestCase;
-use Doctrine\Tests\PHPUnitCompatibility\MockBuilderCompatibilityTools;
 use ReflectionProperty;
 use stdClass;
 
@@ -32,8 +31,6 @@
  */
 class ProxyFactoryTest extends OrmTestCase
 {
-    use MockBuilderCompatibilityTools;
-
     private UnitOfWorkMock $uowMock;
 
     private EntityManagerMock $emMock;
@@ -60,7 +57,8 @@ public function testReferenceProxyDelegatesLoadingToThePersister(): void
     {
         $identifier = ['id' => 42];
         $proxyClass = 'Proxies\__CG__\Doctrine\Tests\Models\ECommerce\ECommerceFeature';
-        $persister  = $this->getMockBuilderWithOnlyMethods(BasicEntityPersister::class, ['load'])
+        $persister  = $this->getMockBuilder(BasicEntityPersister::class)
+            ->onlyMethods(['load'])
             ->disableOriginalConstructor()
             ->getMock();
 
@@ -123,8 +121,8 @@ public function testSkipAbstractClassesOnGeneration(): void
      */
     public function testFailedProxyLoadingDoesNotMarkTheProxyAsInitialized(): void
     {
-        $persister = $this
-            ->getMockBuilderWithOnlyMethods(BasicEntityPersister::class, ['load', 'getClassMetadata'])
+        $persister = $this->getMockBuilder(BasicEntityPersister::class)
+            ->onlyMethods(['load', 'getClassMetadata'])
             ->disableOriginalConstructor()
             ->getMock();
         $this->uowMock->setEntityPersister(ECommerceFeature::class, $persister);
@@ -153,8 +151,8 @@ public function testFailedProxyLoadingDoesNotMarkTheProxyAsInitialized(): void
      */
     public function testFailedProxyCloningDoesNotMarkTheProxyAsInitialized(): void
     {
-        $persister = $this
-            ->getMockBuilderWithOnlyMethods(BasicEntityPersister::class, ['load', 'getClassMetadata'])
+        $persister = $this->getMockBuilder(BasicEntityPersister::class)
+            ->onlyMethods(['load', 'getClassMetadata'])
             ->disableOriginalConstructor()
             ->getMock();
         $this->uowMock->setEntityPersister(ECommerceFeature::class, $persister);
@@ -192,8 +190,8 @@ public function testProxyClonesParentFields(): void
 
         $classMetaData = $this->emMock->getClassMetadata(CompanyEmployee::class);
 
-        $persister = $this
-            ->getMockBuilderWithOnlyMethods(BasicEntityPersister::class, ['load', 'getClassMetadata'])
+        $persister = $this->getMockBuilder(BasicEntityPersister::class)
+            ->onlyMethods(['load', 'getClassMetadata'])
             ->disableOriginalConstructor()
             ->getMock();
         $this->uowMock->setEntityPersister(CompanyEmployee::class, $persister);

tests/Doctrine/Tests/ORM/Tools/Pagination/PaginatorTest.php

@@ -14,13 +14,10 @@
 use Doctrine\ORM\Query\QueryException;
 use Doctrine\ORM\Tools\Pagination\Paginator;
 use Doctrine\Tests\OrmTestCase;
-use Doctrine\Tests\PHPUnitCompatibility\MockBuilderCompatibilityTools;
 use PHPUnit\Framework\MockObject\MockObject;
 
 class PaginatorTest extends OrmTestCase
 {
-    use MockBuilderCompatibilityTools;
-
     /** @var Connection&MockObject */
     private $connection;
     /** @var EntityManagerInterface&MockObject */
@@ -40,11 +37,13 @@ protected function setUp(): void
         $driver->method('getDatabasePlatform')
             ->willReturn($platform);
 
-        $this->connection = $this->getMockBuilderWithOnlyMethods(Connection::class, ['executeQuery'])
+        $this->connection = $this->getMockBuilder(Connection::class)
+            ->onlyMethods(['executeQuery'])
             ->setConstructorArgs([[], $driver])
             ->getMock();
 
-        $this->em = $this->getMockBuilderWithOnlyMethods(EntityManagerDecorator::class, ['newHydrator'])
+        $this->em = $this->getMockBuilder(EntityManagerDecorator::class)
+            ->onlyMethods(['newHydrator'])
             ->setConstructorArgs([$this->createTestEntityManagerWithConnection($this->connection)])
             ->getMock();
 

tests/Doctrine/Tests/ORM/UnitOfWorkTest.php

@@ -33,7 +33,6 @@
 use Doctrine\Tests\Models\Forum\ForumAvatar;
 use Doctrine\Tests\Models\Forum\ForumUser;
 use Doctrine\Tests\OrmTestCase;
-use Doctrine\Tests\PHPUnitCompatibility\MockBuilderCompatibilityTools;
 use PHPUnit\Framework\MockObject\MockObject;
 use stdClass;
 
@@ -46,8 +45,6 @@
  */
 class UnitOfWorkTest extends OrmTestCase
 {
-    use MockBuilderCompatibilityTools;
-
     /**
      * SUT
      */
@@ -610,7 +607,8 @@ public function testCommitThrowOptimisticLockExceptionWhenConnectionCommitFails(
             ->willReturn($platform);
 
         // Set another connection mock that fail on commit
-        $this->connection  = $this->getMockBuilderWithOnlyMethods(Connection::class, ['commit'])
+        $this->connection  = $this->getMockBuilder(Connection::class)
+            ->onlyMethods(['commit'])
             ->setConstructorArgs([[], $driver])
             ->getMock();
         $this->_emMock     = EntityManagerMock::create($this->connection, null, $this->eventManager);