From 8223120f828427ed5e55d15d4aca3634b03c5945 Mon Sep 17 00:00:00 2001 From: Vincent Langlet Date: Thu, 28 Sep 2023 18:22:05 +0200 Subject: [PATCH] Fix --- composer.json | 2 +- tests/Action/LoginActionTest.php | 11 ++++------- tests/Functional/Admin/UserAdminTest.php | 4 ++-- tests/Mailer/MailerTest.php | 16 +++++++--------- 4 files changed, 14 insertions(+), 19 deletions(-) diff --git a/composer.json b/composer.json index 59eb626e2..8d7974c25 100644 --- a/composer.json +++ b/composer.json @@ -64,7 +64,7 @@ "phpunit/phpunit": "^9.5", "psalm/plugin-phpunit": "^0.18", "psalm/plugin-symfony": "^5.0", - "rector/rector": "^0.17", + "rector/rector": "^0.18", "sonata-project/admin-bundle": "^4.20", "sonata-project/block-bundle": "^4.11 || ^5.0", "sonata-project/doctrine-orm-admin-bundle": "^4.0", diff --git a/tests/Action/LoginActionTest.php b/tests/Action/LoginActionTest.php index ca48ff503..8c736712f 100644 --- a/tests/Action/LoginActionTest.php +++ b/tests/Action/LoginActionTest.php @@ -134,7 +134,7 @@ public function testAlreadyAuthenticated(): void } /** - * @dataProvider unauthenticatedProvider + * @dataProvider provideUnauthenticatedCases */ public function testUnauthenticated(string $lastUsername, ?AuthenticationException $errorMessage = null): void { @@ -208,14 +208,11 @@ public function testUnauthenticated(string $lastUsername, ?AuthenticationExcepti * * @phpstan-return iterable */ - public function unauthenticatedProvider(): iterable + public function provideUnauthenticatedCases(): iterable { $error = new AuthenticationException('An error'); - - return [ - ['', null], - ['FooUser', $error], - ]; + yield ['', null]; + yield ['FooUser', $error]; } private function getAction(): LoginAction diff --git a/tests/Functional/Admin/UserAdminTest.php b/tests/Functional/Admin/UserAdminTest.php index 05fea33af..c5d67f627 100644 --- a/tests/Functional/Admin/UserAdminTest.php +++ b/tests/Functional/Admin/UserAdminTest.php @@ -54,7 +54,7 @@ public static function provideCrudUrlsCases(): iterable } /** - * @dataProvider provideFormUrlsCases + * @dataProvider provideFormsUrlsCases * * @param array $parameters * @param array $fieldValues @@ -77,7 +77,7 @@ public function testFormsUrls(string $url, array $parameters, string $button, ar * * @phpstan-return iterable, 2: string, 3?: array}> */ - public static function provideFormUrlsCases(): iterable + public static function provideFormsUrlsCases(): iterable { yield 'Create User' => ['/admin/tests/app/user/create', [ 'uniqid' => 'user', diff --git a/tests/Mailer/MailerTest.php b/tests/Mailer/MailerTest.php index 4669e6bab..a8caa5f40 100644 --- a/tests/Mailer/MailerTest.php +++ b/tests/Mailer/MailerTest.php @@ -68,7 +68,7 @@ public function testSendConfirmationEmailMessage(): void } /** - * @dataProvider emailTemplateData + * @dataProvider provideSendResettingEmailMessageCases */ public function testSendResettingEmailMessage(string $template, string $subject, string $body): void { @@ -111,15 +111,13 @@ public function testSendResettingEmailMessage(string $template, string $subject, * * @phpstan-return iterable */ - public function emailTemplateData(): iterable + public function provideSendResettingEmailMessageCases(): iterable { - return [ - 'CR' => ["Subject\rFirst line\rSecond line", 'Subject', "First line\rSecond line"], - 'LF' => ["Subject\nFirst line\nSecond line", 'Subject', "First line\nSecond line"], - 'CRLF' => ["Subject\r\nFirst line\r\nSecond line", 'Subject', "First line\r\nSecond line"], - 'LFLF' => ["Subject\n\nFirst line\n\nSecond line", 'Subject', "\nFirst line\n\nSecond line"], - 'CRCR' => ["Subject\r\rFirst line\r\rSecond line", 'Subject', "\rFirst line\r\rSecond line"], - ]; + yield 'CR' => ["Subject\rFirst line\rSecond line", 'Subject', "First line\rSecond line"]; + yield 'LF' => ["Subject\nFirst line\nSecond line", 'Subject', "First line\nSecond line"]; + yield 'CRLF' => ["Subject\r\nFirst line\r\nSecond line", 'Subject', "First line\r\nSecond line"]; + yield 'LFLF' => ["Subject\n\nFirst line\n\nSecond line", 'Subject', "\nFirst line\n\nSecond line"]; + yield 'CRCR' => ["Subject\r\rFirst line\r\rSecond line", 'Subject', "\rFirst line\r\rSecond line"]; } private function getMailer(): Mailer