Solve merge conflicts

Author: Mike Edinger

src/Mappers/Tiers/TierMapper.php

@@ -7,11 +7,19 @@
 
 class TierMapper
 {
-    public function map(stdClass $data): Tier
+    /**
+     * @param $data
+     * @return Tier
+     */
+    public function map($data): ?Tier
     {
+        if (!$data->name) {
+            return null;
+        }
+
         return new Tier(
             $data->name,
-            $data->position,
+            $data->position ?? 0,
             $data->uuid ?? null,
             $data->description ?? null,
             $data->media ? get_object_vars($data->media) : null

src/Resources/OAuth/Tiers/TiersResource.php

@@ -31,14 +31,16 @@ public function list(array $params = []): array
     }
 
     /**
+     * @param string $contactUuid
+     * @return ?Tier
      * @throws PiggyRequestException
      */
-    public function getTierForContact(string $contactUuid): Tier
+    public function getTierForContact(string $contactUuid): ?Tier
     {
         $resourceUri = '/api/v3/oauth/clients/contacts';
 
         $response = $this->client->get("$resourceUri/$contactUuid/tier");
-
+        
         $mapper = new TierMapper();
 
         return $mapper->map($response->getData());