Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 1 addition & 2 deletions src/Api/User/User.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,7 @@ public function current(): CurrentUserDto
*/
public function workspaceUsers(string $workspaceId): array
{
$data = $this->http->get("/workspace/$workspaceId/users");

$data = $this->http->get("/workspaces/$workspaceId/users");
return array_map(
static function(array $user): UserDto {
return UserDto::fromArray($user);
Expand Down
6 changes: 3 additions & 3 deletions src/Model/TimeEntryDtoImpl.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ public static function fromArray(array $data): self
$data['description'],
$data['id'],
$data['isLocked'],
$data['projectId'],
$data['tagIds'],
$data['taskId'],
$data['projectId'] ? $data['projectId'] : '',
$data['tagIds'] ? $data['tagIds'] : array(),
$data['taskId'] ? $data['taskId'] : '',
TimeIntervalDto::fromArray($data['timeInterval']),
$data['userId'],
$data['workspaceId']
Expand Down
8 changes: 4 additions & 4 deletions src/Model/TimeIntervalDto.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@ public static function fromArray(array $data): self
{
return new self(
new DateTimeImmutable($data['start']),
new DateTimeImmutable($data['end']),
$data['duration']
$data['end'] ? new DateTimeImmutable($data['end']) : null,
$data['duration'] ? $data['duration'] : ''
);
}

public function __construct(
DateTimeImmutable $start,
DateTimeImmutable $end,
?DateTimeImmutable $end,
string $duration
) {
$this->duration = $duration;
Expand All @@ -36,7 +36,7 @@ public function duration(): string
return $this->duration;
}

public function end(): DateTimeImmutable
public function end(): ?DateTimeImmutable
{
return $this->end;
}
Expand Down
14 changes: 7 additions & 7 deletions src/Model/UserDto.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ class UserDto
public static function fromArray(array $data): self
{
return new self(
$data['activeWorkspace'],
$data['defaultWorkspace'],
$data['activeWorkspace'] ? $data['activeWorkspace'] : '',
$data['defaultWorkspace'] ? $data['defaultWorkspace'] : '',
$data['email'],
$data['id'],
array_map(
Expand All @@ -29,9 +29,9 @@ static function(array $membership): MembershipDto {
},
$data['memberships']
),
$data['name'],
$data['profilePicture'],
UserSettingsDto::fromArray($data['settings']),
$data['name'] ? $data['name'] : '',
$data['profilePicture'] ? $data['profilePicture'] : '',
$data['settings'] ? UserSettingsDto::fromArray($data['settings']) : null,
new UserStatus($data['status'])
);
}
Expand All @@ -47,7 +47,7 @@ public function __construct(
array $memberships,
string $name,
string $profilePicture,
UserSettingsDto $settings,
?UserSettingsDto $settings,
UserStatus $status
) {
$this->activeWorkspace = $activeWorkspace;
Expand Down Expand Up @@ -99,7 +99,7 @@ public function profilePicture(): string
return $this->profilePicture;
}

public function settings(): UserSettingsDto
public function settings(): ?UserSettingsDto
{
return $this->settings;
}
Expand Down
2 changes: 2 additions & 0 deletions src/Model/UserStatus.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,13 @@
/**
* @method static ACTIVE()
* @method static PENDING_EMAIL_VERIFICATION()
* @method static NOT_REGISTERED()
* @method static DELETED()
*/
class UserStatus extends Enum
{
private const ACTIVE = 'ACTIVE';
private const PENDING_EMAIL_VERIFICATION = 'PENDING_EMAIL_VERIFICATION';
private const NOT_REGISTERED = 'NOT_REGISTERED';
private const DELETED = 'DELETED';
}