Merge pull request doctrine#2019 from doctrine/2.16.x

Merge 2.16.x up into 2.17.x

Author: greg0ire

tests/DependencyInjection/Compiler/CacheCompatibilityPassTest.php

@@ -84,7 +84,7 @@ public function registerContainerConfiguration(LoaderInterface $loader): void
         $this->addToAssertionCount(1);
     }
 
-    /** @doesNotPerformAssertions */
+    #[DoesNotPerformAssertions]
     public function testMetadataCacheConfigUsingPsr6ServiceDefinedByApplication(): void
     {
         (new class (false) extends TestKernel {

tests/DependencyInjection/Compiler/MiddlewarePassTest.php

@@ -135,7 +135,16 @@ public function testAddMiddlewareWithAttributeForAutoconfiguration(string $class
         $this->assertMiddlewareInjected($container, 'conn2', $className);
     }
 
-    #[DataProvider('provideAddMiddleware')]
+    /** @return array<string, array{0: class-string}> */
+    public static function provideDontAddMiddleware(): array
+    {
+        return [
+            'not connection name aware' => [PHP7Middleware::class],
+            'connection name aware' => [ConnectionAwarePHP7Middleware::class],
+        ];
+    }
+
+    #[DataProvider('provideDontAddMiddleware')]
     public function testDontAddMiddlewareWhenDbalIsNotUsed(string $middlewareClass): void
     {
         $container = $this->createContainer(static function (ContainerBuilder $container) use ($middlewareClass) {

tests/DependencyInjection/DoctrineExtensionTest.php

@@ -41,10 +41,14 @@
 use InvalidArgumentException;
 use LogicException;
 use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\RequiresMethod;
+use PHPUnit\Framework\Attributes\TestWith;
 use PHPUnit\Framework\Attributes\WithoutErrorHandler;
 use PHPUnit\Framework\TestCase;
 use ReflectionClass;
+use Symfony\Bridge\Doctrine\ArgumentResolver\EntityValueResolver;
 use Symfony\Bridge\Doctrine\Attribute\MapEntity;
+use Symfony\Bridge\Doctrine\Middleware\IdleConnection\Driver;
 use Symfony\Component\Cache\Adapter\ArrayAdapter;
 use Symfony\Component\Cache\Adapter\PhpArrayAdapter;
 use Symfony\Component\Config\Definition\Exception\InvalidConfigurationException;
@@ -605,10 +609,8 @@ public function testSingleEntityManagerWithDefaultConfiguration(): void
         ]);
     }
 
-    /**
-     * @testWith [[]]
-     *           [null]
-     */
+    #[TestWith([[]])]
+    #[TestWith([null])]
     public function testSingleEntityManagerWithEmptyConfiguration(array|null $ormConfiguration): void
     {
         if (! interface_exists(EntityManagerInterface::class)) {
@@ -1411,7 +1413,7 @@ public function testDefinitionsToLogQueriesLoggingFalse(): void
         $this->assertArrayNotHasKey('doctrine.middleware', $abstractMiddlewareDefTags);
     }
 
-    /** @requires function Symfony\Bridge\Doctrine\Middleware\IdleConnection\Driver::__construct */
+    #[RequiresMethod(Driver::class, '__construct')]
     public function testDefinitionsIdleConnection(): void
     {
         $container = $this->getContainer();
@@ -1462,11 +1464,9 @@ public function testDefinitionsIdleConnection(): void
         $this->assertTrue(in_array(['connection' => 'conn2', 'priority' => 10], $idleConnectionMiddlewareTagAttributes, true), 'Tag with connection conn2 found for doctrine.dbal.idle_connection_middleware');
     }
 
-    /**
-     * @requires function \Symfony\Bridge\Doctrine\ArgumentResolver\EntityValueResolver::__construct
-     * @testWith [true]
-     *           [false]
-     */
+    #[RequiresMethod(EntityValueResolver::class, '__construct')]
+    #[TestWith([true])]
+    #[TestWith([false])]
     public function testControllerResolver(bool $simpleEntityManagerConfig): void
     {
         if (! interface_exists(EntityManagerInterface::class)) {

tests/LockStoreSchemaListenerTest.php

@@ -6,6 +6,7 @@
 
 use Doctrine\Bundle\DoctrineBundle\DependencyInjection\DoctrineExtension;
 use Doctrine\ORM\EntityManagerInterface;
+use PHPUnit\Framework\Attributes\TestWith;
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\FrameworkExtension;
 use Symfony\Component\DependencyInjection\Alias;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -16,12 +17,9 @@
 
 class LockStoreSchemaListenerTest extends TestCase
 {
-    /**
-     * @param array<string, mixed> $config
-     *
-     * @testWith [{}, 0]
-     *           [{"lock": "flock"}, 1]
-     */
+    /** @param array<string, mixed> $config */
+    #[TestWith([[], 0])]
+    #[TestWith([['lock' => 'flock'], 1])]
     public function testLockStoreSchemaSubscriberWiring(array $config, int $expectedCount): void
     {
         if (! interface_exists(EntityManagerInterface::class)) {

tests/Middleware/IdleConnectionMiddlewareTest.php

@@ -7,14 +7,15 @@
 use ArrayObject;
 use Doctrine\Bundle\DoctrineBundle\Middleware\IdleConnectionMiddleware;
 use Doctrine\DBAL\Driver;
+use PHPUnit\Framework\Attributes\RequiresMethod;
 use PHPUnit\Framework\TestCase;
 use Symfony\Bridge\Doctrine\Middleware\IdleConnection\Driver as IdleConnectionDriver;
 
 use function time;
 
 class IdleConnectionMiddlewareTest extends TestCase
 {
-    /** @requires function Symfony\Bridge\Doctrine\Middleware\IdleConnection\Driver::__construct */
+    #[RequiresMethod(\Symfony\Bridge\Doctrine\Middleware\IdleConnection\Driver::class, '__construct')]
     public function testWrap()
     {
         /** @var ArrayObject<string, int> $connectionExpiries */