From: =?utf-8?q?David_Pr=C3=A9vot?= Date: Tue, 25 Feb 2025 08:43:31 +0100 Subject: Modernize PHPUnit syntax --- test/Faker/Calculator/EanTest.php | 17 +++----- test/Faker/Calculator/IbanTest.php | 17 +++----- test/Faker/Calculator/IsbnTest.php | 9 ++--- test/Faker/Calculator/LuhnTest.php | 9 ++--- test/Faker/Extension/ContainerBuilderTest.php | 4 +- test/Faker/Extension/ContainerTest.php | 5 +-- test/Faker/Provider/BaseTest.php | 11 ++---- test/Faker/Provider/DateTimeTest.php | 9 ++--- test/Faker/Provider/InternetTest.php | 17 +++----- test/Faker/Provider/LocalizationTest.php | 5 +-- test/Faker/Provider/PaymentTest.php | 14 +++---- test/Faker/Provider/PersonTest.php | 9 ++--- test/Faker/Provider/ProviderOverrideTest.php | 25 +++++------- test/Faker/Provider/TextTest.php | 57 ++++++++++++--------------- test/Faker/Provider/en_US/PaymentTest.php | 5 +-- test/Faker/Provider/fi_FI/PersonTest.php | 5 +-- test/Faker/Provider/ro_RO/PersonTest.php | 17 ++++---- test/Faker/Provider/ru_RU/CompanyTest.php | 9 ++--- test/Faker/Provider/sv_SE/PersonTest.php | 5 +-- test/Faker/Provider/tr_TR/PersonTest.php | 7 ++-- 20 files changed, 96 insertions(+), 160 deletions(-) diff --git a/test/Faker/Calculator/EanTest.php b/test/Faker/Calculator/EanTest.php index a585af8..6978bf0 100644 --- a/test/Faker/Calculator/EanTest.php +++ b/test/Faker/Calculator/EanTest.php @@ -4,6 +4,7 @@ namespace Faker\Test\Calculator; use Faker\Calculator\Ean; use Faker\Test\TestCase; +use PHPUnit\Framework\Attributes\DataProvider; final class EanTest extends TestCase { @@ -27,17 +28,13 @@ final class EanTest extends TestCase ]; } - /** - * @dataProvider Ean8checksumProvider - */ + #[DataProvider('Ean8checksumProvider')] public function testChecksumEan8($partial, $checksum) { self::assertSame($checksum, Ean::checksum($partial)); } - /** - * @dataProvider ean8ValidationProvider - */ + #[DataProvider('ean8ValidationProvider')] public function testEan8Validation($ean8, $valid) { self::assertSame($valid, Ean::isValid($ean8)); @@ -64,17 +61,13 @@ final class EanTest extends TestCase ]; } - /** - * @dataProvider Ean13checksumProvider - */ + #[DataProvider('Ean13checksumProvider')] public function testChecksumEan13($partial, $checksum) { self::assertSame($checksum, Ean::checksum($partial)); } - /** - * @dataProvider ean13ValidationProvider - */ + #[DataProvider('ean13ValidationProvider')] public function testEan13Validation($ean13, $valid) { self::assertSame($valid, Ean::isValid($ean13)); diff --git a/test/Faker/Calculator/IbanTest.php b/test/Faker/Calculator/IbanTest.php index eab2ce4..0d0e1a6 100644 --- a/test/Faker/Calculator/IbanTest.php +++ b/test/Faker/Calculator/IbanTest.php @@ -4,6 +4,7 @@ namespace Faker\Test\Calculator; use Faker\Calculator\Iban; use Faker\Test\TestCase; +use PHPUnit\Framework\Attributes\DataProvider; final class IbanTest extends TestCase { @@ -80,9 +81,7 @@ final class IbanTest extends TestCase ]; } - /** - * @dataProvider checksumProvider - */ + #[DataProvider('checksumProvider')] public function testChecksum($iban, $checksum) { self::assertEquals($checksum, Iban::checksum($iban), $iban); @@ -229,9 +228,7 @@ final class IbanTest extends TestCase ]; } - /** - * @dataProvider validatorProvider - */ + #[DataProvider('validatorProvider')] public function testIsValid($iban, $isValid) { self::assertEquals($isValid, Iban::isValid($iban), $iban); @@ -269,9 +266,7 @@ final class IbanTest extends TestCase ]; } - /** - * @dataProvider alphaToNumberProvider - */ + #[DataProvider('alphaToNumberProvider')] public function testAlphaToNumber($letter, $number) { self::assertEquals($number, Iban::alphaToNumber($letter), $letter); @@ -295,9 +290,7 @@ final class IbanTest extends TestCase return $return; } - /** - * @dataProvider mod97Provider - */ + #[DataProvider('mod97Provider')] public function testMod97($number, $result) { self::assertEquals($result, Iban::mod97($number), $number); diff --git a/test/Faker/Calculator/IsbnTest.php b/test/Faker/Calculator/IsbnTest.php index 47f47ab..549ebfe 100644 --- a/test/Faker/Calculator/IsbnTest.php +++ b/test/Faker/Calculator/IsbnTest.php @@ -4,6 +4,7 @@ namespace Faker\Test\Calculator; use Faker\Calculator\Isbn; use Faker\Test\TestCase; +use PHPUnit\Framework\Attributes\DataProvider; final class IsbnTest extends TestCase { @@ -33,9 +34,7 @@ final class IsbnTest extends TestCase yield ['093583933A', false]; } - /** - * @dataProvider isbnChecksumProvider - */ + #[DataProvider('isbnChecksumProvider')] public function testChecksumIsbn(string $partial, string $checksum): void { self::assertSame($checksum, Isbn::checksum($partial)); @@ -47,9 +46,7 @@ final class IsbnTest extends TestCase Isbn::checksum('9971502100'); } - /** - * @dataProvider isbnValidationProvider - */ + #[DataProvider('isbnValidationProvider')] public function testIsbnValidation(string $isbn, bool $valid): void { self::assertSame($valid, Isbn::isValid($isbn)); diff --git a/test/Faker/Calculator/LuhnTest.php b/test/Faker/Calculator/LuhnTest.php index b9b5c1d..62fa307 100644 --- a/test/Faker/Calculator/LuhnTest.php +++ b/test/Faker/Calculator/LuhnTest.php @@ -4,6 +4,7 @@ namespace Faker\Test\Calculator; use Faker\Calculator\Luhn; use Faker\Test\TestCase; +use PHPUnit\Framework\Attributes\DataProvider; final class LuhnTest extends TestCase { @@ -25,9 +26,7 @@ final class LuhnTest extends TestCase ]; } - /** - * @dataProvider checkDigitProvider - */ + #[DataProvider('checkDigitProvider')] public function testComputeCheckDigit($partialNumber, $checkDigit) { self::assertIsString($checkDigit); @@ -52,9 +51,7 @@ final class LuhnTest extends TestCase ]; } - /** - * @dataProvider validatorProvider - */ + #[DataProvider('validatorProvider')] public function testIsValid($number, $isValid) { self::assertEquals($isValid, Luhn::isValid($number)); diff --git a/test/Faker/Extension/ContainerBuilderTest.php b/test/Faker/Extension/ContainerBuilderTest.php index 155faa7..41af913 100644 --- a/test/Faker/Extension/ContainerBuilderTest.php +++ b/test/Faker/Extension/ContainerBuilderTest.php @@ -8,6 +8,7 @@ use Faker\Container\ContainerBuilder; use Faker\Container\ContainerInterface; use Faker\Core\File; use Faker\Extension\Extension; +use PHPUnit\Framework\Attributes\DataProvider; use PHPUnit\Framework\TestCase; /** @@ -16,10 +17,9 @@ use PHPUnit\Framework\TestCase; final class ContainerBuilderTest extends TestCase { /** - * @dataProvider provideInvalidValue - * * @param array|bool|float|int|resource|null $value */ + #[DataProvider('provideInvalidValue')] public function testAddRejectsInvalidValue($value): void { $containerBuilder = new ContainerBuilder(); diff --git a/test/Faker/Extension/ContainerTest.php b/test/Faker/Extension/ContainerTest.php index 45eada2..e9d4e72 100644 --- a/test/Faker/Extension/ContainerTest.php +++ b/test/Faker/Extension/ContainerTest.php @@ -7,6 +7,7 @@ namespace Faker\Test\Extension; use Faker\Container\Container; use Faker\Core\File; use Faker\Extension\Extension; +use PHPUnit\Framework\Attributes\DataProvider; use PHPUnit\Framework\TestCase; use Psr\Container\ContainerExceptionInterface; use Psr\Container\NotFoundExceptionInterface; @@ -43,9 +44,7 @@ final class ContainerTest extends TestCase self::assertInstanceOf(File::class, $object); } - /** - * @dataProvider provideDefinitionThatDoesNotResolveToExtension - */ + #[DataProvider('provideDefinitionThatDoesNotResolveToExtension')] public function testGetThrowsRuntimeExceptionWhenServiceResolvedForIdentifierIsNotAnExtension($definition): void { $id = 'file'; diff --git a/test/Faker/Provider/BaseTest.php b/test/Faker/Provider/BaseTest.php index 08c72c1..ec90fbc 100644 --- a/test/Faker/Provider/BaseTest.php +++ b/test/Faker/Provider/BaseTest.php @@ -4,6 +4,7 @@ namespace Faker\Test\Provider; use Faker\Provider\Base as BaseProvider; use Faker\Test\TestCase; +use PHPUnit\Framework\Attributes\DataProvider; /** * @group legacy @@ -316,9 +317,7 @@ final class BaseTest extends TestCase ]; } - /** - * @dataProvider regexifyBasicDataProvider - */ + #[DataProvider('regexifyBasicDataProvider')] public function testRegexifyBasicFeatures($input, $output, $message) { self::assertEquals($output, BaseProvider::regexify($input), $message); @@ -348,9 +347,7 @@ final class BaseTest extends TestCase ]; } - /** - * @dataProvider regexifyDataProvider - */ + #[DataProvider('regexifyDataProvider')] public function testRegexifySupportedRegexSyntax($pattern, $message) { self::assertMatchesRegularExpression('/' . $pattern . '/', BaseProvider::regexify($pattern), 'Regexify supports ' . $message); @@ -563,7 +560,7 @@ final class BaseTest extends TestCase $allowDuplicates = BaseProvider::randomElements(['foo', 'bar'], 3, true); self::assertCount(3, $allowDuplicates); - self::assertContainsOnly('string', $allowDuplicates); + self::assertContainsOnlyString($allowDuplicates); } } diff --git a/test/Faker/Provider/DateTimeTest.php b/test/Faker/Provider/DateTimeTest.php index 992dac9..75ca378 100644 --- a/test/Faker/Provider/DateTimeTest.php +++ b/test/Faker/Provider/DateTimeTest.php @@ -4,6 +4,7 @@ namespace Faker\Test\Provider; use Faker\Provider\DateTime as DateTimeProvider; use Faker\Test\TestCase; +use PHPUnit\Framework\Attributes\DataProvider; /** * @group legacy @@ -185,9 +186,7 @@ final class DateTimeTest extends TestCase self::assertMatchesRegularExpression('/^\d{2}:\d{2}:\d{2}$/', $date); } - /** - * @dataProvider providerDateTimeBetween - */ + #[DataProvider('providerDateTimeBetween')] public function testDateTimeBetween($start, $end) { $date = DateTimeProvider::dateTimeBetween($start, $end); @@ -207,9 +206,7 @@ final class DateTimeTest extends TestCase ]; } - /** - * @dataProvider providerDateTimeInInterval - */ + #[DataProvider('providerDateTimeInInterval')] public function testDateTimeInInterval($start, $interval, $isInFuture) { $date = DateTimeProvider::dateTimeInInterval($start, $interval); diff --git a/test/Faker/Provider/InternetTest.php b/test/Faker/Provider/InternetTest.php index 646bab5..7c68b9c 100644 --- a/test/Faker/Provider/InternetTest.php +++ b/test/Faker/Provider/InternetTest.php @@ -7,24 +7,21 @@ use Faker\Provider\Internet; use Faker\Provider\Lorem; use Faker\Provider\Person; use Faker\Test\TestCase; +use PHPUnit\Framework\Attributes\DataProvider; /** * @group legacy */ final class InternetTest extends TestCase { - /** - * @dataProvider localeDataProvider - */ + #[DataProvider('localeDataProvider')] public function testEmailIsValid($locale) { $this->loadLocalProviders($locale); self::assertNotFalse(filter_var($this->faker->email(), FILTER_VALIDATE_EMAIL)); } - /** - * @dataProvider localeDataProvider - */ + #[DataProvider('localeDataProvider')] public function testUsernameIsValid($locale) { $this->loadLocalProviders($locale); @@ -33,9 +30,7 @@ final class InternetTest extends TestCase self::assertMatchesRegularExpression($pattern, $username); } - /** - * @dataProvider localeDataProvider - */ + #[DataProvider('localeDataProvider')] public function testDomainnameIsValid($locale) { $this->loadLocalProviders($locale); @@ -44,9 +39,7 @@ final class InternetTest extends TestCase self::assertMatchesRegularExpression($pattern, $domainName); } - /** - * @dataProvider localeDataProvider - */ + #[DataProvider('localeDataProvider')] public function testDomainwordIsValid($locale) { $this->loadLocalProviders($locale); diff --git a/test/Faker/Provider/LocalizationTest.php b/test/Faker/Provider/LocalizationTest.php index c90833c..0d7a9cb 100644 --- a/test/Faker/Provider/LocalizationTest.php +++ b/test/Faker/Provider/LocalizationTest.php @@ -4,15 +4,14 @@ namespace Faker\Test\Provider; use Faker\Factory; use Faker\Test\TestCase; +use PHPUnit\Framework\Attributes\DataProvider; /** * @group legacy */ final class LocalizationTest extends TestCase { - /** - * @dataProvider localeDataProvider - */ + #[DataProvider('localeDataProvider')] public function testLocalizedProvidersDoNotThrowErrors(string $locale): void { $faker = Factory::create($locale); diff --git a/test/Faker/Provider/PaymentTest.php b/test/Faker/Provider/PaymentTest.php index 438d214..29f5a15 100644 --- a/test/Faker/Provider/PaymentTest.php +++ b/test/Faker/Provider/PaymentTest.php @@ -9,6 +9,8 @@ use Faker\Provider\DateTime as DateTimeProvider; use Faker\Provider\Payment as PaymentProvider; use Faker\Provider\Person as PersonProvider; use Faker\Test\TestCase; +use PHPUnit\Framework\Attributes\DataProvider; +use PHPUnit\Framework\Attributes\RequiresPhpunit; /** * @group legacy @@ -31,9 +33,7 @@ final class PaymentTest extends TestCase ]; } - /** - * @dataProvider creditCardNumberProvider - */ + #[DataProvider('creditCardNumberProvider')] public function testCreditCardNumberReturnsValidCreditCardNumber($type, $regexp) { $cardNumber = $this->faker->creditCardNumber($type); @@ -129,9 +129,7 @@ final class PaymentTest extends TestCase 'VG' => '/^VG\d{2}[A-Z]{4}\d{16}$/', ]; - /** - * @dataProvider localeDataProvider - */ + #[DataProvider('localeDataProvider')] public function testBankAccountNumber($locale) { $parts = explode('_', $locale); @@ -173,9 +171,7 @@ final class PaymentTest extends TestCase return $return; } - /** - * @group nophpunit11 - */ + #[RequiresPhpunit('< 11')] public function testIban($countryCode, $regex) { $iban = $this->faker->iban($countryCode); diff --git a/test/Faker/Provider/PersonTest.php b/test/Faker/Provider/PersonTest.php index c1c14a5..5095bcb 100644 --- a/test/Faker/Provider/PersonTest.php +++ b/test/Faker/Provider/PersonTest.php @@ -4,15 +4,14 @@ namespace Faker\Test\Provider; use Faker\Provider\Person; use Faker\Test\TestCase; +use PHPUnit\Framework\Attributes\DataProvider; /** * @group legacy */ final class PersonTest extends TestCase { - /** - * @dataProvider firstNameProvider - */ + #[DataProvider('firstNameProvider')] public function testFirstName($gender, $expected) { self::assertContains($this->faker->firstName($gender), $expected); @@ -38,9 +37,7 @@ final class PersonTest extends TestCase self::assertContains(Person::firstNameFemale(), ['Jane']); } - /** - * @dataProvider titleProvider - */ + #[DataProvider('titleProvider')] public function testTitle($gender, $expected) { self::assertContains($this->faker->title($gender), $expected); diff --git a/test/Faker/Provider/ProviderOverrideTest.php b/test/Faker/Provider/ProviderOverrideTest.php index 2d04495..5ae2f0f 100644 --- a/test/Faker/Provider/ProviderOverrideTest.php +++ b/test/Faker/Provider/ProviderOverrideTest.php @@ -4,6 +4,7 @@ namespace Faker\Test\Provider; use Faker; use Faker\Test\TestCase; +use PHPUnit\Framework\Attributes\DataProvider; /** * Class ProviderOverrideTest @@ -27,10 +28,9 @@ final class ProviderOverrideTest extends TestCase public const TEST_EMAIL_REGEX = '/^(.+)@(.+)$/ui'; /** - * @dataProvider localeDataProvider - * * @param string $locale */ + #[DataProvider('localeDataProvider')] public function testAddress($locale = null) { $faker = Faker\Factory::create($locale); @@ -42,10 +42,9 @@ final class ProviderOverrideTest extends TestCase } /** - * @dataProvider localeDataProvider - * * @param string $locale */ + #[DataProvider('localeDataProvider')] public function testCompany($locale = null) { $faker = Faker\Factory::create($locale); @@ -54,10 +53,9 @@ final class ProviderOverrideTest extends TestCase } /** - * @dataProvider localeDataProvider - * * @param string $locale */ + #[DataProvider('localeDataProvider')] public function testDateTime($locale = null) { $faker = Faker\Factory::create($locale); @@ -67,10 +65,9 @@ final class ProviderOverrideTest extends TestCase } /** - * @dataProvider localeDataProvider - * * @param string $locale */ + #[DataProvider('localeDataProvider')] public function testInternet($locale = null) { $faker = Faker\Factory::create($locale); @@ -84,10 +81,9 @@ final class ProviderOverrideTest extends TestCase } /** - * @dataProvider localeDataProvider - * * @param string $locale */ + #[DataProvider('localeDataProvider')] public function testPerson($locale = null) { $faker = Faker\Factory::create($locale); @@ -99,10 +95,9 @@ final class ProviderOverrideTest extends TestCase } /** - * @dataProvider localeDataProvider - * * @param string $locale */ + #[DataProvider('localeDataProvider')] public function testPhoneNumber($locale = null) { $faker = Faker\Factory::create($locale); @@ -111,10 +106,9 @@ final class ProviderOverrideTest extends TestCase } /** - * @dataProvider localeDataProvider - * * @param string $locale */ + #[DataProvider('localeDataProvider')] public function testUserAgent($locale = null) { $faker = Faker\Factory::create($locale); @@ -123,11 +117,10 @@ final class ProviderOverrideTest extends TestCase } /** - * @dataProvider localeDataProvider - * * @param null $locale * @param string $locale */ + #[DataProvider('localeDataProvider')] public function testUuid($locale = null) { $faker = Faker\Factory::create($locale); diff --git a/test/Faker/Provider/TextTest.php b/test/Faker/Provider/TextTest.php index 65c648c..dfc6c20 100644 --- a/test/Faker/Provider/TextTest.php +++ b/test/Faker/Provider/TextTest.php @@ -4,39 +4,36 @@ namespace Faker\Test\Provider; use Faker\Provider\en_US\Text; use Faker\Test\TestCase; +use PHPUnit\Framework\Attributes\TestWith; /** * @group legacy */ final class TextTest extends TestCase { - /** - * @testWith [10] - * [20] - * [50] - * [70] - * [90] - * [120] - * [150] - * [200] - * [500] - */ + #[TestWith([10])] + #[TestWith([20])] + #[TestWith([50])] + #[TestWith([70])] + #[TestWith([90])] + #[TestWith([120])] + #[TestWith([150])] + #[TestWith([200])] + #[TestWith([500])] public function testRealTextMaxLength($length) { self::assertLessThan($length, strlen($this->faker->realText($length))); } - /** - * @testWith [10] - * [20] - * [50] - * [70] - * [90] - * [120] - * [150] - * [200] - * [500] - */ + #[TestWith([10])] + #[TestWith([20])] + #[TestWith([50])] + #[TestWith([70])] + #[TestWith([90])] + #[TestWith([120])] + #[TestWith([150])] + #[TestWith([200])] + #[TestWith([500])] public function testRealTextMinLength($length) { self::assertGreaterThanOrEqual($length * 0.8, strlen($this->faker->realText($length))); @@ -69,15 +66,13 @@ final class TextTest extends TestCase self::fail('The text should be at least 10 characters.'); } - /** - * @testWith [1, 10] - * [5, 10] - * [8, 10] - * [18, 20] - * [45, 50] - * [180, 200] - * [1950, 2000] - */ + #[TestWith([1, 10])] + #[TestWith([5, 10])] + #[TestWith([8, 10])] + #[TestWith([18, 20])] + #[TestWith([45, 50])] + #[TestWith([180, 200])] + #[TestWith([1950, 2000])] public function testRealTextBetweenTextLength($min, $max) { $strlen = strlen($this->faker->realTextBetween($min, $max)); diff --git a/test/Faker/Provider/en_US/PaymentTest.php b/test/Faker/Provider/en_US/PaymentTest.php index 7d7b236..50e5ae1 100644 --- a/test/Faker/Provider/en_US/PaymentTest.php +++ b/test/Faker/Provider/en_US/PaymentTest.php @@ -3,6 +3,7 @@ namespace Faker\Provider\en_US; use Faker\Test\TestCase; +use PHPUnit\Framework\Attributes\DataProvider; /** * @group legacy @@ -64,9 +65,7 @@ final class PaymentTest extends TestCase ]; } - /** - * @dataProvider routingNumberProvider - */ + #[DataProvider('routingNumberProvider')] public function testCalculateRoutingNumberChecksum($routingNo) { self::assertEquals($routingNo[8], Payment::calculateRoutingNumberChecksum($routingNo), $routingNo); diff --git a/test/Faker/Provider/fi_FI/PersonTest.php b/test/Faker/Provider/fi_FI/PersonTest.php index ef919d3..893e760 100644 --- a/test/Faker/Provider/fi_FI/PersonTest.php +++ b/test/Faker/Provider/fi_FI/PersonTest.php @@ -5,6 +5,7 @@ namespace Faker\Test\Provider\fi_FI; use Faker\Provider\DateTime; use Faker\Provider\fi_FI\Person; use Faker\Test\TestCase; +use PHPUnit\Framework\Attributes\DataProvider; /** * @group legacy @@ -22,9 +23,7 @@ final class PersonTest extends TestCase ]; } - /** - * @dataProvider provideSeedAndExpectedReturn - */ + #[DataProvider('provideSeedAndExpectedReturn')] public function testPersonalIdentityNumberUsesBirthDateIfProvided($seed, $birthdate, $expected) { $faker = $this->faker; diff --git a/test/Faker/Provider/ro_RO/PersonTest.php b/test/Faker/Provider/ro_RO/PersonTest.php index 21e8758..a362b03 100644 --- a/test/Faker/Provider/ro_RO/PersonTest.php +++ b/test/Faker/Provider/ro_RO/PersonTest.php @@ -5,6 +5,7 @@ namespace Faker\Test\Provider\ro_RO; use Faker\Provider\DateTime; use Faker\Provider\ro_RO\Person; use Faker\Test\TestCase; +use PHPUnit\Framework\Attributes\DataProvider; /** * @group legacy @@ -108,9 +109,8 @@ final class PersonTest extends TestCase /** * @param string $value - * - * @dataProvider invalidGenderProvider */ + #[DataProvider('invalidGenderProvider')] public function testInvalidGenderThrowsException($value) { $this->expectException(\InvalidArgumentException::class); @@ -119,9 +119,8 @@ final class PersonTest extends TestCase /** * @param string $value year of birth - * - * @dataProvider validYearProvider */ + #[DataProvider('validYearProvider')] public function testValidYearReturnsValidCnp($value) { $cnp = $this->faker->cnp(null, $value); @@ -133,9 +132,8 @@ final class PersonTest extends TestCase /** * @param string $value year of birth - * - * @dataProvider invalidYearProvider */ + #[DataProvider('invalidYearProvider')] public function testInvalidYearThrowsException($value) { $this->expectException(\InvalidArgumentException::class); @@ -144,8 +142,8 @@ final class PersonTest extends TestCase /** * @param string $value - * @dataProvider validCountyCodeProvider */ + #[DataProvider('validCountyCodeProvider')] public function testValidCountyCodeReturnsValidCnp($value) { $cnp = $this->faker->cnp(null, null, $value); @@ -157,8 +155,8 @@ final class PersonTest extends TestCase /** * @param string $value - * @dataProvider invalidCountyCodeProvider */ + #[DataProvider('invalidCountyCodeProvider')] public function testInvalidCountyCodeThrowsException($value) { $this->expectException(\InvalidArgumentException::class); @@ -185,9 +183,8 @@ final class PersonTest extends TestCase * @param string $county * @param bool $isResident * @param string $expectedCnpStart - * - * @dataProvider validInputDataProvider */ + #[DataProvider('validInputDataProvider')] public function testValidInputDataReturnsValidCnp($gender, $dateOfBirth, $county, $isResident, $expectedCnpStart) { $cnp = $this->faker->cnp($gender, $dateOfBirth, $county, $isResident); diff --git a/test/Faker/Provider/ru_RU/CompanyTest.php b/test/Faker/Provider/ru_RU/CompanyTest.php index d165344..014e2a7 100644 --- a/test/Faker/Provider/ru_RU/CompanyTest.php +++ b/test/Faker/Provider/ru_RU/CompanyTest.php @@ -4,6 +4,7 @@ namespace Faker\Test\Provider\ru_RU; use Faker\Provider\ru_RU\Company; use Faker\Test\TestCase; +use PHPUnit\Framework\Attributes\DataProvider; /** * @group legacy @@ -47,9 +48,7 @@ final class CompanyTest extends TestCase ]; } - /** - * @dataProvider checksumProvider - */ + #[DataProvider('checksumProvider')] public function testInn10Checksum($inn10, $checksum) { self::assertSame($checksum, $this->faker->inn10Checksum($inn10), $inn10); @@ -68,9 +67,7 @@ final class CompanyTest extends TestCase ]; } - /** - * @dataProvider inn10ValidatorProvider - */ + #[DataProvider('inn10ValidatorProvider')] public function testInn10IsValid($inn10, $isValid) { self::assertSame($isValid, $this->faker->inn10IsValid($inn10), $inn10); diff --git a/test/Faker/Provider/sv_SE/PersonTest.php b/test/Faker/Provider/sv_SE/PersonTest.php index ea97234..e090812 100644 --- a/test/Faker/Provider/sv_SE/PersonTest.php +++ b/test/Faker/Provider/sv_SE/PersonTest.php @@ -5,6 +5,7 @@ namespace Faker\Test\Provider\sv_SE; use Faker\Calculator\Luhn; use Faker\Provider\sv_SE\Person; use Faker\Test\TestCase; +use PHPUnit\Framework\Attributes\DataProvider; /** * @group legacy @@ -22,9 +23,7 @@ final class PersonTest extends TestCase ]; } - /** - * @dataProvider provideSeedAndExpectedReturn - */ + #[DataProvider('provideSeedAndExpectedReturn')] public function testPersonalIdentityNumberUsesBirthDateIfProvided($seed, $birthdate, $expected) { $faker = $this->faker; diff --git a/test/Faker/Provider/tr_TR/PersonTest.php b/test/Faker/Provider/tr_TR/PersonTest.php index 30ed38e..ebb32f1 100644 --- a/test/Faker/Provider/tr_TR/PersonTest.php +++ b/test/Faker/Provider/tr_TR/PersonTest.php @@ -4,6 +4,7 @@ namespace Faker\Test\Provider\tr_TR; use Faker\Provider\tr_TR\Person; use Faker\Test\TestCase; +use PHPUnit\Framework\Attributes\DataProvider; /** * @group legacy @@ -32,11 +33,10 @@ final class PersonTest extends TestCase } /** - * @dataProvider tcNoChecksumProvider - * * @param string $tcNo * @param string $checksum */ + #[DataProvider('tcNoChecksumProvider')] public function testTcNoChecksum($tcNo, $checksum) { self::assertSame($checksum, $this->faker->tcNoChecksum($tcNo), $tcNo); @@ -57,11 +57,10 @@ final class PersonTest extends TestCase } /** - * @dataProvider tcNoValidatorProvider - * * @param string $tcNo * @param bool $isValid */ + #[DataProvider('tcNoValidatorProvider')] public function testIsValid($tcNo, $isValid) { self::assertSame($isValid, $this->faker->tcNoisValid($tcNo), $tcNo);