From b774a7af0b6b7bae579d0a804a68502a40b7679f Mon Sep 17 00:00:00 2001 From: carcus88 Date: Thu, 7 Jan 2016 15:07:45 -0500 Subject: [PATCH 1/2] Update Reporter.php More PHP < 5.6 compatible filter --- src/Issue/Reporter.php | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/Issue/Reporter.php b/src/Issue/Reporter.php index b18020c7..27a49806 100644 --- a/src/Issue/Reporter.php +++ b/src/Issue/Reporter.php @@ -24,12 +24,14 @@ class Reporter implements \JsonSerializable public function jsonSerialize() { - return array_filter(get_object_vars($this), function ($value, $key) { - // allow empty assignee. See https://github.com/lesstif/php-jira-rest-client/issues/18 + $vars = (get_object_vars($this)); + foreach($vars as $key => $value) { if ($key === 'name' && !is_null($value)) { - return true; + continue; + }elseif(is_null($value) || $value === '') { + unset($vars[$key]); } - return !empty($value); - }, ARRAY_FILTER_USE_BOTH); + } + return $vars; } } From fbace7b975f5fbeb05e3a57517a8b4af8132dbe1 Mon Sep 17 00:00:00 2001 From: carcus88 Date: Thu, 7 Jan 2016 15:47:44 -0500 Subject: [PATCH 2/2] Update Reporter.php Should have done this check and not return a blank array --- src/Issue/Reporter.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Issue/Reporter.php b/src/Issue/Reporter.php index 27a49806..c1e0a87c 100644 --- a/src/Issue/Reporter.php +++ b/src/Issue/Reporter.php @@ -32,6 +32,9 @@ public function jsonSerialize() unset($vars[$key]); } } - return $vars; + if(empty($vars)) { + return null; + } + return $vars; } }