Upgrade to PHPUnit 11 for PHP >= 8.2 and check deprecation messages (#2902)

* Upgrade to PHPUnit 11 for PHP >= 8.2 and check deprecation messages

* Remove usage of deprecated Assert::assertContainsOnly()

Author: GromNaN

composer.json

@@ -52,7 +52,7 @@
         "phpstan/phpstan": "^2.1",
         "phpstan/phpstan-deprecation-rules": "^2.0",
         "phpstan/phpstan-phpunit": "^2.0",
-        "phpunit/phpunit": "^10.5.58",
+        "phpunit/phpunit": "^10.5.58|^11.5.43",
         "squizlabs/php_codesniffer": "^4",
         "symfony/cache": "^5.4 || ^6.0 || ^7.0 || ^8.0",
         "symfony/uid": "^5.4 || ^6.0 || ^7.0 || ^8.0"

phpunit.xml.dist

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
+        xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/11.5/phpunit.xsd"
         bootstrap="tests/bootstrap.php"
         cacheDirectory=".phpunit.cache"
         displayDetailsOnAllIssues="true"

src/Proxy/Factory/LazyGhostProxyFactory.php

@@ -28,10 +28,8 @@
 use function file_exists;
 use function file_put_contents;
 use function filemtime;
-use function get_debug_type;
 use function is_dir;
 use function is_int;
-use function is_scalar;
 use function is_writable;
 use function ltrim;
 use function mkdir;
@@ -115,7 +113,7 @@ public function __construct(
         }
 
         if (is_int($autoGenerate) && ($autoGenerate < 0 || $autoGenerate > 4)) {
-            throw new InvalidArgumentException(sprintf('Invalid auto generate mode "%s" given.', is_scalar($autoGenerate) ? (string) $autoGenerate : get_debug_type($autoGenerate)));
+            throw new InvalidArgumentException(sprintf('Invalid auto generate mode "%d" given.', $autoGenerate));
         }
 
         $this->uow                   = $dm->getUnitOfWork();

tests/Tests/BaseTestCase.php

@@ -105,12 +105,11 @@ protected static function getConfiguration(): Configuration
         $config->setPersistentCollectionNamespace('PersistentCollections');
         $config->setDefaultDB(DOCTRINE_MONGODB_DATABASE);
         $config->setMetadataDriverImpl(static::createMetadataDriverImpl());
-        if ($_ENV['USE_LAZY_GHOST_OBJECT']) {
-            $config->setUseLazyGhostObject(true);
-        }
 
         if ($_ENV['USE_NATIVE_LAZY_OBJECT']) {
             $config->setUseNativeLazyObject(true);
+        } elseif ($_ENV['USE_LAZY_GHOST_OBJECT']) {
+            $config->setUseLazyGhostObject(true);
         }
 
         if ($config->isNativeLazyObjectEnabled()) {

tests/Tests/ConfigurationTest.php

@@ -11,6 +11,7 @@
 use Doctrine\ODM\MongoDB\PersistentCollection\PersistentCollectionGenerator;
 use LogicException;
 use MongoDB\Driver\Manager;
+use PHPUnit\Framework\Attributes\IgnoreDeprecations;
 use PHPUnit\Framework\Attributes\RequiresPhp;
 use PHPUnit\Framework\Attributes\TestWith;
 use PHPUnit\Framework\TestCase;
@@ -37,6 +38,7 @@ public function testUseNativeLazyObjectBeforePHP84(): void
         $c->setUseNativeLazyObject(true);
     }
 
+    #[IgnoreDeprecations]
     public function testUseLazyGhostObject(): void
     {
         $c = new Configuration();
@@ -74,6 +76,7 @@ public function testUseLazyGhostObjectWithSymfony8(): void
         $c->setUseLazyGhostObject(true);
     }
 
+    #[IgnoreDeprecations]
     public function testNativeLazyObjectDeprecatedByDefault(): void
     {
         $c = new Configuration();

tests/Tests/Functional/CustomTypeTest.php

@@ -47,7 +47,7 @@ public function testCustomTypeValueConversions(): void
 
         $country = $this->dm->find(Country::class, $country->id);
 
-        self::assertContainsOnly('DateTime', $country->nationalHolidays);
+        self::assertContainsOnlyInstancesOf(DateTime::class, $country->nationalHolidays);
     }
 
     public function testConvertToDatabaseValueExpectsArray(): void

tests/Tests/Functional/ShardKeyTest.php

@@ -35,7 +35,9 @@ public function setUp(): void
 
     public function tearDown(): void
     {
-        $this->logger->unregister();
+        if (isset($this->logger)) {
+            $this->logger->unregister();
+        }
 
         parent::tearDown();
     }

tests/Tests/Functional/TargetDocumentTest.php

@@ -7,11 +7,12 @@
 use Doctrine\ODM\MongoDB\Mapping\Annotations as ODM;
 use Doctrine\ODM\MongoDB\Mapping\MappingException;
 use Doctrine\ODM\MongoDB\Tests\BaseTestCase;
+use PHPUnit\Framework\Attributes\DoesNotPerformAssertions;
 use stdClass;
 
 class TargetDocumentTest extends BaseTestCase
 {
-    /** @doesNotPerformAssertions */
+    #[DoesNotPerformAssertions]
     public function testMappedSuperClassAsTargetDocument(): void
     {
         $test            = new TargetDocumentTestDocument();

tests/Tests/Query/FilterCollectionTest.php

@@ -22,7 +22,7 @@ public function testEnable(): void
 
         $enabledFilters = $filterCollection->getEnabledFilters();
         self::assertCount(1, $enabledFilters);
-        self::assertContainsOnly(BsonFilter::class, $enabledFilters);
+        self::assertContainsOnlyInstancesOf(BsonFilter::class, $enabledFilters);
 
         $filterCollection->disable('testFilter');
         self::assertEmpty($filterCollection->getEnabledFilters());

tests/Tests/QueryTest.php

@@ -508,7 +508,7 @@ public function testFindWithHint(): void
         $collection->expects($this->once())
             ->method('find')
             ->with(['foo' => 'bar'], ['hint' => 'foo'])
-            ->will($this->returnValue($cursor));
+            ->willReturn($cursor);
 
         // Using QueryBuilder->find adds hint to the query array
         $queryArray = [