Skip to content

Issue #157 user id set to zero #158

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pooyaj merged 3 commits into from
Mar 3, 2021
Merged

Issue #157 user id set to zero #158

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d4f02eb
Update tests to not only eval if userId exists in the array, but that…
nd4p90x Mar 1, 2021
f2e2b6a
Update tests to not only eval if userId exists in the array, but that…
nd4p90x Mar 1, 2021
e7f82df
Merge branch 'Issue-#157-userId-set-to-zero' of github.com:North-Two-…
nd4p90x Mar 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions lib/Segment.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand All @@ -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");
}

Expand Down