Merge pull request #6987 from kenjis/remove-isFakerDeprecationError

refactor: remove Workaround for Faker deprecation errors in PHP 8.2
codeigniter4 · Dec 17, 2022 · a68891a · a68891a
2 parents 90fb1fe + 5482f56
commit a68891a
Showing 1 changed file with 0 additions and 33 deletions.
diff --git a/system/Debug/Exceptions.php b/system/Debug/Exceptions.php
@@ -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);
             }
@@ -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.