From 1107013b9c3952db74284a7640f1f78581b164c9 Mon Sep 17 00:00:00 2001 From: MilesChou Date: Tue, 24 Apr 2018 23:17:02 +0800 Subject: [PATCH 1/4] Open visibility for slack handlers --- src/Monolog/Handler/SlackHandler.php | 4 ++-- src/Monolog/Handler/SlackWebhookHandler.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Monolog/Handler/SlackHandler.php b/src/Monolog/Handler/SlackHandler.php index 3ac4d836..2c2cc4c0 100644 --- a/src/Monolog/Handler/SlackHandler.php +++ b/src/Monolog/Handler/SlackHandler.php @@ -27,13 +27,13 @@ class SlackHandler extends SocketHandler * Slack API token * @var string */ - private $token; + protected $token; /** * Instance of the SlackRecord util class preparing data for Slack API. * @var SlackRecord */ - private $slackRecord; + protected $slackRecord; /** * @param string $token Slack API token diff --git a/src/Monolog/Handler/SlackWebhookHandler.php b/src/Monolog/Handler/SlackWebhookHandler.php index 9a1bbb44..19f92cef 100644 --- a/src/Monolog/Handler/SlackWebhookHandler.php +++ b/src/Monolog/Handler/SlackWebhookHandler.php @@ -27,13 +27,13 @@ class SlackWebhookHandler extends AbstractProcessingHandler * Slack Webhook token * @var string */ - private $webhookUrl; + protected $webhookUrl; /** * Instance of the SlackRecord util class preparing data for Slack API. * @var SlackRecord */ - private $slackRecord; + protected $slackRecord; /** * @param string $webhookUrl Slack Webhook URL From 985fdb3eae0ad1085e2ccb291278d69b18d6919a Mon Sep 17 00:00:00 2001 From: MilesChou Date: Wed, 25 Apr 2018 15:51:22 +0800 Subject: [PATCH 2/4] Add getter for webhook and token property --- src/Monolog/Handler/SlackHandler.php | 9 +++++++-- src/Monolog/Handler/SlackWebhookHandler.php | 9 +++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/src/Monolog/Handler/SlackHandler.php b/src/Monolog/Handler/SlackHandler.php index 2c2cc4c0..45d634f4 100644 --- a/src/Monolog/Handler/SlackHandler.php +++ b/src/Monolog/Handler/SlackHandler.php @@ -27,13 +27,13 @@ class SlackHandler extends SocketHandler * Slack API token * @var string */ - protected $token; + private $token; /** * Instance of the SlackRecord util class preparing data for Slack API. * @var SlackRecord */ - protected $slackRecord; + private $slackRecord; /** * @param string $token Slack API token @@ -75,6 +75,11 @@ class SlackHandler extends SocketHandler return $this->slackRecord; } + public function getToken() + { + return $this->token; + } + /** * {@inheritdoc} * diff --git a/src/Monolog/Handler/SlackWebhookHandler.php b/src/Monolog/Handler/SlackWebhookHandler.php index 19f92cef..1ef85fae 100644 --- a/src/Monolog/Handler/SlackWebhookHandler.php +++ b/src/Monolog/Handler/SlackWebhookHandler.php @@ -27,13 +27,13 @@ class SlackWebhookHandler extends AbstractProcessingHandler * Slack Webhook token * @var string */ - protected $webhookUrl; + private $webhookUrl; /** * Instance of the SlackRecord util class preparing data for Slack API. * @var SlackRecord */ - protected $slackRecord; + private $slackRecord; /** * @param string $webhookUrl Slack Webhook URL @@ -70,6 +70,11 @@ class SlackWebhookHandler extends AbstractProcessingHandler return $this->slackRecord; } + public function getWebhookUrl() + { + return $this->webhookUrl; + } + /** * {@inheritdoc} * From 68e39bd84f4ba24d9bc36bd44dfaa4dfd75c5c45 Mon Sep 17 00:00:00 2001 From: George Mponos Date: Sun, 18 Mar 2018 11:30:04 +0200 Subject: [PATCH 3/4] Add a record with an object as context --- tests/Monolog/Handler/Slack/SlackRecordTest.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tests/Monolog/Handler/Slack/SlackRecordTest.php b/tests/Monolog/Handler/Slack/SlackRecordTest.php index e1aa96d7..ae42393c 100644 --- a/tests/Monolog/Handler/Slack/SlackRecordTest.php +++ b/tests/Monolog/Handler/Slack/SlackRecordTest.php @@ -353,6 +353,14 @@ class SlackRecordTest extends TestCase $this->assertSame($record['datetime']->getTimestamp(), $attachment['ts']); } + public function testContextHasException() + { + $record = $this->getRecord(Logger::CRITICAL, 'This is a critical message.', array('exception' => new \Exception())); + $slackRecord = new SlackRecord(null, null, true, null, false, true); + $data = $slackRecord->getSlackData($record); + $this->assertInternalType('string', $data['attachments'][0]['fields'][1]['value']); + } + public function testExcludeExtraAndContextFields() { $record = $this->getRecord( From 07681ea4ba6fc0cb0077110000369f638863d8e8 Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Thu, 7 Jun 2018 18:23:28 +0200 Subject: [PATCH 4/4] Fix normalization of objects in SlackRecord, closes #1127 --- src/Monolog/Handler/Slack/SlackRecord.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) mode change 100644 => 100755 src/Monolog/Handler/Slack/SlackRecord.php diff --git a/src/Monolog/Handler/Slack/SlackRecord.php b/src/Monolog/Handler/Slack/SlackRecord.php old mode 100644 new mode 100755 index 38bc838a..71b42960 --- a/src/Monolog/Handler/Slack/SlackRecord.php +++ b/src/Monolog/Handler/Slack/SlackRecord.php @@ -229,8 +229,8 @@ class SlackRecord /** * Generates attachment field * - * @param string $title - * @param string|array $value\ + * @param string $title + * @param string|array $value * * @return array */ @@ -257,7 +257,7 @@ class SlackRecord private function generateAttachmentFields(array $data) { $fields = array(); - foreach ($data as $key => $value) { + foreach ($this->normalizerFormatter->format($data) as $key => $value) { $fields[] = $this->generateAttachmentField($key, $value); }