Update PHPUnit to more modern versions (#47)

.github/workflows/test.yml

@@ -72,6 +72,7 @@ jobs:
           --coverage-clover coverage.xml
           --coverage-text
           --log-junit junit.xml
+          ${{ matrix.dependencies == 'low' && '--config phpunit10.xml.dist' || '' }}
 
       - name: Submit code coverage
         if: ${{ always() }}

.gitignore

@@ -1,4 +1,4 @@
 vendor/
 composer.lock
 .generated
-.phpunit.result.cache
+.phpunit.cache

composer.json

@@ -12,7 +12,7 @@
     "require-dev": {
         "phpstan/phpstan": "^1.10",
         "phpstan/phpstan-phpunit": "^1.3",
-        "phpunit/phpunit": "^9.3 || ^10",
+        "phpunit/phpunit": "^10 || ^11",
         "squizlabs/php_codesniffer": "^3.5"
     },
     "autoload": {

phpunit.xml.dist

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/11.3/phpunit.xsd"
+         bootstrap="vendor/autoload.php"
+         executionOrder="depends,defects"
+         beStrictAboutOutputDuringTests="true"
+         cacheDirectory=".phpunit.cache"
+         requireCoverageMetadata="true"
+         beStrictAboutCoverageMetadata="false">
+  <testsuites>
+    <testsuite name="default">
+      <directory suffix="Test.php">tests</directory>
+    </testsuite>
+  </testsuites>
+  <source>
+    <include>
+      <directory suffix=".php">src</directory>
+    </include>
+  </source>
+</phpunit>

phpunit.xml → phpunit10.xml.dist

@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd"
          bootstrap="vendor/autoload.php"
          executionOrder="depends,defects"
-         forceCoversAnnotation="true"
-         beStrictAboutCoversAnnotation="false"
          beStrictAboutOutputDuringTests="true"
-         beStrictAboutTodoAnnotatedTests="true"
-         verbose="true">
-  <coverage processUncoveredFiles="true">
+         cacheDirectory=".phpunit.cache"
+         requireCoverageMetadata="true"
+         beStrictAboutCoverageMetadata="false">
+  <coverage>
     <include>
       <directory suffix=".php">src</directory>
     </include>

tests/AttributeDriverTest.php

@@ -8,10 +8,13 @@
     EntityManagerInterface,
     Mapping,
 };
+use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Small;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
 
-/**
- * @covers Firehed\Mocktrine\InMemoryEntityManager
- */
+#[CoversClass(InMemoryEntityManager::class)]
+#[Small]
 class AttributeDriverTest extends InMemoryEntityManagerTest
 {
     public function setUp(): void

tests/CriteriaEvaluatorFactoryTest.php

@@ -5,10 +5,13 @@
 namespace Firehed\Mocktrine;
 
 use Doctrine\Persistence\Mapping\ClassMetadata;
+use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Small;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
 
-/**
- * @covers Firehed\Mocktrine\CriteriaEvaluatorFactory
- */
+#[CoversClass(CriteriaEvaluatorFactory::class)]
+#[Small]
 class CriteriaEvaluatorFactoryTest extends \PHPUnit\Framework\TestCase
 {
     public function testGetInstanceReturnsSingleton(): void

tests/CriteriaEvaluatorTest.php

@@ -10,10 +10,13 @@
 use Doctrine\ORM\Mapping\Driver\AnnotationDriver;
 use Doctrine\Persistence\Mapping\ClassMetadata;
 use Firehed\Mocktrine\Entities\GrabBag;
+use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Small;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
 
-/**
- * @covers Firehed\Mocktrine\CriteriaEvaluator
- */
+#[CoversClass(CriteriaEvaluator::class)]
+#[Small]
 class CriteriaEvaluatorTest extends \PHPUnit\Framework\TestCase
 {
     /** @var InMemoryRepository<GrabBag> */

tests/InMemoryEntityManagerTest.php

@@ -8,10 +8,13 @@
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Mapping\Driver\AnnotationDriver;
 use Doctrine\Persistence\ObjectRepository;
+use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Small;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
 
-/**
- * @covers Firehed\Mocktrine\InMemoryEntityManager
- */
+#[CoversClass(InMemoryEntityManager::class)]
+#[Small]
 class InMemoryEntityManagerTest extends \PHPUnit\Framework\TestCase
 {
     protected function getEntityManager(): InMemoryEntityManager

tests/InMemoryRepositoryTest.php

@@ -12,12 +12,15 @@
 use Doctrine\ORM\Mapping\MappingException;
 use Doctrine\Persistence\Mapping\Driver\MappingDriver;
 use Error;
+use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Small;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
 use TypeError;
 use UnexpectedValueException;
 
-/**
- * @covers Firehed\Mocktrine\InMemoryRepository
- */
+#[CoversClass(InMemoryRepository::class)]
+#[Small]
 class InMemoryRepositoryTest extends \PHPUnit\Framework\TestCase
 {
     private MappingDriver $driver;

tests/XmlDriverTest.php

@@ -8,10 +8,13 @@
     EntityManagerInterface,
     Mapping,
 };
+use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Small;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
 
-/**
- * @covers Firehed\Mocktrine\InMemoryEntityManager
- */
+#[CoversClass(InMemoryEntityManager::class)]
+#[Small]
 class XmlDriverTest extends InMemoryEntityManagerTest
 {
     protected function getEntityManager(): InMemoryEntityManager