Skip to content

make it compatible to php8.2 and fix deprecation with callbacks static:: #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
frithjof wants to merge 2 commits into
base: master
Choose a base branch
from
Open

make it compatible to php8.2 and fix deprecation with callbacks static:: #3

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e17b1f6
make it compatible to php8.2
frithjof May 8, 2024
8897ad8
make it compatible to php8.2
frithjof May 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions src/Faker/Provider/Base.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ public static function numberBetween($int1 = 0, $int2 = 2147483647)
$max = $int1 < $int2 ? $int2 : $int1;
return mt_rand($min, $max);
}

/**
* Returns the passed value
*
Expand Down Expand Up @@ -354,6 +354,7 @@ private static function replaceWildcard($string, $wildcard = '#', $callback = 's
}
for ($i = $pos, $last = strrpos($string, $wildcard, $pos) + 1; $i < $last; $i++) {
if ($string[$i] === $wildcard) {
$callback = str_replace('static::' , self::class.'::' , $callback);
$string[$i] = call_user_func($callback);
}
}
Expand Down Expand Up @@ -500,9 +501,9 @@ public static function regexify($regex = '')
return Base::randomElement(str_split($matches[1]));
}, $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('/(?<!\\\)\./', 'static::randomAscii', $regex);
$regex = preg_replace_callback('/\\\w/', self::class.'::'.'randomLetter', $regex);
$regex = preg_replace_callback('/\\\d/', self::class.'::'.'randomDigit', $regex);
$regex = preg_replace_callback('/(?<!\\\)\./', self::class.'::'.'randomAscii', $regex);
// remove remaining backslashes
$regex = str_replace('\\', '', $regex);
// phew
Expand Down