From a54cd1f1782f62714e4d28651224316bb5540e08 Mon Sep 17 00:00:00 2001 From: Mponos George Date: Wed, 8 Jul 2020 23:02:57 +0300 Subject: [PATCH] Replace call_user_func --- src/Monolog/ErrorHandler.php | 4 ++-- src/Monolog/Handler/FilterHandler.php | 2 +- src/Monolog/Handler/FingersCrossedHandler.php | 2 +- src/Monolog/Handler/MandrillHandler.php | 2 +- src/Monolog/Handler/SamplingHandler.php | 2 +- src/Monolog/Handler/SwiftMailerHandler.php | 2 +- src/Monolog/Handler/TestHandler.php | 2 +- src/Monolog/Logger.php | 4 ++-- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/Monolog/ErrorHandler.php b/src/Monolog/ErrorHandler.php index 2643fdb8..89381b9a 100644 --- a/src/Monolog/ErrorHandler.php +++ b/src/Monolog/ErrorHandler.php @@ -166,7 +166,7 @@ class ErrorHandler ); if ($this->previousExceptionHandler) { - call_user_func($this->previousExceptionHandler, $e); + ($this->previousExceptionHandler)($e); } if (!headers_sent() && !ini_get('display_errors')) { @@ -198,7 +198,7 @@ class ErrorHandler if ($this->previousErrorHandler === true) { return false; } elseif ($this->previousErrorHandler) { - return call_user_func($this->previousErrorHandler, $code, $message, $file, $line, $context); + return ($this->previousErrorHandler)($code, $message, $file, $line, $context); } return true; diff --git a/src/Monolog/Handler/FilterHandler.php b/src/Monolog/Handler/FilterHandler.php index ee1304d6..735fdfbd 100644 --- a/src/Monolog/Handler/FilterHandler.php +++ b/src/Monolog/Handler/FilterHandler.php @@ -145,7 +145,7 @@ class FilterHandler extends Handler implements ProcessableHandlerInterface, Rese public function getHandler(array $record = null) { if (!$this->handler instanceof HandlerInterface) { - $this->handler = call_user_func($this->handler, $record, $this); + $this->handler = ($this->handler)($record, $this); if (!$this->handler instanceof HandlerInterface) { throw new \RuntimeException("The factory callable should return a HandlerInterface"); } diff --git a/src/Monolog/Handler/FingersCrossedHandler.php b/src/Monolog/Handler/FingersCrossedHandler.php index 12d55a3a..7424b108 100644 --- a/src/Monolog/Handler/FingersCrossedHandler.php +++ b/src/Monolog/Handler/FingersCrossedHandler.php @@ -188,7 +188,7 @@ class FingersCrossedHandler extends Handler implements ProcessableHandlerInterfa public function getHandler(array $record = null) { if (!$this->handler instanceof HandlerInterface) { - $this->handler = call_user_func($this->handler, $record, $this); + $this->handler = ($this->handler)($record, $this); if (!$this->handler instanceof HandlerInterface) { throw new \RuntimeException("The factory callable should return a HandlerInterface"); } diff --git a/src/Monolog/Handler/MandrillHandler.php b/src/Monolog/Handler/MandrillHandler.php index 19aeeb3b..2a3b49c5 100644 --- a/src/Monolog/Handler/MandrillHandler.php +++ b/src/Monolog/Handler/MandrillHandler.php @@ -37,7 +37,7 @@ class MandrillHandler extends MailHandler parent::__construct($level, $bubble); if (!$message instanceof \Swift_Message && is_callable($message)) { - $message = call_user_func($message); + $message = $message(); } if (!$message instanceof \Swift_Message) { throw new \InvalidArgumentException('You must provide either a Swift_Message instance or a callable returning it'); diff --git a/src/Monolog/Handler/SamplingHandler.php b/src/Monolog/Handler/SamplingHandler.php index d7953aa7..6dcf5996 100644 --- a/src/Monolog/Handler/SamplingHandler.php +++ b/src/Monolog/Handler/SamplingHandler.php @@ -86,7 +86,7 @@ class SamplingHandler extends AbstractHandler implements ProcessableHandlerInter public function getHandler(array $record = null) { if (!$this->handler instanceof HandlerInterface) { - $this->handler = call_user_func($this->handler, $record, $this); + $this->handler = ($this->handler)($record, $this); if (!$this->handler instanceof HandlerInterface) { throw new \RuntimeException("The factory callable should return a HandlerInterface"); } diff --git a/src/Monolog/Handler/SwiftMailerHandler.php b/src/Monolog/Handler/SwiftMailerHandler.php index 27bf6f07..6b3e4950 100644 --- a/src/Monolog/Handler/SwiftMailerHandler.php +++ b/src/Monolog/Handler/SwiftMailerHandler.php @@ -75,7 +75,7 @@ class SwiftMailerHandler extends MailHandler $message = clone $this->messageTemplate; $message->generateId(); } elseif (is_callable($this->messageTemplate)) { - $message = call_user_func($this->messageTemplate, $content, $records); + $message = ($this->messageTemplate)($content, $records); } if (!$message instanceof Swift_Message) { diff --git a/src/Monolog/Handler/TestHandler.php b/src/Monolog/Handler/TestHandler.php index 568db512..9fa77b9f 100644 --- a/src/Monolog/Handler/TestHandler.php +++ b/src/Monolog/Handler/TestHandler.php @@ -159,7 +159,7 @@ class TestHandler extends AbstractProcessingHandler } foreach ($this->recordsByLevel[$level] as $i => $rec) { - if (call_user_func($predicate, $rec, $i)) { + if ($predicate($rec, $i)) { return true; } } diff --git a/src/Monolog/Logger.php b/src/Monolog/Logger.php index b8e2db98..0fb5196b 100644 --- a/src/Monolog/Logger.php +++ b/src/Monolog/Logger.php @@ -312,7 +312,7 @@ class Logger implements LoggerInterface, ResettableInterface try { foreach ($this->processors as $processor) { - $record = call_user_func($processor, $record); + $record = $processor($record); } // advance the array pointer to the first handler that will handle this record @@ -610,6 +610,6 @@ class Logger implements LoggerInterface, ResettableInterface throw $e; } - call_user_func($this->exceptionHandler, $e, $record); + ($this->exceptionHandler)($e, $record); } }