diff --git a/tests/Doctrine/Tests/DoctrineTestCase.php b/tests/Doctrine/Tests/DoctrineTestCase.php deleted file mode 100644 index b6679a93787..00000000000 --- a/tests/Doctrine/Tests/DoctrineTestCase.php +++ /dev/null @@ -1,59 +0,0 @@ - */ - private static array $phpunitMethodRenames = [ - 'assertMatchesRegularExpression' => 'assertRegExp', // can be removed when PHPUnit 9 is minimum - 'assertDoesNotMatchRegularExpression' => 'assertNotRegExp', // can be removed when PHPUnit 9 is minimum - 'assertFileDoesNotExist' => 'assertFileNotExists', // can be removed PHPUnit 9 is minimum - 'expectExceptionMessageMatches' => 'expectExceptionMessageRegExp', // can be removed when PHPUnit 8 is minimum - ]; - - /** @param array $arguments */ - public static function __callStatic(string $method, array $arguments): mixed - { - if (isset(self::$phpunitMethodRenames[$method])) { - $method = self::$phpunitMethodRenames[$method]; - - return self::$method(...$arguments); - } - - throw new BadMethodCallException(sprintf('%s::%s does not exist', static::class, $method)); - } - - /** @param array $arguments */ - public function __call(string $method, array $arguments): mixed - { - if ($method === 'createStub') { - return $this->getMockBuilder(...$arguments) - ->disableOriginalConstructor() - ->disableOriginalClone() - ->disableArgumentCloning() - ->disallowMockingUnknownTypes() - ->getMock(); - } - - if (isset(self::$phpunitMethodRenames[$method])) { - $method = self::$phpunitMethodRenames[$method]; - - return self::$method(...$arguments); - } - - throw new BadMethodCallException(sprintf('%s::%s does not exist', static::class, $method)); - } -} diff --git a/tests/Doctrine/Tests/ORM/Cache/CacheConfigTest.php b/tests/Doctrine/Tests/ORM/Cache/CacheConfigTest.php index b36dad4b409..453f828000c 100644 --- a/tests/Doctrine/Tests/ORM/Cache/CacheConfigTest.php +++ b/tests/Doctrine/Tests/ORM/Cache/CacheConfigTest.php @@ -10,13 +10,13 @@ use Doctrine\ORM\Cache\QueryCacheValidator; use Doctrine\ORM\Cache\TimestampQueryCacheValidator; use Doctrine\ORM\Cache\TimestampRegion; -use Doctrine\Tests\DoctrineTestCase; use PHPUnit\Framework\Attributes\CoversClass; use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\TestCase; #[CoversClass(CacheConfiguration::class)] #[Group('DDC-2183')] -class CacheConfigTest extends DoctrineTestCase +class CacheConfigTest extends TestCase { private CacheConfiguration $config; diff --git a/tests/Doctrine/Tests/ORM/Cache/CacheKeyTest.php b/tests/Doctrine/Tests/ORM/Cache/CacheKeyTest.php index 3f8d4465753..ee51e3fc9b5 100644 --- a/tests/Doctrine/Tests/ORM/Cache/CacheKeyTest.php +++ b/tests/Doctrine/Tests/ORM/Cache/CacheKeyTest.php @@ -7,11 +7,11 @@ use Doctrine\ORM\Cache\CacheKey; use Doctrine\ORM\Cache\CollectionCacheKey; use Doctrine\ORM\Cache\EntityCacheKey; -use Doctrine\Tests\DoctrineTestCase; use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\TestCase; #[Group('DDC-2183')] -class CacheKeyTest extends DoctrineTestCase +class CacheKeyTest extends TestCase { public function testEntityCacheKeyIdentifierCollision(): void { diff --git a/tests/Doctrine/Tests/ORM/Cache/CacheLoggerChainTest.php b/tests/Doctrine/Tests/ORM/Cache/CacheLoggerChainTest.php index 685247bcf4a..0edb3faf5f7 100644 --- a/tests/Doctrine/Tests/ORM/Cache/CacheLoggerChainTest.php +++ b/tests/Doctrine/Tests/ORM/Cache/CacheLoggerChainTest.php @@ -9,13 +9,13 @@ use Doctrine\ORM\Cache\Logging\CacheLogger; use Doctrine\ORM\Cache\Logging\CacheLoggerChain; use Doctrine\ORM\Cache\QueryCacheKey; -use Doctrine\Tests\DoctrineTestCase; use Doctrine\Tests\Models\Cache\State; use PHPUnit\Framework\Attributes\Group; use PHPUnit\Framework\MockObject\MockObject; +use PHPUnit\Framework\TestCase; #[Group('DDC-2183')] -class CacheLoggerChainTest extends DoctrineTestCase +class CacheLoggerChainTest extends TestCase { private CacheLoggerChain $logger; private CacheLogger&MockObject $mock; diff --git a/tests/Doctrine/Tests/ORM/Cache/StatisticsCacheLoggerTest.php b/tests/Doctrine/Tests/ORM/Cache/StatisticsCacheLoggerTest.php index 0e9ca861780..e0a6b2922a4 100644 --- a/tests/Doctrine/Tests/ORM/Cache/StatisticsCacheLoggerTest.php +++ b/tests/Doctrine/Tests/ORM/Cache/StatisticsCacheLoggerTest.php @@ -8,12 +8,12 @@ use Doctrine\ORM\Cache\EntityCacheKey; use Doctrine\ORM\Cache\Logging\StatisticsCacheLogger; use Doctrine\ORM\Cache\QueryCacheKey; -use Doctrine\Tests\DoctrineTestCase; use Doctrine\Tests\Models\Cache\State; use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\TestCase; #[Group('DDC-2183')] -class StatisticsCacheLoggerTest extends DoctrineTestCase +class StatisticsCacheLoggerTest extends TestCase { private StatisticsCacheLogger $logger; diff --git a/tests/Doctrine/Tests/ORM/ConfigurationTest.php b/tests/Doctrine/Tests/ORM/ConfigurationTest.php index 568a8709ee4..3e61fa89add 100644 --- a/tests/Doctrine/Tests/ORM/ConfigurationTest.php +++ b/tests/Doctrine/Tests/ORM/ConfigurationTest.php @@ -16,15 +16,15 @@ use Doctrine\ORM\Mapping\QuoteStrategy; use Doctrine\ORM\Proxy\ProxyFactory; use Doctrine\Persistence\Mapping\Driver\MappingDriver; -use Doctrine\Tests\DoctrineTestCase; use Doctrine\Tests\Models\DDC753\DDC753CustomRepository; use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\TestCase; use Psr\Cache\CacheItemPoolInterface; /** * Tests for the Configuration object */ -class ConfigurationTest extends DoctrineTestCase +class ConfigurationTest extends TestCase { use VerifyDeprecations; diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC4024Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC4024Test.php index 3091a47c11f..418254e1d07 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC4024Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC4024Test.php @@ -5,11 +5,11 @@ namespace Doctrine\Tests\ORM\Functional\Ticket; use Doctrine\ORM\NonUniqueResultException; -use Doctrine\Tests\DoctrineTestCase; use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\TestCase; #[Group('DDC4024')] -final class DDC4024Test extends DoctrineTestCase +final class DDC4024Test extends TestCase { public function testConstructorShouldUseProvidedMessage(): void { diff --git a/tests/Doctrine/Tests/ORM/Tools/Console/ConsoleRunnerTest.php b/tests/Doctrine/Tests/ORM/Tools/Console/ConsoleRunnerTest.php index 7d79068adbd..3d3d89f4b4b 100644 --- a/tests/Doctrine/Tests/ORM/Tools/Console/ConsoleRunnerTest.php +++ b/tests/Doctrine/Tests/ORM/Tools/Console/ConsoleRunnerTest.php @@ -8,16 +8,16 @@ use DBALConsole\Command\ReservedWordsCommand; use Doctrine\ORM\Tools\Console\ConsoleRunner; use Doctrine\ORM\Tools\Console\EntityManagerProvider; -use Doctrine\Tests\DoctrineTestCase; use PHPUnit\Framework\Attributes\CoversClass; use PHPUnit\Framework\Attributes\Group; +use PHPUnit\Framework\TestCase; use Symfony\Component\Console\Command\Command; use function class_exists; #[CoversClass(ConsoleRunner::class)] #[Group('DDC-3186')] -final class ConsoleRunnerTest extends DoctrineTestCase +final class ConsoleRunnerTest extends TestCase { public function testCreateApplicationShouldReturnAnApplicationWithTheCorrectCommands(): void { diff --git a/tests/Doctrine/Tests/OrmTestCase.php b/tests/Doctrine/Tests/OrmTestCase.php index 29ec9c09f39..52d0a4d2781 100644 --- a/tests/Doctrine/Tests/OrmTestCase.php +++ b/tests/Doctrine/Tests/OrmTestCase.php @@ -17,6 +17,7 @@ use Doctrine\ORM\Configuration; use Doctrine\ORM\Mapping\Driver\AttributeDriver; use Doctrine\Tests\Mocks\EntityManagerMock; +use PHPUnit\Framework\TestCase; use Psr\Cache\CacheItemPoolInterface; use Symfony\Component\Cache\Adapter\ArrayAdapter; @@ -27,7 +28,7 @@ /** * Base testcase class for all ORM testcases. */ -abstract class OrmTestCase extends DoctrineTestCase +abstract class OrmTestCase extends TestCase { /** * The metadata cache that is shared between all ORM tests (except functional tests).