Fix PHP 8.2 warning: Use [static::class, '…'] instead of 'static::… for callbacks (#570)

MyIgel · localheinz · web-flow · commit e63e29e464e8 · 2022-12-13T10:12:04.000+01:00
* Fix: Use self::class . '::[…]' instead of 'static::[…]' as callbacks (PHP 8.2 warning)

* Fix: Use static

* Fix: Remove default value

* Fix: Adjust number of allowed deprecations

* Fix: Run 'make baseline'

* Fix: Avoid string concatenation

* Fix: Run 'make baseline'

Co-authored-by: Andreas Möller &lt;am@localheinz.com&gt;
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -633,6 +633,11 @@ parameters:
 			count: 1
 			path: src/Faker/Provider/Base.php
 
+		-
+			message: "#^Parameter \\#2 \\$callback of function preg_replace_callback expects callable\\(array\\<int\\|string, string\\>\\)\\: string, array\\{class\\-string\\<static\\(Faker\\\\Provider\\\\Base\\)\\>, 'randomDigit'\\} given\\.$#"
+			count: 1
+			path: src/Faker/Provider/Base.php
+
 		-
 			message: "#^Parameter \\$validator of method Faker\\\\Provider\\\\Base\\:\\:valid\\(\\) has invalid type Faker\\\\Provider\\\\Closure\\.$#"
 			count: 1
@@ -733,6 +738,11 @@ parameters:
 			count: 2
 			path: src/Faker/Provider/cs_CZ/Person.php
 
+		-
+			message: "#^Parameter \\#2 \\$callback of function preg_replace_callback expects callable\\(array\\<int\\|string, string\\>\\)\\: string, array\\{class\\-string\\<static\\(Faker\\\\Provider\\\\en_CA\\\\Address\\)\\>, 'randomDigit'\\} given\\.$#"
+			count: 1
+			path: src/Faker/Provider/en_CA/Address.php
+
 		-
 			message: "#^Unsafe call to private method Faker\\\\Provider\\\\en_GB\\\\Company\\:\\:generateBranchTraderVatNumber\\(\\) through static\\:\\:\\.$#"
 			count: 1
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -13,7 +13,7 @@
         <listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener"/>
     </listeners>
     <php>
-        <env name="SYMFONY_DEPRECATIONS_HELPER" value="max[self]=404"/>
+        <env name="SYMFONY_DEPRECATIONS_HELPER" value="max[self]=0"/>
     </php>
     <testsuites>
         <testsuite name="Faker Test Suite">
diff --git a/psalm.baseline.xml b/psalm.baseline.xml
@@ -139,6 +139,9 @@
     </UndefinedDocblockClass>
   </file>
   <file src="src/Faker/Provider/Base.php">
+    <InvalidArgument occurrences="1">
+      <code>[static::class, 'randomDigit']</code>
+    </InvalidArgument>
     <NoValue occurrences="1">
       <code>$array</code>
     </NoValue>
diff --git a/src/Faker/Provider/Base.php b/src/Faker/Provider/Base.php
@@ -363,7 +363,7 @@ public static function shuffleString($string = '', $encoding = 'UTF-8')
         return implode('', static::shuffleArray($array));
     }
 
-    private static function replaceWildcard($string, $wildcard = '#', $callback = 'static::randomDigit')
+    private static function replaceWildcard($string, $wildcard, $callback)
     {
         if (($pos = strpos($string, $wildcard)) === false) {
             return $string;
@@ -415,7 +415,7 @@ public static function numerify($string = '###')
                 $string[$toReplace[$i]] = $numbers[$i];
             }
         }
-        $string = self::replaceWildcard($string, '%', 'static::randomDigitNotNull');
+        $string = self::replaceWildcard($string, '%', [static::class, 'randomDigitNotNull']);
 
         return $string;
     }
