Merge pull request #639 from TomHAnderson/hotfix/phpunit-version

TomHAnderson · web-flow · commit bf1ad1e0fccf · 2024-10-28T17:53:21.000-06:00
Upgraded to phpunit 11.4
diff --git a/.github/workflows/coding-standards.yml b/.github/workflows/coding-standards.yml
@@ -15,6 +15,6 @@ jobs:
     name: "Coding Standards"
     uses: "doctrine/.github/.github/workflows/coding-standards.yml@1.3.0"
     with:
-      php-version: '8.1'
+      php-version: '8.2'
       composer-options: '--prefer-dist --ignore-platform-req=php'
 
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -19,7 +19,6 @@ jobs:
       fail-fast: false
       matrix:
         php-version:
-          - "8.1"
           - "8.2"
           - "8.3"
         dependencies:
diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml
@@ -12,7 +12,6 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "8.1"
           - "8.2"
           - "8.3"
 
diff --git a/.gitignore b/.gitignore
@@ -4,7 +4,7 @@ composer.phar
 composer.lock
 .DS_Store
 .phpcs-cache
-.phpunit.result.cache
+.phpunit.cache
 
 /tests/Stubs/storage/framework/views/*
 !/tests/Stubs/storage/framework/views/.gitkeep
diff --git a/README.md b/README.md
@@ -43,7 +43,7 @@ or in the docs directory.
 Versions
 --------
 
-* Version 3 supports DBAL ^4.0 and ORM ^3.0.  See the [upgrade guide](https://laravel-doctrine-orm-official.readthedocs.io/en/latest/upgrade.html) for more information.
+* Version 3 supports DBAL ^4.0, ORM ^3.0, and PHP 8.2.  See the [upgrade guide](https://laravel-doctrine-orm-official.readthedocs.io/en/latest/upgrade.html) for more information.
 * Version 2 supports Laravel 9 - 11, DBAL ^3.0 and ORM ^2.0.
 * Version 1 supports Laravel 6 - 9, DBAL ^2.0 and ORM ^2.0.
   See [documentation in version 2](https://github.com/laravel-doctrine/orm/tree/2.0?tab=readme-ov-file#versions)
diff --git a/composer.json b/composer.json
@@ -18,7 +18,7 @@
         }
     ],
     "require": {
-        "php": "^8.1",
+        "php": "^8.2",
         "doctrine/dbal": "^3.0 || ^4.0",
         "doctrine/orm": "^3.1",
         "doctrine/persistence": "^3.3",
@@ -44,7 +44,7 @@
         "php-parallel-lint/php-parallel-lint": "^1.4",
         "phpstan/phpstan": "^1.9",
         "phpstan/phpstan-deprecation-rules": "^1.1",
-        "phpunit/phpunit": "^9.3",
+        "phpunit/phpunit": "^11.4",
         "fakerphp/faker": "^1.23",
         "laravel/framework": "^10.0 || ^11.0"
     },
diff --git a/phpunit.xml b/phpunit.xml
@@ -1,24 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
          bootstrap="vendor/autoload.php"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
-    >
-    <coverage>
-        <include>
-            <directory suffix=".php">src/</directory>
-        </include>
-    </coverage>
+         cacheDirectory=".phpunit.cache"
+         executionOrder="depends,defects"
+         shortenArraysForExportThreshold="10"
+         requireCoverageMetadata="false"
+         beStrictAboutCoverageMetadata="false"
+         beStrictAboutOutputDuringTests="true"
+         displayDetailsOnPhpunitDeprecations="true"
+         failOnPhpunitDeprecation="true"
+         failOnRisky="true"
+         failOnWarning="true">
     <testsuites>
-        <testsuite name="Package Test Suite">
-            <directory suffix="Test.php">./tests/</directory>
+        <testsuite name="default">
+            <directory>tests</directory>
         </testsuite>
     </testsuites>
+
+    <source ignoreIndirectDeprecations="true" restrictNotices="true" restrictWarnings="true">
+        <include>
+            <directory>src</directory>
+        </include>
+    </source>
 </phpunit>
diff --git a/tests/Assets/Extensions/ExtensionMock.php b/tests/Assets/Extensions/ExtensionMock.php
@@ -14,7 +14,7 @@ class ExtensionMock implements Extension
     public function addSubscribers(EventManager $manager, EntityManagerInterface $em): void
     {
         // Confirm it gets called
-        (new ExtensionManagerTest())->assertTrue(true);
+        (new ExtensionManagerTest('test'))->assertTrue(true);
     }
 
     /** @return mixed[] */
diff --git a/tests/Assets/MyDoctrineExtender.php b/tests/Assets/MyDoctrineExtender.php
@@ -14,6 +14,6 @@ class MyDoctrineExtender implements DoctrineExtender
 {
     public function extend(Configuration $configuration, Connection $connection, EventManager $eventManager): void
     {
-        (new DoctrineManagerTest())->assertExtendedCorrectly($configuration, $connection, $eventManager);
+        (new DoctrineManagerTest('test'))->assertExtendedCorrectly($configuration, $connection, $eventManager);
     }
 }
diff --git a/tests/Feature/Configuration/Cache/ApcCacheProviderTest.php b/tests/Feature/Configuration/Cache/ApcCacheProviderTest.php
@@ -10,7 +10,7 @@
 use Mockery as m;
 use Psr\Cache\CacheItemPoolInterface;
 
