Merge pull request #845 from driehle/upgrade-phpunit

Upgraded from PHPUnit 9 to 10
doctrine · Dec 24, 2024 · e2a43ac · e2a43ac
2 parents 47231be + 1c008a5
commit e2a43ac
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 20 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,8 +1,8 @@
 /.phpcs.cache
-/.phpunit.result.cache
 /coverage.xml
 /composer.lock
 /phpcs.xml
 /phpunit.xml
+/.phpunit.cache/
 /output/
 /vendor/
diff --git a/composer.json b/composer.json
@@ -73,7 +73,7 @@
         "phpdocumentor/guides-cli": "^1.5.0",
         "phpstan/phpstan": "^1.9.2",
         "phpstan/phpstan-phpunit": "^1.3.0",
-        "phpunit/phpunit": "^9.5.27",
+        "phpunit/phpunit": "^10.5.40",
         "predis/predis": "^1.1.10"
     },
     "conflict": {

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,17 +1,17 @@
 <?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"
-         convertDeprecationsToExceptions="true"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
          bootstrap="vendor/autoload.php"
-         colors="true">
-  <coverage processUncoveredFiles="false">
-    <include>
-      <directory suffix=".php">./src</directory>
-    </include>
-  </coverage>
+         colors="true"
+         cacheDirectory=".phpunit.cache">
   <testsuites>
     <testsuite name="DoctrineModule Test Suite">
       <directory>./tests</directory>
     </testsuite>
   </testsuites>
+  <source>
+    <include>
+      <directory suffix=".php">./src</directory>
+    </include>
+  </source>
 </phpunit>
diff --git a/tests/Service/CacheFactoryTest.php b/tests/Service/CacheFactoryTest.php
@@ -24,7 +24,7 @@
  */
 class CacheFactoryTest extends BaseTestCase
 {
-    /** @covers \DoctrineModule\Service\CacheFactory::createService */
+    /** @covers \DoctrineModule\Service\CacheFactory::__invoke */
     public function testWillSetNamespace(): void
     {
         if (! InstalledVersions::satisfies(new VersionParser(), 'doctrine/cache', '^1.0.0')) {
@@ -55,7 +55,7 @@ public function testWillSetNamespace(): void
     }
 
     /**
-     * @covers \DoctrineModule\Service\CacheFactory::createService
+     * @covers \DoctrineModule\Service\CacheFactory::__invoke
      * @group 547
      */
     public function testCreateLaminasCache(): void

diff --git a/tests/ServiceFactory/ModuleDefinedServicesTest.php b/tests/ServiceFactory/ModuleDefinedServicesTest.php
@@ -61,7 +61,7 @@ public function testModuleInvalidService(string $serviceName): void
     }
 
     /** @return mixed[][] */
-    public function getServicesThatShouldBeDefined(): array
+    public static function getServicesThatShouldBeDefined(): array
     {
         $legacyCacheShouldExist = InstalledVersions::satisfies(new VersionParser(), 'doctrine/cache', '^1.0');
 
@@ -92,7 +92,7 @@ public function getServicesThatShouldBeDefined(): array
     }
 
     /** @return string[][] */
-    public function getServicesThatCanBeFetched(): array
+    public static function getServicesThatCanBeFetched(): array
     {
         if (InstalledVersions::satisfies(new VersionParser(), 'doctrine/cache', '^1.0')) {
             return [
@@ -110,7 +110,7 @@ public function getServicesThatCanBeFetched(): array
     }
 
     /** @return string[][] */
-    public function getServicesThatCannotBeFetched(): array
+    public static function getServicesThatCannotBeFetched(): array
     {
         return [
             ['foo'],

diff --git a/tests/Validator/Service/NoObjectExistsFactoryTest.php b/tests/Validator/Service/NoObjectExistsFactoryTest.php
@@ -17,7 +17,7 @@
 /**
  * Generated by PHPUnit_SkeletonGenerator on 2017-09-04 at 11:12:27.
  *
- * @coversDefaultClass NoObjectExistsFactory
+ * @coversDefaultClass \DoctrineModule\Validator\Service\NoObjectExistsFactory
  * @group validator
  */
 class NoObjectExistsFactoryTest extends TestCase
@@ -41,7 +41,6 @@ public function testCallable(): void
 
     /**
      * @covers ::__invoke
-     * @covers ::container
      * @covers ::getRepository
      * @covers ::getObjectManager
      * @covers ::getFields
@@ -78,7 +77,6 @@ public function testInvoke(): void
 
     /**
      * @covers ::__invoke
-     * @covers ::container
      * @covers ::getRepository
      * @covers ::getObjectManager
      * @covers ::getFields

diff --git a/tests/Validator/Service/ObjectExistsFactoryTest.php b/tests/Validator/Service/ObjectExistsFactoryTest.php
@@ -15,7 +15,7 @@
 /**
  * Generated by PHPUnit_SkeletonGenerator on 2017-09-04 at 11:55:36.
  *
- * @coversDefaultClass ObjectExistsFactory
+ * @coversDefaultClass \DoctrineModule\Validator\Service\ObjectExistsFactory
  * @group validator
  */
 class ObjectExistsFactoryTest extends TestCase

diff --git a/tests/Validator/Service/UniqueObjectFactoryTest.php b/tests/Validator/Service/UniqueObjectFactoryTest.php
@@ -15,7 +15,7 @@
 /**
  * Generated by PHPUnit_SkeletonGenerator on 2017-09-04 at 11:57:37.
  *
- * @coversDefaultClass UniqueObjectFactory
+ * @coversDefaultClass \DoctrineModule\Validator\Service\UniqueObjectFactory
  * @group validator
  */
 class UniqueObjectFactoryTest extends TestCase