diff --git a/src/Symfony/Component/Mailer/CHANGELOG.md b/src/Symfony/Component/Mailer/CHANGELOG.md index 54e2a6cde0927..01fb57558f366 100644 --- a/src/Symfony/Component/Mailer/CHANGELOG.md +++ b/src/Symfony/Component/Mailer/CHANGELOG.md @@ -1,6 +1,11 @@ CHANGELOG ========= +7.2 +--- + + * Make `TransportFactoryTestCase` compatible with PHPUnit 10+ + 7.1 --- diff --git a/src/Symfony/Component/Mailer/Test/TransportFactoryTestCase.php b/src/Symfony/Component/Mailer/Test/TransportFactoryTestCase.php index 877cd2ecb12b2..d39839f267dec 100644 --- a/src/Symfony/Component/Mailer/Test/TransportFactoryTestCase.php +++ b/src/Symfony/Component/Mailer/Test/TransportFactoryTestCase.php @@ -11,6 +11,7 @@ namespace Symfony\Component\Mailer\Test; +use PHPUnit\Framework\Attributes\DataProvider; use PHPUnit\Framework\TestCase; use Psr\Log\LoggerInterface; use Symfony\Component\Mailer\Exception\IncompleteDsnException; @@ -66,6 +67,7 @@ public static function incompleteDsnProvider(): iterable /** * @dataProvider supportsProvider */ + #[DataProvider('supportsProvider')] public function testSupports(Dsn $dsn, bool $supports) { $factory = $this->getFactory(); @@ -76,6 +78,7 @@ public function testSupports(Dsn $dsn, bool $supports) /** * @dataProvider createProvider */ + #[DataProvider('createProvider')] public function testCreate(Dsn $dsn, TransportInterface $transport) { $factory = $this->getFactory(); @@ -89,6 +92,7 @@ public function testCreate(Dsn $dsn, TransportInterface $transport) /** * @dataProvider unsupportedSchemeProvider */ + #[DataProvider('unsupportedSchemeProvider')] public function testUnsupportedSchemeException(Dsn $dsn, ?string $message = null) { $factory = $this->getFactory(); @@ -104,6 +108,7 @@ public function testUnsupportedSchemeException(Dsn $dsn, ?string $message = null /** * @dataProvider incompleteDsnProvider */ + #[DataProvider('incompleteDsnProvider')] public function testIncompleteDsnException(Dsn $dsn) { $factory = $this->getFactory(); diff --git a/src/Symfony/Component/Notifier/CHANGELOG.md b/src/Symfony/Component/Notifier/CHANGELOG.md index 4c5843021fa71..2f8b13648df27 100644 --- a/src/Symfony/Component/Notifier/CHANGELOG.md +++ b/src/Symfony/Component/Notifier/CHANGELOG.md @@ -4,6 +4,7 @@ CHANGELOG 7.2 --- + * Make `TransportFactoryTestCase` and `TransportTestCase` compatible with PHPUnit 10+ * Add `Desktop` channel 6.3 diff --git a/src/Symfony/Component/Notifier/Test/TransportFactoryTestCase.php b/src/Symfony/Component/Notifier/Test/TransportFactoryTestCase.php index 427c08a25400b..03c57a244b57a 100644 --- a/src/Symfony/Component/Notifier/Test/TransportFactoryTestCase.php +++ b/src/Symfony/Component/Notifier/Test/TransportFactoryTestCase.php @@ -11,6 +11,7 @@ namespace Symfony\Component\Notifier\Test; +use PHPUnit\Framework\Attributes\DataProvider; use PHPUnit\Framework\TestCase; use Symfony\Component\Notifier\Exception\IncompleteDsnException; use Symfony\Component\Notifier\Exception\MissingRequiredOptionException; @@ -65,6 +66,7 @@ public static function missingRequiredOptionProvider(): iterable /** * @dataProvider supportsProvider */ + #[DataProvider('supportsProvider')] public function testSupports(bool $expected, string $dsn) { $factory = $this->createFactory(); @@ -75,6 +77,7 @@ public function testSupports(bool $expected, string $dsn) /** * @dataProvider createProvider */ + #[DataProvider('createProvider')] public function testCreate(string $expected, string $dsn) { $factory = $this->createFactory(); @@ -86,6 +89,7 @@ public function testCreate(string $expected, string $dsn) /** * @dataProvider unsupportedSchemeProvider */ + #[DataProvider('unsupportedSchemeProvider')] public function testUnsupportedSchemeException(string $dsn, ?string $message = null) { $factory = $this->createFactory(); @@ -103,6 +107,7 @@ public function testUnsupportedSchemeException(string $dsn, ?string $message = n /** * @dataProvider incompleteDsnProvider */ + #[DataProvider('incompleteDsnProvider')] public function testIncompleteDsnException(string $dsn, ?string $message = null) { $factory = $this->createFactory(); @@ -120,6 +125,7 @@ public function testIncompleteDsnException(string $dsn, ?string $message = null) /** * @dataProvider missingRequiredOptionProvider */ + #[DataProvider('missingRequiredOptionProvider')] public function testMissingRequiredOptionException(string $dsn, ?string $message = null) { $factory = $this->createFactory(); diff --git a/src/Symfony/Component/Notifier/Test/TransportTestCase.php b/src/Symfony/Component/Notifier/Test/TransportTestCase.php index 50e6eb7fe330c..a0a85c0edc2e3 100644 --- a/src/Symfony/Component/Notifier/Test/TransportTestCase.php +++ b/src/Symfony/Component/Notifier/Test/TransportTestCase.php @@ -11,6 +11,7 @@ namespace Symfony\Component\Notifier\Test; +use PHPUnit\Framework\Attributes\DataProvider; use PHPUnit\Framework\TestCase; use Symfony\Component\Notifier\Exception\UnsupportedMessageTypeException; use Symfony\Component\Notifier\Message\MessageInterface; @@ -47,6 +48,7 @@ abstract public static function unsupportedMessagesProvider(): iterable; /** * @dataProvider toStringProvider */ + #[DataProvider('toStringProvider')] public function testToString(string $expected, TransportInterface $transport) { $this->assertSame($expected, (string) $transport); @@ -55,6 +57,7 @@ public function testToString(string $expected, TransportInterface $transport) /** * @dataProvider supportedMessagesProvider */ + #[DataProvider('supportedMessagesProvider')] public function testSupportedMessages(MessageInterface $message, ?TransportInterface $transport = null) { $transport ??= $this->createTransport(); @@ -65,6 +68,7 @@ public function testSupportedMessages(MessageInterface $message, ?TransportInter /** * @dataProvider unsupportedMessagesProvider */ + #[DataProvider('unsupportedMessagesProvider')] public function testUnsupportedMessages(MessageInterface $message, ?TransportInterface $transport = null) { $transport ??= $this->createTransport(); @@ -75,6 +79,7 @@ public function testUnsupportedMessages(MessageInterface $message, ?TransportInt /** * @dataProvider unsupportedMessagesProvider */ + #[DataProvider('unsupportedMessagesProvider')] public function testUnsupportedMessagesTrowUnsupportedMessageTypeExceptionWhenSend(MessageInterface $message, ?TransportInterface $transport = null) { $transport ??= $this->createTransport(); diff --git a/src/Symfony/Component/Security/Core/CHANGELOG.md b/src/Symfony/Component/Security/Core/CHANGELOG.md index 5dd5ef38952b4..7cf09c70d4413 100644 --- a/src/Symfony/Component/Security/Core/CHANGELOG.md +++ b/src/Symfony/Component/Security/Core/CHANGELOG.md @@ -4,6 +4,7 @@ CHANGELOG 7.2 --- + * Make `AccessDecisionStrategyTestCase` compatible with PHPUnit 10+ * Add `$token` argument to `UserCheckerInterface::checkPostAuth()` * Deprecate argument `$secret` of `RememberMeToken` * Deprecate returning an empty string in `UserInterface::getUserIdentifier()` diff --git a/src/Symfony/Component/Security/Core/Test/AccessDecisionStrategyTestCase.php b/src/Symfony/Component/Security/Core/Test/AccessDecisionStrategyTestCase.php index 85e9fea805248..792e777915400 100644 --- a/src/Symfony/Component/Security/Core/Test/AccessDecisionStrategyTestCase.php +++ b/src/Symfony/Component/Security/Core/Test/AccessDecisionStrategyTestCase.php @@ -11,6 +11,7 @@ namespace Symfony\Component\Security\Core\Test; +use PHPUnit\Framework\Attributes\DataProvider; use PHPUnit\Framework\TestCase; use Symfony\Component\Security\Core\Authentication\Token\TokenInterface; use Symfony\Component\Security\Core\Authorization\AccessDecisionManager; @@ -29,6 +30,7 @@ abstract class AccessDecisionStrategyTestCase extends TestCase * * @param VoterInterface[] $voters */ + #[DataProvider('provideStrategyTests')] final public function testDecide(AccessDecisionStrategyInterface $strategy, array $voters, bool $expected) { $token = $this->createMock(TokenInterface::class); diff --git a/src/Symfony/Component/Translation/CHANGELOG.md b/src/Symfony/Component/Translation/CHANGELOG.md index 5fe7fb226e9d7..332bf8a31fef4 100644 --- a/src/Symfony/Component/Translation/CHANGELOG.md +++ b/src/Symfony/Component/Translation/CHANGELOG.md @@ -4,6 +4,7 @@ CHANGELOG 7.2 --- + * Make `ProviderFactoryTestCase` and `ProviderTestCase` compatible with PHPUnit 10+ * Add `lint:translations` command * Deprecate passing an escape character to `CsvFileLoader::setCsvControl()` diff --git a/src/Symfony/Component/Translation/Test/ProviderFactoryTestCase.php b/src/Symfony/Component/Translation/Test/ProviderFactoryTestCase.php index 90f2fb8f6ecd5..8117f680601bc 100644 --- a/src/Symfony/Component/Translation/Test/ProviderFactoryTestCase.php +++ b/src/Symfony/Component/Translation/Test/ProviderFactoryTestCase.php @@ -11,6 +11,7 @@ namespace Symfony\Component\Translation\Test; +use PHPUnit\Framework\Attributes\DataProvider; use PHPUnit\Framework\MockObject\MockObject; use PHPUnit\Framework\TestCase; use Psr\Log\LoggerInterface; @@ -69,6 +70,7 @@ public static function incompleteDsnProvider(): iterable /** * @dataProvider supportsProvider */ + #[DataProvider('supportsProvider')] public function testSupports(bool $expected, string $dsn) { $factory = $this->createFactory(); @@ -79,6 +81,7 @@ public function testSupports(bool $expected, string $dsn) /** * @dataProvider createProvider */ + #[DataProvider('createProvider')] public function testCreate(string $expected, string $dsn) { $factory = $this->createFactory(); @@ -90,6 +93,7 @@ public function testCreate(string $expected, string $dsn) /** * @dataProvider unsupportedSchemeProvider */ + #[DataProvider('unsupportedSchemeProvider')] public function testUnsupportedSchemeException(string $dsn, ?string $message = null) { $factory = $this->createFactory(); @@ -107,6 +111,7 @@ public function testUnsupportedSchemeException(string $dsn, ?string $message = n /** * @dataProvider incompleteDsnProvider */ + #[DataProvider('incompleteDsnProvider')] public function testIncompleteDsnException(string $dsn, ?string $message = null) { $factory = $this->createFactory(); diff --git a/src/Symfony/Component/Translation/Test/ProviderTestCase.php b/src/Symfony/Component/Translation/Test/ProviderTestCase.php index a8fa0b8bbcbac..7907986cb456c 100644 --- a/src/Symfony/Component/Translation/Test/ProviderTestCase.php +++ b/src/Symfony/Component/Translation/Test/ProviderTestCase.php @@ -11,6 +11,7 @@ namespace Symfony\Component\Translation\Test; +use PHPUnit\Framework\Attributes\DataProvider; use PHPUnit\Framework\MockObject\MockObject; use PHPUnit\Framework\TestCase; use Psr\Log\LoggerInterface; @@ -45,6 +46,7 @@ abstract public static function toStringProvider(): iterable; /** * @dataProvider toStringProvider */ + #[DataProvider('toStringProvider')] public function testToString(ProviderInterface $provider, string $expected) { $this->assertSame($expected, (string) $provider); diff --git a/src/Symfony/Component/Webhook/CHANGELOG.md b/src/Symfony/Component/Webhook/CHANGELOG.md index eebbcc74926f8..aaa1e62d24ddb 100644 --- a/src/Symfony/Component/Webhook/CHANGELOG.md +++ b/src/Symfony/Component/Webhook/CHANGELOG.md @@ -4,6 +4,7 @@ CHANGELOG 7.2 --- + * Make `AbstractRequestParserTestCase` compatible with PHPUnit 10+ * Add `PayloadSerializerInterface` with implementations to decouple the remote event handling from the Serializer component * Add optional `$request` argument to `RequestParserInterface::createSuccessfulResponse()` and `RequestParserInterface::createRejectedResponse()` diff --git a/src/Symfony/Component/Webhook/Test/AbstractRequestParserTestCase.php b/src/Symfony/Component/Webhook/Test/AbstractRequestParserTestCase.php index 514b2b751a097..3afcd76624e70 100644 --- a/src/Symfony/Component/Webhook/Test/AbstractRequestParserTestCase.php +++ b/src/Symfony/Component/Webhook/Test/AbstractRequestParserTestCase.php @@ -11,6 +11,7 @@ namespace Symfony\Component\Webhook\Test; +use PHPUnit\Framework\Attributes\DataProvider; use PHPUnit\Framework\TestCase; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\RemoteEvent\RemoteEvent; @@ -24,6 +25,7 @@ abstract class AbstractRequestParserTestCase extends TestCase /** * @dataProvider getPayloads */ + #[DataProvider('getPayloads')] public function testParse(string $payload, RemoteEvent $expected) { $request = $this->createRequest($payload); diff --git a/src/Symfony/Contracts/CHANGELOG.md b/src/Symfony/Contracts/CHANGELOG.md index 42fe6fd1c59fa..ffbd4d2ef81d5 100644 --- a/src/Symfony/Contracts/CHANGELOG.md +++ b/src/Symfony/Contracts/CHANGELOG.md @@ -1,6 +1,11 @@ CHANGELOG ========= +3.6 +--- + + * Make `HttpClientTestCase` and `TranslatorTest` compatible with PHPUnit 10+ + 3.5 --- diff --git a/src/Symfony/Contracts/Cache/composer.json b/src/Symfony/Contracts/Cache/composer.json index fe261d185a936..b713c29017a4f 100644 --- a/src/Symfony/Contracts/Cache/composer.json +++ b/src/Symfony/Contracts/Cache/composer.json @@ -25,7 +25,7 @@ "minimum-stability": "dev", "extra": { "branch-alias": { - "dev-main": "3.5-dev" + "dev-main": "3.6-dev" }, "thanks": { "name": "symfony/contracts", diff --git a/src/Symfony/Contracts/Deprecation/composer.json b/src/Symfony/Contracts/Deprecation/composer.json index ceb6c07961052..5533b5c3fecaa 100644 --- a/src/Symfony/Contracts/Deprecation/composer.json +++ b/src/Symfony/Contracts/Deprecation/composer.json @@ -25,7 +25,7 @@ "minimum-stability": "dev", "extra": { "branch-alias": { - "dev-main": "3.5-dev" + "dev-main": "3.6-dev" }, "thanks": { "name": "symfony/contracts", diff --git a/src/Symfony/Contracts/EventDispatcher/composer.json b/src/Symfony/Contracts/EventDispatcher/composer.json index 35956eb807fdd..d156b44b04e54 100644 --- a/src/Symfony/Contracts/EventDispatcher/composer.json +++ b/src/Symfony/Contracts/EventDispatcher/composer.json @@ -25,7 +25,7 @@ "minimum-stability": "dev", "extra": { "branch-alias": { - "dev-main": "3.5-dev" + "dev-main": "3.6-dev" }, "thanks": { "name": "symfony/contracts", diff --git a/src/Symfony/Contracts/HttpClient/Test/HttpClientTestCase.php b/src/Symfony/Contracts/HttpClient/Test/HttpClientTestCase.php index 12d1c87212c5e..14a7c1d957f27 100644 --- a/src/Symfony/Contracts/HttpClient/Test/HttpClientTestCase.php +++ b/src/Symfony/Contracts/HttpClient/Test/HttpClientTestCase.php @@ -11,6 +11,7 @@ namespace Symfony\Contracts\HttpClient\Test; +use PHPUnit\Framework\Attributes\RequiresPhpExtension; use PHPUnit\Framework\TestCase; use Symfony\Contracts\HttpClient\Exception\ClientExceptionInterface; use Symfony\Contracts\HttpClient\Exception\RedirectionExceptionInterface; @@ -1013,6 +1014,7 @@ public function testNoProxy() /** * @requires extension zlib */ + #[RequiresPhpExtension('zlib')] public function testAutoEncodingRequest() { $client = $this->getHttpClient(__FUNCTION__); @@ -1086,6 +1088,7 @@ public function testInformationalResponseStream() /** * @requires extension zlib */ + #[RequiresPhpExtension('zlib')] public function testUserlandEncodingRequest() { $client = $this->getHttpClient(__FUNCTION__); @@ -1108,6 +1111,7 @@ public function testUserlandEncodingRequest() /** * @requires extension zlib */ + #[RequiresPhpExtension('zlib')] public function testGzipBroken() { $client = $this->getHttpClient(__FUNCTION__); diff --git a/src/Symfony/Contracts/HttpClient/composer.json b/src/Symfony/Contracts/HttpClient/composer.json index efb146ec12826..a67a7530d1958 100644 --- a/src/Symfony/Contracts/HttpClient/composer.json +++ b/src/Symfony/Contracts/HttpClient/composer.json @@ -27,7 +27,7 @@ "minimum-stability": "dev", "extra": { "branch-alias": { - "dev-main": "3.5-dev" + "dev-main": "3.6-dev" }, "thanks": { "name": "symfony/contracts", diff --git a/src/Symfony/Contracts/Service/composer.json b/src/Symfony/Contracts/Service/composer.json index fc8674a7274f2..bc2e99a8f2a22 100644 --- a/src/Symfony/Contracts/Service/composer.json +++ b/src/Symfony/Contracts/Service/composer.json @@ -32,7 +32,7 @@ "minimum-stability": "dev", "extra": { "branch-alias": { - "dev-main": "3.5-dev" + "dev-main": "3.6-dev" }, "thanks": { "name": "symfony/contracts", diff --git a/src/Symfony/Contracts/Translation/Test/TranslatorTest.php b/src/Symfony/Contracts/Translation/Test/TranslatorTest.php index 54cba7c97615a..4e3c60c0b2ad9 100644 --- a/src/Symfony/Contracts/Translation/Test/TranslatorTest.php +++ b/src/Symfony/Contracts/Translation/Test/TranslatorTest.php @@ -11,6 +11,8 @@ namespace Symfony\Contracts\Translation\Test; +use PHPUnit\Framework\Attributes\DataProvider; +use PHPUnit\Framework\Attributes\RequiresPhpExtension; use PHPUnit\Framework\TestCase; use Symfony\Contracts\Translation\TranslatorInterface; use Symfony\Contracts\Translation\TranslatorTrait; @@ -53,6 +55,7 @@ public function getTranslator(): TranslatorInterface /** * @dataProvider getTransTests */ + #[DataProvider('getTransTests')] public function testTrans($expected, $id, $parameters) { $translator = $this->getTranslator(); @@ -63,6 +66,7 @@ public function testTrans($expected, $id, $parameters) /** * @dataProvider getTransChoiceTests */ + #[DataProvider('getTransChoiceTests')] public function testTransChoiceWithExplicitLocale($expected, $id, $number) { $translator = $this->getTranslator(); @@ -75,6 +79,8 @@ public function testTransChoiceWithExplicitLocale($expected, $id, $number) * * @dataProvider getTransChoiceTests */ + #[DataProvider('getTransChoiceTests')] + #[RequiresPhpExtension('intl')] public function testTransChoiceWithDefaultLocale($expected, $id, $number) { $translator = $this->getTranslator(); @@ -85,6 +91,7 @@ public function testTransChoiceWithDefaultLocale($expected, $id, $number) /** * @dataProvider getTransChoiceTests */ + #[DataProvider('getTransChoiceTests')] public function testTransChoiceWithEnUsPosix($expected, $id, $number) { $translator = $this->getTranslator(); @@ -103,6 +110,7 @@ public function testGetSetLocale() /** * @requires extension intl */ + #[RequiresPhpExtension('intl')] public function testGetLocaleReturnsDefaultLocaleIfNotSet() { $translator = $this->getTranslator(); @@ -139,6 +147,7 @@ public static function getTransChoiceTests() /** * @dataProvider getInterval */ + #[DataProvider('getInterval')] public function testInterval($expected, $number, $interval) { $translator = $this->getTranslator(); @@ -164,6 +173,7 @@ public static function getInterval() /** * @dataProvider getChooseTests */ + #[DataProvider('getChooseTests')] public function testChoose($expected, $id, $number, $locale = null) { $translator = $this->getTranslator(); @@ -181,6 +191,7 @@ public function testReturnMessageIfExactlyOneStandardRuleIsGiven() /** * @dataProvider getNonMatchingMessages */ + #[DataProvider('getNonMatchingMessages')] public function testThrowExceptionIfMatchingMessageCannotBeFound($id, $number) { $translator = $this->getTranslator(); @@ -296,6 +307,7 @@ public static function getChooseTests() /** * @dataProvider failingLangcodes */ + #[DataProvider('failingLangcodes')] public function testFailedLangcodes($nplural, $langCodes) { $matrix = $this->generateTestData($langCodes); @@ -305,6 +317,7 @@ public function testFailedLangcodes($nplural, $langCodes) /** * @dataProvider successLangcodes */ + #[DataProvider('successLangcodes')] public function testLangcodes($nplural, $langCodes) { $matrix = $this->generateTestData($langCodes); diff --git a/src/Symfony/Contracts/Translation/composer.json b/src/Symfony/Contracts/Translation/composer.json index 181651e0d9a87..b7220b84ca345 100644 --- a/src/Symfony/Contracts/Translation/composer.json +++ b/src/Symfony/Contracts/Translation/composer.json @@ -27,7 +27,7 @@ "minimum-stability": "dev", "extra": { "branch-alias": { - "dev-main": "3.5-dev" + "dev-main": "3.6-dev" }, "thanks": { "name": "symfony/contracts", diff --git a/src/Symfony/Contracts/composer.json b/src/Symfony/Contracts/composer.json index 3ff8a5ec49e16..be90b35a58b0d 100644 --- a/src/Symfony/Contracts/composer.json +++ b/src/Symfony/Contracts/composer.json @@ -45,7 +45,7 @@ "minimum-stability": "dev", "extra": { "branch-alias": { - "dev-main": "3.5-dev" + "dev-main": "3.6-dev" } } }