fix: Property getters

Author: maicol07

src/User.php

@@ -2,6 +2,8 @@
 namespace Maicol07\SSO;
 
 use GuzzleHttp\Exception\ClientException;
+use Maicol07\Flarum\Api\Resource\Collection;
+use Maicol07\Flarum\Api\Resource\Item;
 use Maicol07\SSO\User\Attributes;
 use Maicol07\SSO\User\Relationships;
 use Maicol07\SSO\User\Traits\Auth;
@@ -118,6 +120,7 @@ public function fetch(): bool
     {
         try {
             $user = $this->flarum->api->users($this->attributes->username)->request();
+            assert($user instanceof Item);
         } catch (ClientException $e) {
             if ($e->getCode() === 404 && $e->getResponse()->getReasonPhrase() === "Not Found") {
                 // User doesn't exists in Flarum
@@ -128,20 +131,22 @@ public function fetch(): bool
             throw $e;
         }
 
-        $this->id = $user->id;
+        $this->id = $user->id ?? null;
 
         // Set attributes
-        foreach ($user->attributes as $attribute => $value) {
+        foreach ($user->attributes ?? [] as $attribute => $value) {
             $this->attributes->$attribute = $value;
         }
 
+        $groups = $user->relationships['groups'] ?? [];
+
         // Admin?
-        if (array_key_exists(1, $user->relationships['groups'])) {
+        if (array_key_exists(1, $groups)) {
             $this->isAdmin = true;
         }
 
         // Set groups
-        foreach ($user->relationships['groups'] as $group) {
+        foreach ($groups as $group) {
             $this->relationships->groups[] = $group->attributes['nameSingular'];
         }
 

src/User/Attributes.php

@@ -46,9 +46,18 @@ public function __set(string $name, mixed $value): void
         $this->attrs[$name] = $value;
     }
 
-    public function __get(string $name): mixed
+    public function &__get(string $name): mixed
     {
-        return $this->dirty[$name] ?? $this->attrs[$name];
+        if (isset($this->dirty[$name])) {
+            return $this->dirty[$name];
+        }
+
+        if (isset($this->relationships[$name])) {
+            return $this->relationships[$name];
+        }
+
+        $null = null;
+        return $null;
     }
 
     public function __isset(string $name): bool

src/User/Relationships.php

@@ -2,8 +2,6 @@
 
 namespace Maicol07\SSO\User;
 
-use Maicol07\SSO\Flarum;
-
 /**
  * Class Relationships
  * @package Maicol07\SSO\User
@@ -23,9 +21,18 @@ public function __set(string $name, mixed $value): void
         $this->relationships[$name] = $value;
     }
 
-    public function __get(string $name): mixed
+    public function &__get(string $name): mixed
     {
-        return $this->dirty[$name] ?? $this->relationships[$name];
+        if (isset($this->dirty[$name])) {
+            return $this->dirty[$name];
+        }
+
+        if (isset($this->relationships[$name])) {
+            return $this->relationships[$name];
+        }
+
+        $null = null;
+        return $null;
     }
 
     public function __isset(string $name): bool
@@ -38,7 +45,7 @@ public function toArray(): array
         return $this->relationships;
     }
 
-    public function dirtyToArray(Flarum $flarum): array
+    public function dirtyToArray(): array
     {
         return $this->dirty;
     }