mirror/php-monolog
1
0
Fork 0
mirror of https://github.com/Seldaek/monolog.git synced 2025-08-08 06:06:40 +02:00
Code Issues Releases Wiki Activity

Remove unnecessary ctor init, refs #446

Browse Source
This commit is contained in:
Jordi Boggiano
2014-12-29 19:15:00 +00:00
parent 996e80d031
commit 257a1c1180
1 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/Monolog/Handler/PushoverHandler.php
View File

@@ -36,7 +36,21 @@ class PushoverHandler extends SocketHandler
* @see https://pushover.net/api * @see https://pushover.net/api
* @var array * @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 * Sounds the api supports by default
@@ -76,13 +90,6 @@ class PushoverHandler extends SocketHandler
$this->emergencyLevel = Logger::toMonologLevel($emergencyLevel); $this->emergencyLevel = Logger::toMonologLevel($emergencyLevel);
$this->retry = $retry; $this->retry = $retry;
$this->expire = $expire; $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) protected function generateDataStream($record)
@@ -116,8 +123,8 @@ class PushoverHandler extends SocketHandler
} }
// First determine the available parameters // First determine the available parameters
$context = array_intersect_key($record['context'], $this->parameters); $context = array_intersect_key($record['context'], $this->parameterNames);
$extra = array_intersect_key($record['extra'], $this->parameters); $extra = array_intersect_key($record['extra'], $this->parameterNames);
// Least important info should be merged with subsequent info // Least important info should be merged with subsequent info
$dataArray = array_merge($extra, $context, $dataArray); $dataArray = array_merge($extra, $context, $dataArray);