From d4f02eb80dac3aa999f07d348c55235802a5e232 Mon Sep 17 00:00:00 2001 From: Shane Duvall Date: Mon, 1 Mar 2021 16:09:04 -0600 Subject: [PATCH 1/2] Update tests to not only eval if userId exists in the array, but that zero ("0") is a valid userId --- lib/Segment.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/Segment.php b/lib/Segment.php index 2e1aee0..10c25d9 100644 --- a/lib/Segment.php +++ b/lib/Segment.php @@ -52,8 +52,8 @@ public static function identify(array $message) { */ public static function group(array $message) { self::checkClient(); - $groupId = !empty($message["groupId"]); - self::assert($groupId, "Segment::group() expects groupId"); + $groupId = !empty($message['groupId']); + self::assert($groupId, "Segment::group() expects a groupId"); self::validate($message, "group"); return self::$client->group($message); @@ -93,8 +93,8 @@ public static function screen(array $message) { */ public static function alias(array $message) { self::checkClient(); - $userId = !empty($message["userId"]); - $previousId = !empty($message["previousId"]); + $userId = (array_key_exists('userId', $message) && strlen((string) $message['userId']) > 0); + $previousId = (array_key_exists('previousId', $message) && strlen((string) $message['previousId']) > 0); self::assert($userId && $previousId, "Segment::alias() requires both userId and previousId"); return self::$client->alias($message); @@ -103,12 +103,12 @@ public static function alias(array $message) { /** * Validate common properties. * - * @param array $msg + * @param array $message * @param string $type */ - public static function validate($msg, $type){ - $userId = !empty($msg["userId"]); - $anonId = !empty($msg["anonymousId"]); + public static function validate($message, $type){ + $userId = (array_key_exists('userId', $message) && strlen((string) $message['userId']) > 0); + $anonId = !empty($message['anonymousId']); self::assert($userId || $anonId, "Segment::${type}() requires userId or anonymousId"); } From f2e2b6a9bbf5a6c23cec38e71ac8f2481b9e5063 Mon Sep 17 00:00:00 2001 From: Shane Duvall Date: Mon, 1 Mar 2021 16:09:04 -0600 Subject: [PATCH 2/2] Update tests to not only eval if userId exists in the array, but that zero ("0") is a valid userId --- lib/Segment.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/Segment.php b/lib/Segment.php index 2e1aee0..10c25d9 100644 --- a/lib/Segment.php +++ b/lib/Segment.php @@ -52,8 +52,8 @@ public static function identify(array $message) { */ public static function group(array $message) { self::checkClient(); - $groupId = !empty($message["groupId"]); - self::assert($groupId, "Segment::group() expects groupId"); + $groupId = !empty($message['groupId']); + self::assert($groupId, "Segment::group() expects a groupId"); self::validate($message, "group"); return self::$client->group($message); @@ -93,8 +93,8 @@ public static function screen(array $message) { */ public static function alias(array $message) { self::checkClient(); - $userId = !empty($message["userId"]); - $previousId = !empty($message["previousId"]); + $userId = (array_key_exists('userId', $message) && strlen((string) $message['userId']) > 0); + $previousId = (array_key_exists('previousId', $message) && strlen((string) $message['previousId']) > 0); self::assert($userId && $previousId, "Segment::alias() requires both userId and previousId"); return self::$client->alias($message); @@ -103,12 +103,12 @@ public static function alias(array $message) { /** * Validate common properties. * - * @param array $msg + * @param array $message * @param string $type */ - public static function validate($msg, $type){ - $userId = !empty($msg["userId"]); - $anonId = !empty($msg["anonymousId"]); + public static function validate($message, $type){ + $userId = (array_key_exists('userId', $message) && strlen((string) $message['userId']) > 0); + $anonId = !empty($message['anonymousId']); self::assert($userId || $anonId, "Segment::${type}() requires userId or anonymousId"); }