From 257a1c118067d3c2368f7ba7ed16f79117be8476 Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Mon, 29 Dec 2014 19:15:00 +0000 Subject: [PATCH] Remove unnecessary ctor init, refs #446 --- src/Monolog/Handler/PushoverHandler.php | 31 +++++++++++++++---------- 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/src/Monolog/Handler/PushoverHandler.php b/src/Monolog/Handler/PushoverHandler.php index 3be2e0a1..cd2fcfa3 100644 --- a/src/Monolog/Handler/PushoverHandler.php +++ b/src/Monolog/Handler/PushoverHandler.php @@ -36,8 +36,22 @@ class PushoverHandler extends SocketHandler * @see https://pushover.net/api * @var array */ - private $parameters; - + private $parameterNames = array( + 'token' => true, + 'user' => true, + 'message' => true, + 'device' => true, + 'title' => true, + 'url' => true, + 'url_title' => true, + 'priority' => true, + 'timestamp' => true, + 'sound' => true, + 'retry' => true, + 'expire' => true, + 'callback' => true, + ); + /** * Sounds the api supports by default * @see https://pushover.net/api#sounds @@ -76,13 +90,6 @@ class PushoverHandler extends SocketHandler $this->emergencyLevel = Logger::toMonologLevel($emergencyLevel); $this->retry = $retry; $this->expire = $expire; - - // Initialize API parameters as array keys - $this->parameters = array_flip(array( - 'token', 'user', 'message', // these are the required parameters - 'device', 'title', 'url', 'url_title', 'priority', 'timestamp', 'sound', - 'retry', 'expire', 'callback', - )); } protected function generateDataStream($record) @@ -116,9 +123,9 @@ class PushoverHandler extends SocketHandler } // First determine the available parameters - $context = array_intersect_key($record['context'], $this->parameters); - $extra = array_intersect_key($record['extra'], $this->parameters); - + $context = array_intersect_key($record['context'], $this->parameterNames); + $extra = array_intersect_key($record['extra'], $this->parameterNames); + // Least important info should be merged with subsequent info $dataArray = array_merge($extra, $context, $dataArray);