From 01d23c0f1018ff892f0fa4fe4b67f3f75076c357 Mon Sep 17 00:00:00 2001 From: bochkovprivate Date: Sun, 19 Mar 2017 10:13:58 +0700 Subject: [PATCH] Fix 'CommitterEmail must be a string' err in bitbucket webhook --- src/PHPCensor/Controller/WebhookController.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/PHPCensor/Controller/WebhookController.php b/src/PHPCensor/Controller/WebhookController.php index 1a883ebd..d3e3c609 100644 --- a/src/PHPCensor/Controller/WebhookController.php +++ b/src/PHPCensor/Controller/WebhookController.php @@ -110,8 +110,11 @@ class WebhookController extends Controller foreach ($payload['push']['changes'] as $commit) { try { $email = $commit['new']['target']['author']['raw']; - $email = substr($email, 0, strpos($email, '>')); - $email = substr($email, strpos($email, '<') + 1); + if (strpos($email, '>') !== false) { + // In order not to loose email if it is RAW, w/o "<>" symbols + $email = substr($email, 0, strpos($email, '>')); + $email = substr($email, strpos($email, '<') + 1); + } $results[$commit['new']['target']['hash']] = $this->createBuild( $project,