@@ -429,7 +429,7 @@ public static function numerify($string = '###')
      */
     public static function lexify($string = '????')
     {
-        return self::replaceWildcard($string, '?', 'static::randomLetter');
+        return self::replaceWildcard($string, '?', [static::class,  'randomLetter']);
     }
 
     /**
@@ -460,7 +460,7 @@ public static function bothify($string = '## ??')
      */
     public static function asciify($string = '****')
     {
-        return preg_replace_callback('/\*/u', 'static::randomAscii', $string);
+        return preg_replace_callback('/\*/u', [static::class, 'randomAscii'], $string);
     }
 
     /**
@@ -532,8 +532,8 @@ public static function regexify($regex = '')
             return str_replace('.', '\.', $randomElement);
         }, $regex);
         // replace \d with number and \w with letter and . with ascii
-        $regex = preg_replace_callback('/\\\w/', 'static::randomLetter', $regex);
-        $regex = preg_replace_callback('/\\\d/', 'static::randomDigit', $regex);
+        $regex = preg_replace_callback('/\\\w/', [static::class, 'randomLetter'], $regex);
+        $regex = preg_replace_callback('/\\\d/', [static::class, 'randomDigit'], $regex);
         //replace . with ascii except backslash
         $regex = preg_replace_callback('/(?<!\\\)\./', static function () {
             $chr = static::asciify('*');
diff --git a/src/Faker/Provider/en_CA/Address.php b/src/Faker/Provider/en_CA/Address.php
@@ -64,8 +64,8 @@ public static function postcode()
     {
         $string = static::randomElement(static::$postcode);
 
-        $string = preg_replace_callback('/\#/u', 'static::randomDigit', $string);
-        $string = preg_replace_callback('/\?/u', 'static::randomPostcodeLetter', $string);
+        $string = preg_replace_callback('/\#/u', [static::class,  'randomDigit'], $string);
+        $string = preg_replace_callback('/\?/u', [static::class, 'randomPostcodeLetter'], $string);
 
         return static::toUpper($string);
     }

Original file line number	Diff line number	Diff line change
`@@ -363,7 +363,7 @@ public static function shuffleString($string = '', $encoding = 'UTF-8')`
`363`	`363`	`return implode('', static::shuffleArray($array));`
`364`	`364`	`}`
`365`	`365`
`366`		`- private static function replaceWildcard($string, $wildcard = '#', $callback = 'static::randomDigit')`
	`366`	`+ private static function replaceWildcard($string, $wildcard, $callback)`
`367`	`367`	`{`
`368`	`368`	`if (($pos = strpos($string, $wildcard)) === false) {`
`369`	`369`	`return $string;`
`@@ -415,7 +415,7 @@ public static function numerify($string = '###')`
`415`	`415`	`$string[$toReplace[$i]] = $numbers[$i];`
`416`	`416`	`}`
`417`	`417`	`}`
`418`		`- $string = self::replaceWildcard($string, '%', 'static::randomDigitNotNull');`
	`418`	`+ $string = self::replaceWildcard($string, '%', [static::class, 'randomDigitNotNull']);`
`419`	`419`
`420`	`420`	`return $string;`
`421`	`421`	`}`
`@@ -429,7 +429,7 @@ public static function numerify($string = '###')`
`429`	`429`	`*/`
`430`	`430`	`public static function lexify($string = '????')`
`431`	`431`	`{`
`432`		`- return self::replaceWildcard($string, '?', 'static::randomLetter');`
	`432`	`+ return self::replaceWildcard($string, '?', [static::class, 'randomLetter']);`
`433`	`433`	`}`
`434`	`434`
`435`	`435`	`/**`
`@@ -460,7 +460,7 @@ public static function bothify($string = '## ??')`
`460`	`460`	`*/`
`461`	`461`	`public static function asciify($string = '****')`
`462`	`462`	`{`
`463`		`- return preg_replace_callback('/\*/u', 'static::randomAscii', $string);`
	`463`	`+ return preg_replace_callback('/\*/u', [static::class, 'randomAscii'], $string);`
`464`	`464`	`}`
`465`	`465`
`466`	`466`	`/**`
`@@ -532,8 +532,8 @@ public static function regexify($regex = '')`
`532`	`532`	`return str_replace('.', '\.', $randomElement);`
`533`	`533`	`}, $regex);`
`534`	`534`	`// replace \d with number and \w with letter and . with ascii`
`535`		`- $regex = preg_replace_callback('/\\\w/', 'static::randomLetter', $regex);`
`536`		`- $regex = preg_replace_callback('/\\\d/', 'static::randomDigit', $regex);`
	`535`	`+ $regex = preg_replace_callback('/\\\w/', [static::class, 'randomLetter'], $regex);`
	`536`	`+ $regex = preg_replace_callback('/\\\d/', [static::class, 'randomDigit'], $regex);`
`537`	`537`	`//replace . with ascii except backslash`
`538`	`538`	`$regex = preg_replace_callback('/(?<!\\\)\./', static function () {`
`539`	`539`	`$chr = static::asciify('*');`
Original file line number	Diff line number	Diff line change
`@@ -64,8 +64,8 @@ public static function postcode()`
`64`	`64`	`{`
`65`	`65`	`$string = static::randomElement(static::$postcode);`
`66`	`66`
`67`		`- $string = preg_replace_callback('/\#/u', 'static::randomDigit', $string);`
`68`		`- $string = preg_replace_callback('/\?/u', 'static::randomPostcodeLetter', $string);`
	`67`	`+ $string = preg_replace_callback('/\#/u', [static::class, 'randomDigit'], $string);`
	`68`	`+ $string = preg_replace_callback('/\?/u', [static::class, 'randomPostcodeLetter'], $string);`
`69`	`69`
`70`	`70`	`return static::toUpper($string);`
`71`	`71`	`}`