Skip to content
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

refactor: remove Workaround for Faker deprecation errors in PHP 8.2 #6987

Merged
merged 1 commit into from
Dec 17, 2022
Merged

refactor: remove Workaround for Faker deprecation errors in PHP 8.2 #6987

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
33 changes: 0 additions & 33 deletions system/Debug/Exceptions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,11 +159,6 @@ public function exceptionHandler(Throwable $exception)
public function errorHandler(int $severity, string $message, ?string $file = null, ?int $line = null)
{
if ($this->isDeprecationError($severity)) {
// @TODO Remove if Faker is fixed.
if ($this->isFakerDeprecationError($message, $file, $line)) {
return true;
}

if (! $this->config->logDeprecations || (bool) env('CODEIGNITER_SCREAM_DEPRECATIONS')) {
throw new ErrorException($message, 0, $severity, $file, $line);
}
Expand All @@ -178,34 +173,6 @@ public function errorHandler(int $severity, string $message, ?string $file = nul
return false; // return false to propagate the error to PHP standard error handler
}

/**
* Workaround for Faker deprecation errors in PHP 8.2.
*
* @see https://github.com/FakerPHP/Faker/issues/479
*/
private function isFakerDeprecationError(string $message, ?string $file = null, ?int $line = null)
{
if (
defined('VENDORPATH')
&& strpos($file, VENDORPATH . 'fakerphp/faker/') !== false
&& $message === 'Use of "static" in callables is deprecated'
) {
log_message(
LogLevel::WARNING,
'[DEPRECATED] {message} in {errFile} on line {errLine}.',
[
'message' => $message,
'errFile' => clean_path($file ?? ''),
'errLine' => $line ?? 0,
]
);

return true;
}

return false;
}

/**
* Checks to see if any errors have happened during shutdown that
* need to be caught and handle them.
Expand Down