From ba9d57a96b3a2499599b2ca93a32f3ed955b269c Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Fri, 20 May 2016 20:14:51 +0100 Subject: [PATCH 1/2] Add extra safety --- src/Monolog/Handler/NewRelicHandler.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Monolog/Handler/NewRelicHandler.php b/src/Monolog/Handler/NewRelicHandler.php index e89684d8..6718e9e0 100644 --- a/src/Monolog/Handler/NewRelicHandler.php +++ b/src/Monolog/Handler/NewRelicHandler.php @@ -91,7 +91,7 @@ class NewRelicHandler extends AbstractProcessingHandler newrelic_notice_error($record['message']); } - if (isset($record['formatted']['context'])) { + if (isset($record['formatted']['context']) && is_array($record['formatted']['context'])) { foreach ($record['formatted']['context'] as $key => $parameter) { if (is_array($parameter) && $this->explodeArrays) { foreach ($parameter as $paramKey => $paramValue) { @@ -103,7 +103,7 @@ class NewRelicHandler extends AbstractProcessingHandler } } - if (isset($record['formatted']['extra'])) { + if (isset($record['formatted']['extra']) && is_array($record['formatted']['extra'])) { foreach ($record['formatted']['extra'] as $key => $parameter) { if (is_array($parameter) && $this->explodeArrays) { foreach ($parameter as $paramKey => $paramValue) { From 5e6b84465332b9c7596e64b35bf86aff935c2e92 Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Thu, 26 May 2016 20:27:56 +0100 Subject: [PATCH 2/2] Only fail on really empty stream URL, fixes #796 --- src/Monolog/Handler/StreamHandler.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Monolog/Handler/StreamHandler.php b/src/Monolog/Handler/StreamHandler.php index 139356c0..ccf4a979 100644 --- a/src/Monolog/Handler/StreamHandler.php +++ b/src/Monolog/Handler/StreamHandler.php @@ -81,7 +81,7 @@ class StreamHandler extends AbstractProcessingHandler protected function write(array $record) { if (!is_resource($this->stream)) { - if (!$this->url) { + if (null === $this->url || '' === $this->url) { throw new \LogicException('Missing stream url, the stream can not be opened. This may be caused by a premature call to close().'); } $this->createDir();