-class ApcCacheProviderTest extends CacheProviderTest
+class ApcCacheProviderTest extends CacheProvider
 {
     public function getProvider(): mixed
     {
diff --git a/tests/Feature/Configuration/Cache/ArrayCacheProviderTest.php b/tests/Feature/Configuration/Cache/ArrayCacheProviderTest.php
@@ -7,7 +7,7 @@
 use LaravelDoctrine\ORM\Configuration\Cache\ArrayCacheProvider;
 use Symfony\Component\Cache\Adapter\ArrayAdapter;
 
-class ArrayCacheProviderTest extends CacheProviderTest
+class ArrayCacheProviderTest extends CacheProvider
 {
     public function getProvider(): mixed
     {
diff --git a/tests/Feature/Configuration/Cache/CacheProvider.php b/tests/Feature/Configuration/Cache/CacheProvider.php
@@ -7,7 +7,7 @@
 use LaravelDoctrineTest\ORM\TestCase;
 use Mockery;
 
-abstract class CacheProviderTest extends TestCase
+abstract class CacheProvider extends TestCase
 {
     abstract public function getProvider(): mixed;
 
diff --git a/tests/Feature/Configuration/Cache/FileCacheProviderTest.php b/tests/Feature/Configuration/Cache/FileCacheProviderTest.php
@@ -9,7 +9,7 @@
 use Mockery as m;
 use Symfony\Component\Cache\Adapter\FilesystemAdapter;
 
-class FileCacheProviderTest extends CacheProviderTest
+class FileCacheProviderTest extends CacheProvider
 {
     public function getProvider(): mixed
     {
diff --git a/tests/Feature/Configuration/Cache/MemcachedCacheProviderTest.php b/tests/Feature/Configuration/Cache/MemcachedCacheProviderTest.php
@@ -10,7 +10,7 @@
 use Mockery as m;
 use Psr\Cache\CacheItemPoolInterface;
 
-class MemcachedCacheProviderTest extends CacheProviderTest
+class MemcachedCacheProviderTest extends CacheProvider
 {
     public function getProvider(): mixed
     {
diff --git a/tests/Feature/Configuration/Cache/PhpFileCacheProviderTest.php b/tests/Feature/Configuration/Cache/PhpFileCacheProviderTest.php
@@ -9,7 +9,7 @@
 use Mockery as m;
 use Symfony\Component\Cache\Adapter\PhpFilesAdapter;
 
-class PhpFileCacheProviderTest extends CacheProviderTest
+class PhpFileCacheProviderTest extends CacheProvider
 {
     public function getProvider(): mixed
     {
diff --git a/tests/Feature/Configuration/Cache/RedisCacheProviderTest.php b/tests/Feature/Configuration/Cache/RedisCacheProviderTest.php
@@ -10,7 +10,7 @@
 use Mockery as m;
 use Psr\Cache\CacheItemPoolInterface;
 
-class RedisCacheProviderTest extends CacheProviderTest
+class RedisCacheProviderTest extends CacheProvider
 {
     public function getProvider(): mixed
     {
diff --git a/tests/Feature/Configuration/Connections/PrimaryReadReplicaConnectionTest.php b/tests/Feature/Configuration/Connections/PrimaryReadReplicaConnectionTest.php
diff --git a/tests/Feature/EntityManagerFactoryTest.php b/tests/Feature/EntityManagerFactoryTest.php

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ class ExtensionMock implements Extension`
`14`	`14`	`public function addSubscribers(EventManager $manager, EntityManagerInterface $em): void`
`15`	`15`	`{`
`16`	`16`	`// Confirm it gets called`
`17`		`- (new ExtensionManagerTest())->assertTrue(true);`
	`17`	`+ (new ExtensionManagerTest('test'))->assertTrue(true);`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`/** @return mixed[] */`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,6 @@ class MyDoctrineExtender implements DoctrineExtender`
`14`	`14`	`{`
`15`	`15`	`public function extend(Configuration $configuration, Connection $connection, EventManager $eventManager): void`
`16`	`16`	`{`
`17`		`- (new DoctrineManagerTest())->assertExtendedCorrectly($configuration, $connection, $eventManager);`
	`17`	`+ (new DoctrineManagerTest('test'))->assertExtendedCorrectly($configuration, $connection, $eventManager);`
`18`	`18`	`}`
`19`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`use Mockery as m;`
`11`	`11`	`use Psr\Cache\CacheItemPoolInterface;`
`12`	`12`
`13`		`-class ApcCacheProviderTest extends CacheProviderTest`
	`13`	`+class ApcCacheProviderTest extends CacheProvider`
`14`	`14`	`{`
`15`	`15`	`public function getProvider(): mixed`
`16`	`16`	`{`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`use LaravelDoctrine\ORM\Configuration\Cache\ArrayCacheProvider;`
`8`	`8`	`use Symfony\Component\Cache\Adapter\ArrayAdapter;`
`9`	`9`
`10`		`-class ArrayCacheProviderTest extends CacheProviderTest`
	`10`	`+class ArrayCacheProviderTest extends CacheProvider`
`11`	`11`	`{`
`12`	`12`	`public function getProvider(): mixed`
`13`	`13`	`{`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`use LaravelDoctrineTest\ORM\TestCase;`
`8`	`8`	`use Mockery;`
`9`	`9`
`10`		`-abstract class CacheProviderTest extends TestCase`
	`10`	`+abstract class CacheProvider extends TestCase`
`11`	`11`	`{`
`12`	`12`	`abstract public function getProvider(): mixed;`
`13`	`13`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`use Mockery as m;`
`10`	`10`	`use Symfony\Component\Cache\Adapter\FilesystemAdapter;`
`11`	`11`
`12`		`-class FileCacheProviderTest extends CacheProviderTest`
	`12`	`+class FileCacheProviderTest extends CacheProvider`
`13`	`13`	`{`
`14`	`14`	`public function getProvider(): mixed`
`15`	`15`	`{`