Merge branch '7.4' into 8.0

* 7.4:
  replace PHPUnit annotations with attributes

Author: nicolas-grekas

Test/AbstractTransportFactoryTestCase.php

@@ -37,9 +37,6 @@ abstract public static function createProvider(): iterable;
      */
     abstract public static function unsupportedSchemeProvider(): iterable;
 
-    /**
-     * @dataProvider supportsProvider
-     */
     #[DataProvider('supportsProvider')]
     public function testSupports(bool $expected, string $dsn)
     {

Test/TransportTestCase.php

@@ -45,18 +45,12 @@ abstract public static function supportedMessagesProvider(): iterable;
      */
     abstract public static function unsupportedMessagesProvider(): iterable;
 
-    /**
-     * @dataProvider toStringProvider
-     */
     #[DataProvider('toStringProvider')]
     public function testToString(string $expected, TransportInterface $transport)
     {
         $this->assertSame($expected, (string) $transport);
     }
 
-    /**
-     * @dataProvider supportedMessagesProvider
-     */
     #[DataProvider('supportedMessagesProvider')]
     public function testSupportedMessages(MessageInterface $message, ?TransportInterface $transport = null)
     {
@@ -65,9 +59,6 @@ public function testSupportedMessages(MessageInterface $message, ?TransportInter
         $this->assertTrue($transport->supports($message));
     }
 
-    /**
-     * @dataProvider unsupportedMessagesProvider
-     */
     #[DataProvider('unsupportedMessagesProvider')]
     public function testUnsupportedMessages(MessageInterface $message, ?TransportInterface $transport = null)
     {
@@ -76,9 +67,6 @@ public function testUnsupportedMessages(MessageInterface $message, ?TransportInt
         $this->assertFalse($transport->supports($message));
     }
 
-    /**
-     * @dataProvider unsupportedMessagesProvider
-     */
     #[DataProvider('unsupportedMessagesProvider')]
     public function testUnsupportedMessagesTrowUnsupportedMessageTypeExceptionWhenSend(MessageInterface $message, ?TransportInterface $transport = null)
     {

Tests/Channel/BrowserChannelTest.php

@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Notifier\Tests\Channel;
 
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\RequestStack;
@@ -29,9 +30,7 @@
  */
 class BrowserChannelTest extends TestCase
 {
-    /**
-     * @dataProvider defaultFlashMessageImportanceDataProvider
-     */
+    #[DataProvider('defaultFlashMessageImportanceDataProvider')]
     public function testImportanceLevelIsReflectedInFlashMessageType(
         FlashMessageImportanceMapperInterface $mapper,
         string $importance,

Tests/Channel/ChannelPolicyTest.php

@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Notifier\Tests\Channel;
 
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Notifier\Channel\ChannelPolicy;
 use Symfony\Component\Notifier\Exception\InvalidArgumentException;
@@ -28,9 +29,7 @@ public function testCannotRetrieveChannelsUsingUnavailableImportance()
         $channelPolicy->getChannels('low');
     }
 
-    /**
-     * @dataProvider provideValidPolicies
-     */
+    #[DataProvider('provideValidPolicies')]
     public function testCanRetrieveChannels(array $policy, string $importance, array $expectedChannels)
     {
         $channelPolicy = new ChannelPolicy($policy);

Tests/Event/FailedMessageEventTest.php

@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Notifier\Tests\Event;
 
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Notifier\Event\FailedMessageEvent;
 use Symfony\Component\Notifier\Event\MessageEvent;
@@ -25,25 +26,19 @@
 
 class FailedMessageEventTest extends TestCase
 {
-    /**
-     * @dataProvider messagesProvider
-     */
+    #[DataProvider('messagesProvider')]
     public function testConstruct(MessageInterface $message, \Throwable $error, FailedMessageEvent $event)
     {
         $this->assertEquals($event, new FailedMessageEvent($message, $error));
     }
 
-    /**
-     * @dataProvider messagesProvider
-     */
+    #[DataProvider('messagesProvider')]
     public function testGetMessage(MessageInterface $message, \Throwable $error, FailedMessageEvent $event)
     {
         $this->assertSame($message, $event->getMessage());
     }
 
-    /**
-     * @dataProvider messagesProvider
-     */
+    #[DataProvider('messagesProvider')]
     public function testGetError(MessageInterface $message, \Throwable $error, FailedMessageEvent $event)
     {
         $this->assertSame($error, $event->getError());

Tests/Event/SentMessageEventTest.php

@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Notifier\Tests\Event;
 
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Notifier\Event\SentMessageEvent;
 use Symfony\Component\Notifier\Message\ChatMessage;
@@ -19,17 +20,13 @@
 
 final class SentMessageEventTest extends TestCase
 {
-    /**
-     * @dataProvider messagesProvider
-     */
+    #[DataProvider('messagesProvider')]
     public function testConstruct(SentMessage $message, SentMessageEvent $event)
     {
         $this->assertEquals($event, new SentMessageEvent($message));
     }
 
-    /**
-     * @dataProvider messagesProvider
-     */
+    #[DataProvider('messagesProvider')]
     public function testGetMessage(SentMessage $message, SentMessageEvent $event)
     {
         $this->assertSame($message, $event->getMessage());

Tests/Exception/UnsupportedSchemeExceptionTest.php

@@ -11,15 +11,15 @@
 
 namespace Symfony\Component\Notifier\Tests\Exception;
 
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\RunTestsInSeparateProcesses;
 use PHPUnit\Framework\TestCase;
 use Symfony\Bridge\PhpUnit\ClassExistsMock;
 use Symfony\Component\Notifier\Bridge;
 use Symfony\Component\Notifier\Exception\UnsupportedSchemeException;
 use Symfony\Component\Notifier\Transport\Dsn;
 
-/**
- * @runTestsInSeparateProcesses
- */
+#[RunTestsInSeparateProcesses]
 final class UnsupportedSchemeExceptionTest extends TestCase
 {
     public static function setUpBeforeClass(): void
@@ -110,9 +110,7 @@ public static function setUpBeforeClass(): void
         ]);
     }
 
-    /**
-     * @dataProvider messageWhereSchemeIsPartOfSchemeToPackageMapProvider
-     */
+    #[DataProvider('messageWhereSchemeIsPartOfSchemeToPackageMapProvider')]
     public function testMessageWhereSchemeIsPartOfSchemeToPackageMap(string $scheme, string $package)
     {
         $dsn = new Dsn(\sprintf('%s://localhost', $scheme));
@@ -202,9 +200,7 @@ public static function messageWhereSchemeIsPartOfSchemeToPackageMapProvider(): \
         yield ['goip', 'symfony/go-ip-notifier'];
     }
 
-    /**
-     * @dataProvider messageWhereSchemeIsNotPartOfSchemeToPackageMapProvider
-     */
+    #[DataProvider('messageWhereSchemeIsNotPartOfSchemeToPackageMapProvider')]
     public function testMessageWhereSchemeIsNotPartOfSchemeToPackageMap(string $expected, Dsn $dsn, ?string $name, array $supported)
     {
         $this->assertSame(

Tests/Message/NullMessageTest.php

@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Notifier\Tests\Message;
 
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Notifier\Message\MessageInterface;
 use Symfony\Component\Notifier\Message\NullMessage;
@@ -20,9 +21,7 @@
  */
 class NullMessageTest extends TestCase
 {
-    /**
-     * @dataProvider messageDataProvider
-     */
+    #[DataProvider('messageDataProvider')]
     public function testCanBeConstructed(MessageInterface $message)
     {
         $nullMessage = new NullMessage($message);

Tests/Recipient/RecipientTest.php

@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Notifier\Tests\Recipient;
 
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Notifier\Exception\InvalidArgumentException;
 use Symfony\Component\Notifier\Recipient\Recipient;
@@ -27,9 +28,7 @@ public function testCannotBeConstructedWithoutEmailAndWithoutPhone()
         new Recipient('', '');
     }
 
-    /**
-     * @dataProvider provideValidEmailAndPhone
-     */
+    #[DataProvider('provideValidEmailAndPhone')]
     public function testCanBeConstructed(string $email, string $phone)
     {
         $recipient = new Recipient($email, $phone);

Tests/Transport/DsnTest.php

@@ -11,16 +11,15 @@
 
 namespace Symfony\Component\Notifier\Tests\Transport;
 
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Notifier\Exception\InvalidArgumentException;
 use Symfony\Component\Notifier\Exception\MissingRequiredOptionException;
 use Symfony\Component\Notifier\Transport\Dsn;
 
 final class DsnTest extends TestCase
 {
-    /**
-     * @dataProvider constructProvider
-     */
+    #[DataProvider('constructProvider')]
     public function testConstruct(string $dsnString, string $scheme, string $host, ?string $user = null, ?string $password = null, ?int $port = null, array $options = [], ?string $path = null)
     {
         $dsn = new Dsn($dsnString);
@@ -140,9 +139,7 @@ public static function constructProvider(): iterable
         ];
     }
 
-    /**
-     * @dataProvider invalidDsnProvider
-     */
+    #[DataProvider('invalidDsnProvider')]
     public function testInvalidDsn(string $dsnString, string $exceptionMessage)
     {
         $this->expectException(InvalidArgumentException::class);
@@ -169,9 +166,7 @@ public static function invalidDsnProvider(): iterable
         ];
     }
 
-    /**
-     * @dataProvider getOptionProvider
-     */
+    #[DataProvider('getOptionProvider')]
     public function testGetOption($expected, string $dsnString, string $option, ?string $default = null)
     {
         $dsn = new Dsn($dsnString);
@@ -207,9 +202,7 @@ public static function getOptionProvider(): iterable
         ];
     }
 
-    /**
-     * @dataProvider getRequiredOptionProvider
-     */
+    #[DataProvider('getRequiredOptionProvider')]
     public function testGetRequiredOption(string $expectedValue, string $options, string $option)
     {
         $dsn = new Dsn(\sprintf('scheme://localhost?%s', $options));
@@ -232,9 +225,7 @@ public static function getRequiredOptionProvider(): iterable
         ];
     }
 
-    /**
-     * @dataProvider getRequiredOptionThrowsMissingRequiredOptionExceptionProvider
-     */
+    #[DataProvider('getRequiredOptionThrowsMissingRequiredOptionExceptionProvider')]
     public function testGetRequiredOptionThrowsMissingRequiredOptionException(string $expectedExceptionMessage, string $options, string $option)
     {
         $dsn = new Dsn(\sprintf('scheme://localhost?%s', $options));
@@ -260,9 +251,7 @@ public static function getRequiredOptionThrowsMissingRequiredOptionExceptionProv
         ];
     }
 
-    /**
-     * @dataProvider getBooleanOptionProvider
-     */
+    #[DataProvider('getBooleanOptionProvider')]
     public function testGetBooleanOption(bool $expected, string $dsnString, string $option, bool $default)
     {
         $dsn = new Dsn($dsnString);