Enhancement: Enable self_static_accessor fixer (#728)

* Enhancement: Enable self_static_accessor fixer * Fix: Run 'make cs'
FakerPHP · Sep 5, 2023 · 31c6842 · 31c6842
1 parent 1ba2598
commit 31c6842
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 22 deletions.
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -187,6 +187,7 @@
         'random_api_migration' => true,
         'return_assignment' => true,
         'return_type_declaration' => true,
+        'self_static_accessor' => true,
         'semicolon_after_instruction' => true,
         'short_scalar_cast' => true,
         'single_line_comment_style' => true,

diff --git a/src/Faker/Extension/Helper.php b/src/Faker/Extension/Helper.php
@@ -86,7 +86,7 @@ public static function bothify(string $string): string
             return mt_rand(0, 1) === 1 ? '#' : '?';
         });
 
-        return static::lexify(static::numerify($string));
+        return self::lexify(self::numerify($string));
     }
 
     private static function replaceWildcard(string $string, string $wildcard, callable $callback): string

diff --git a/test/Faker/Provider/ProviderOverrideTest.php b/test/Faker/Provider/ProviderOverrideTest.php
@@ -35,10 +35,10 @@ public function testAddress($locale = null): void
     {
         $faker = Faker\Factory::create($locale);
 
-        self::assertMatchesRegularExpression(static::TEST_STRING_REGEX, $faker->city);
-        self::assertMatchesRegularExpression(static::TEST_STRING_REGEX, $faker->postcode);
-        self::assertMatchesRegularExpression(static::TEST_STRING_REGEX, $faker->address);
-        self::assertMatchesRegularExpression(static::TEST_STRING_REGEX, $faker->country);
+        self::assertMatchesRegularExpression(self::TEST_STRING_REGEX, $faker->city);
+        self::assertMatchesRegularExpression(self::TEST_STRING_REGEX, $faker->postcode);
+        self::assertMatchesRegularExpression(self::TEST_STRING_REGEX, $faker->address);
+        self::assertMatchesRegularExpression(self::TEST_STRING_REGEX, $faker->country);
     }
 
     /**
@@ -50,7 +50,7 @@ public function testCompany($locale = null): void
     {
         $faker = Faker\Factory::create($locale);
 
-        self::assertMatchesRegularExpression(static::TEST_STRING_REGEX, $faker->company);
+        self::assertMatchesRegularExpression(self::TEST_STRING_REGEX, $faker->company);
     }
 
     /**
@@ -62,8 +62,8 @@ public function testDateTime($locale = null): void
     {
         $faker = Faker\Factory::create($locale);
 
-        self::assertMatchesRegularExpression(static::TEST_STRING_REGEX, $faker->century);
-        self::assertMatchesRegularExpression(static::TEST_STRING_REGEX, $faker->timezone);
+        self::assertMatchesRegularExpression(self::TEST_STRING_REGEX, $faker->century);
+        self::assertMatchesRegularExpression(self::TEST_STRING_REGEX, $faker->timezone);
     }
 
     /**
@@ -75,12 +75,12 @@ public function testInternet($locale = null): void
     {
         $faker = Faker\Factory::create($locale);
 
-        self::assertMatchesRegularExpression(static::TEST_STRING_REGEX, $faker->userName);
+        self::assertMatchesRegularExpression(self::TEST_STRING_REGEX, $faker->userName);
 
-        self::assertMatchesRegularExpression(static::TEST_EMAIL_REGEX, $faker->email);
-        self::assertMatchesRegularExpression(static::TEST_EMAIL_REGEX, $faker->safeEmail);
-        self::assertMatchesRegularExpression(static::TEST_EMAIL_REGEX, $faker->freeEmail);
-        self::assertMatchesRegularExpression(static::TEST_EMAIL_REGEX, $faker->companyEmail);
+        self::assertMatchesRegularExpression(self::TEST_EMAIL_REGEX, $faker->email);
+        self::assertMatchesRegularExpression(self::TEST_EMAIL_REGEX, $faker->safeEmail);
+        self::assertMatchesRegularExpression(self::TEST_EMAIL_REGEX, $faker->freeEmail);
+        self::assertMatchesRegularExpression(self::TEST_EMAIL_REGEX, $faker->companyEmail);
     }
 
     /**
@@ -92,10 +92,10 @@ public function testPerson($locale = null): void
     {
         $faker = Faker\Factory::create($locale);
 
-        self::assertMatchesRegularExpression(static::TEST_STRING_REGEX, $faker->name);
-        self::assertMatchesRegularExpression(static::TEST_STRING_REGEX, $faker->title);
-        self::assertMatchesRegularExpression(static::TEST_STRING_REGEX, $faker->firstName);
-        self::assertMatchesRegularExpression(static::TEST_STRING_REGEX, $faker->lastName);
+        self::assertMatchesRegularExpression(self::TEST_STRING_REGEX, $faker->name);
+        self::assertMatchesRegularExpression(self::TEST_STRING_REGEX, $faker->title);
+        self::assertMatchesRegularExpression(self::TEST_STRING_REGEX, $faker->firstName);
+        self::assertMatchesRegularExpression(self::TEST_STRING_REGEX, $faker->lastName);
     }
 
     /**
@@ -107,7 +107,7 @@ public function testPhoneNumber($locale = null): void
     {
         $faker = Faker\Factory::create($locale);
 
-        self::assertMatchesRegularExpression(static::TEST_STRING_REGEX, $faker->phoneNumber);
+        self::assertMatchesRegularExpression(self::TEST_STRING_REGEX, $faker->phoneNumber);
     }
 
     /**
@@ -119,7 +119,7 @@ public function testUserAgent($locale = null): void
     {
         $faker = Faker\Factory::create($locale);
 
-        self::assertMatchesRegularExpression(static::TEST_STRING_REGEX, $faker->userAgent);
+        self::assertMatchesRegularExpression(self::TEST_STRING_REGEX, $faker->userAgent);
     }
 
     /**
@@ -132,6 +132,6 @@ public function testUuid($locale = null): void
     {
         $faker = Faker\Factory::create($locale);
 
-        self::assertMatchesRegularExpression(static::TEST_STRING_REGEX, $faker->uuid);
+        self::assertMatchesRegularExpression(self::TEST_STRING_REGEX, $faker->uuid);
     }
 }
diff --git a/test/Faker/Provider/id_ID/PersonTest.php b/test/Faker/Provider/id_ID/PersonTest.php
@@ -77,7 +77,7 @@ public function testNikContainsBirthPlace(): void
     {
         $nik = $this->faker->nik();
 
-        self::assertContains(substr($nik, 0, 4), static::$birthPlaceCode);
+        self::assertContains(substr($nik, 0, 4), self::$birthPlaceCode);
     }
 
     protected function getProviders(): iterable

diff --git a/test/Faker/Provider/ro_RO/PersonTest.php b/test/Faker/Provider/ro_RO/PersonTest.php
@@ -206,7 +206,7 @@ protected function isValidMaleCnp($value)
 
     protected function isValidCnp($cnp)
     {
-        if (preg_match(static::TEST_CNP_REGEX, $cnp) !== false) {
+        if (preg_match(self::TEST_CNP_REGEX, $cnp) !== false) {
             $checkNumber = 279146358279;
 
             $checksum = 0;