fix: fix bugs with phpstan and psalm (#3753)

.azure/job-analyzers.yml

@@ -16,5 +16,5 @@ jobs:
   - template: step-prepare-environment.yml
   - template: step-composer-install.yml
 
-  - script: php artisan code:analyse
+  - script: vendor/bin/phpstan analyse
     displayName: Run phpstan

.styleci.yml

@@ -4,6 +4,7 @@ enabled:
   - fully_qualified_strict_types
 disabled:
   - alpha_ordered_imports
+  - no_useless_return
 finder:
   not-name:
     - index.php

app/Console/Commands/ImportCSV.php

@@ -35,14 +35,14 @@ class ImportCSV extends Command
     /**
      * The contact field email object.
      *
-     * @var array
+     * @var int|null
      */
     public $contactFieldEmailId;
 
     /**
      * The contact field phone object.
      *
-     * @var array
+     * @var int|null
      */
     public $contactFieldPhoneId;
 

app/Exceptions/Handler.php

@@ -78,13 +78,4 @@ class Handler extends ExceptionHandler
 
         return parent::render($request, $e);
     }
-
-    protected function whoopsHandler()
-    {
-        try {
-            return app(\Whoops\Handler\HandlerInterface::class);
-        } catch (\Illuminate\Contracts\Container\BindingResolutionException $e) {
-            return parent::whoopsHandler();
-        }
-    }
 }

app/Helpers/DateHelper.php

@@ -90,7 +90,7 @@ class DateHelper
             $date = $date->date;
         }
         if (! $date instanceof Carbon) {
-            $date = Carbon::create($date);
+            $date = Carbon::parse($date);
         }
 
         return $date->translatedFormat(config('api.timestamp_format'));
@@ -111,7 +111,7 @@ class DateHelper
             $date = $date->date;
         }
         if (! $date instanceof Carbon) {
-            $date = Carbon::create($date);
+            $date = Carbon::parse($date);
         }
 
         return $date->translatedFormat(config('api.date_timestamp_format'));
@@ -122,11 +122,9 @@ class DateHelper
      *
      * @return string|null
      */
-    public static function getTimezone()
+    public static function getTimezone(): ?string
     {
-        if (Auth::check()) {
-            return Auth::user()->timezone;
-        }
+        return Auth::check() ? Auth::user()->timezone : null;
     }
 
     /**

app/Helpers/LocaleHelper.php

@@ -72,7 +72,7 @@ class LocaleHelper
      *
      * @return string|null  country, uppercase form.
      */
-    public static function extractCountry($locale = null)
+    public static function extractCountry($locale = null): ?string
     {
         if (is_null($locale)) {
             $locale = App::getLocale();
@@ -82,6 +82,8 @@ class LocaleHelper
 
             return mb_strtoupper($locale);
         }
+
+        return null;
     }
 
     /**

app/Helpers/RequestHelper.php

@@ -35,13 +35,11 @@ class RequestHelper
      * @param string $ip
      * @return string|null
      */
-    public static function country($ip)
+    public static function country($ip): ?string
     {
         $position = Location::get($ip);
 
-        if ($position) {
-            return $position->countryCode;
-        }
+        return $position ? $position->countryCode : null;
     }
 
     /**

app/Helpers/TimezoneHelper.php

@@ -18,6 +18,7 @@ class TimezoneHelper
         $list = [];
         $timezones = DateTimeZone::listIdentifiers();
 
+        if ($timezones !== false) {
             foreach ($timezones as $timezone) {
                 [$tz, $name] = self::formatTimezone($timezone);
                 array_push($list, [
@@ -26,6 +27,7 @@ class TimezoneHelper
                     'name' => $name,
                 ]);
             }
+        }
 
         $collect = collect($list)
             ->groupBy('id')

app/Helpers/VCardHelper.php

@@ -13,17 +13,16 @@ class VCardHelper
      * @param VCard $vCard
      * @return string|null
      */
-    public static function getCountryISOFromSabreVCard(VCard $vCard)
+    public static function getCountryISOFromSabreVCard(VCard $vCard): ?string
     {
         $vCardAddress = $vCard->ADR;
 
         if (empty($vCardAddress)) {
-            return;
+            return null;
         }
 
         $country = Arr::get($vCardAddress->getParts(), '6');
-        if (! empty($country)) {
-            return CountriesHelper::find($country);
-        }
+
+        return empty($country) ? null : CountriesHelper::find($country);
     }
 }

app/Helpers/helpers.php

@@ -2,6 +2,7 @@
 
 use App\Helpers\LocaleHelper;
 use Illuminate\Support\Facades\Storage;
+use League\Flysystem\Adapter\AbstractAdapter;
 
 if (! function_exists('htmldir')) {
     /**
@@ -21,9 +22,9 @@ if (! function_exists('disk_adapter')) {
      * Get the adapter for a disk.
      *
      * @param  string|null  $disk
-     * @return \League\Flysystem\Adapter\AbstractAdapter
+     * @return \League\Flysystem\Adapter\AbstractAdapter|null
      */
-    function disk_adapter($disk = null)
+    function disk_adapter($disk = null): ?AbstractAdapter
     {
         $driver = Storage::disk($disk)->getDriver();
         if ($driver instanceof \League\Flysystem\Filesystem) {
@@ -32,5 +33,7 @@ if (! function_exists('disk_adapter')) {
                 return $adapter;
             }
         }
+
+        return null;
     }
 }

app/Http/Controllers/Api/Auth/OAuthController.php

@@ -86,6 +86,8 @@ class OAuthController extends Controller
 
             return Route::respondWithRoute('oauth.verify');
         }
+
+        return;
     }
 
     /**
@@ -188,6 +190,7 @@ class OAuthController extends Controller
     private function proxy(array $data = []): array
     {
         $url = App::runningUnitTests() ? config('app.url').'/oauth/token' : route('passport.token');
+        /** @var \Illuminate\Http\Response */
         $response = app(Kernel::class)->handle(Request::create($url, 'POST', [
             'grant_type' => $data['grantType'],
             'client_id' => config('monica.mobile_client_id'),

app/Http/Controllers/Auth/PasswordChangeController.php

@@ -61,7 +61,7 @@ class PasswordChangeController extends Controller
             return $user;
         }
 
-        if ($user instanceof Authenticatable) {
+        if ($user instanceof User) {
             $this->setNewPassword($user, $credentials['password']);
         }
 

app/Http/Controllers/Contacts/CallsController.php

@@ -90,5 +90,7 @@ class CallsController extends Controller
         } catch (\Exception $e) {
             return $this->respondNotFound();
         }
+
+        return;
     }
 }

app/Http/Controllers/Contacts/DocumentsController.php

@@ -63,9 +63,13 @@ class DocumentsController extends Controller
         ];
 
         try {
-            app(DestroyDocument::class)->execute($data);
+            if (app(DestroyDocument::class)->execute($data)) {
+                return $this->respondObjectDeleted($document->id);
+            }
         } catch (\Exception $e) {
             return $this->respondNotFound();
         }
+
+        return;
     }
 }

app/Http/Controllers/Contacts/PhotosController.php

@@ -81,5 +81,7 @@ class PhotosController extends Controller
                 'source' => 'adorable',
             ]);
         }
+
+        return $this->respondObjectDeleted($photo->id);
     }
 }

app/Http/Controllers/DAV/Backend/CalDAV/CalDAVBackend.php

@@ -128,6 +128,8 @@ class CalDAVBackend extends AbstractBackend implements SyncSupport
         if ($backend) {
             return $backend->getChanges($syncToken);
         }
+
+        return [];
     }
 
     /**
@@ -176,6 +178,8 @@ class CalDAVBackend extends AbstractBackend implements SyncSupport
                 })
                 ->toArray();
         }
+
+        return [];
     }
 
     /**
@@ -204,6 +208,8 @@ class CalDAVBackend extends AbstractBackend implements SyncSupport
                 return $backend->prepareData($obj);
             }
         }
+
+        return [];
     }
 
     /**
@@ -247,12 +253,13 @@ class CalDAVBackend extends AbstractBackend implements SyncSupport
      * @param string $calendarData
      * @return string|null
      */
-    public function updateCalendarObject($calendarId, $objectUri, $calendarData)
+    public function updateCalendarObject($calendarId, $objectUri, $calendarData): ?string
     {
         $backend = $this->getBackend($calendarId);
-        if ($backend) {
-            return $backend->updateOrCreateCalendarObject($objectUri, $calendarData);
-        }
+
+        return $backend ?
+            $backend->updateOrCreateCalendarObject($objectUri, $calendarData)
+            : null;
     }
 
     /**

app/Http/Controllers/DAV/Backend/CalDAV/CalDAVBirthdays.php

@@ -76,6 +76,8 @@ class CalDAVBirthdays extends AbstractCalDAVBackend
                 Log::debug(__CLASS__.' prepareData: '.(string) $e);
             }
         }
+
+        return [];
     }
 
     private function hasBirthday($contact)
@@ -126,8 +128,12 @@ class CalDAVBirthdays extends AbstractCalDAVBackend
         });
     }
 
-    public function updateOrCreateCalendarObject($objectUri, $calendarData)
+    /**
+     * @return string|null
+     */
+    public function updateOrCreateCalendarObject($objectUri, $calendarData): ?string
     {
+        return null;
     }
 
     public function deleteCalendarObject($objectUri)

app/Http/Controllers/DAV/Backend/CalDAV/CalDAVTasks.php

@@ -102,6 +102,8 @@ class CalDAVTasks extends AbstractCalDAVBackend
                 Log::debug(__CLASS__.' prepareData: '.(string) $e);
             }
         }
+
+        return [];
     }
 
     /**
@@ -121,7 +123,7 @@ class CalDAVTasks extends AbstractCalDAVBackend
      * @param string $calendarData
      * @return string|null
      */
-    public function updateOrCreateCalendarObject($objectUri, $calendarData)
+    public function updateOrCreateCalendarObject($objectUri, $calendarData): ?string
     {
         $task_id = null;
         if ($objectUri) {
@@ -151,6 +153,8 @@ class CalDAVTasks extends AbstractCalDAVBackend
         } catch (\Exception $e) {
             Log::debug(__CLASS__.' updateOrCreateCalendarObject: '.(string) $e);
         }
+
+        return null;
     }
 
     /**

app/Http/Controllers/DAV/Backend/CalDAV/ICalDAVBackend.php

@@ -102,7 +102,7 @@ interface ICalDAVBackend
      * @param string $calendarData
      * @return string|null
      */
-    public function updateOrCreateCalendarObject($objectUri, $calendarData);
+    public function updateOrCreateCalendarObject($objectUri, $calendarData): ?string;
 
     /**
      * Deletes an existing calendar object.

app/Http/Controllers/DAV/Backend/CardDAV/AddressBook.php

@@ -74,5 +74,7 @@ class AddressBook extends BaseAddressBook
                 return $date->timestamp;
             }
         }
+
+        return;
     }
 }

app/Http/Controllers/DAV/Backend/CardDAV/CardDAVBackend.php

@@ -159,9 +159,9 @@ class CardDAVBackend extends AbstractBackend implements SyncSupport, IDAVBackend
      * Prepare datas for this contact.
      *
      * @param Contact $contact
-     * @return array|null
+     * @return array
      */
-    private function prepareCard($contact)
+    private function prepareCard($contact): array
     {
         try {
             $vcard = app(ExportVCard::class)
@@ -351,6 +351,8 @@ class CardDAVBackend extends AbstractBackend implements SyncSupport, IDAVBackend
             Log::debug(__CLASS__.' updateCard: '.(string) $e);
             throw $e;
         }
+
+        return;
     }
 
     /**
@@ -381,7 +383,7 @@ class CardDAVBackend extends AbstractBackend implements SyncSupport, IDAVBackend
      * @param \Sabre\DAV\PropPatch $propPatch
      * @return bool|null
      */
-    public function updateAddressBook($addressBookId, DAV\PropPatch $propPatch)
+    public function updateAddressBook($addressBookId, DAV\PropPatch $propPatch): ?bool
     {
         $propPatch->handle('{'.CalDAVPlugin::NS_CALENDARSERVER.'}me-card', function ($props) {
             $contact = $this->getObject($props->getHref());
@@ -396,6 +398,8 @@ class CardDAVBackend extends AbstractBackend implements SyncSupport, IDAVBackend
 
             return true;
         });
+
+        return null;
     }
 
     /**

app/Http/Controllers/DAV/Backend/SyncDAVBackend.php

@@ -64,14 +64,14 @@ trait SyncDAVBackend
     {
         $max = $this->getLastModified();
 
-        if ($max) {
-            return SyncToken::create([
+        return $max ?
+            SyncToken::create([
                 'account_id' => Auth::user()->account_id,
                 'user_id' => Auth::user()->id,
                 'name' => $this->backendUri(),
                 'timestamp' => $max,
-            ]);
-        }
+            ])
+            : null;
     }
 
     /**

app/Http/Controllers/DAV/DAVACL/PrincipalBackend.php

@@ -78,6 +78,8 @@ class PrincipalBackend extends AbstractBackend
                 return $principal;
             }
         }
+
+        return [];
     }
 
     /**

app/Http/Controllers/JournalController.php

@@ -39,7 +39,7 @@ class JournalController extends Controller
         $previousEntryYear = 0;
         $showCalendar = true;
 
-        foreach ($journalEntries as $journalEntry) {
+        foreach ($journalEntries->items() as $journalEntry) {
             if ($previousEntryMonth == $journalEntry->date->month && $previousEntryYear == $journalEntry->date->year) {
                 $showCalendar = false;
             }

app/Http/Controllers/SettingsController.php

@@ -146,7 +146,7 @@ class SettingsController
                 ->withErrors($e->getMessage());
         }
 
-        auth()->logout();
+        auth('')->logout();
 
         return redirect()->route('login');
     }

app/Http/Controllers/TasksController.php

@@ -68,11 +68,17 @@ class TasksController extends Controller
      */
     public function destroy(Task $task)
     {
+        try {
             if (app(DestroyTask::class)->execute([
                 'task_id' => $task->id,
                 'account_id' => auth()->user()->account_id,
             ])) {
                 return $this->respondObjectDeleted($task->id);
             }
+        } catch (\Exception $e) {
+            return $this->respondNotFound();
+        }
+
+        return;
     }
 }

app/Http/Middleware/Authenticate.php

@@ -17,5 +17,7 @@ class Authenticate extends Middleware
         if (! $request->expectsJson()) {
             return route('login');
         }
+
+        return '';
     }
 }

app/Http/Middleware/AuthenticateWithTokenOnBasicAuth.php

@@ -69,7 +69,7 @@ class AuthenticateWithTokenOnBasicAuth
             $user = $guard->setRequest($request)->user();
         }
 
-        if ($user && (! $request->getUser() || $request->getUser() === $user->email)) {
+        if ($user && (! $request->getUser() || (property_exists($user, 'email') && $request->getUser() === $user->email))) {
             $this->auth->guard()->setUser($user);
         } else {
             // Basic authentication

app/Http/Resources/Account/User/User.php

@@ -3,11 +3,14 @@
 namespace App\Http\Resources\Account\User;
 
 use App\Helpers\DateHelper;
-use Illuminate\Http\Resources\Json\Resource;
+use Illuminate\Http\Resources\Json\JsonResource;
 use App\Http\Resources\Contact\ContactShort as ContactShortResource;
 use App\Http\Resources\Settings\Currency\Currency as CurrencyResource;
 
-class User extends Resource
+/**
+ * @extends JsonResource<\App\Models\User\User>
+ */
+class User extends JsonResource
 {
     /**
      * Transform the resource into an array.

app/Http/Resources/Activity/Activity.php

@@ -3,11 +3,14 @@
 namespace App\Http\Resources\Activity;
 
 use App\Helpers\DateHelper;
-use Illuminate\Http\Resources\Json\Resource;
+use Illuminate\Http\Resources\Json\JsonResource;
 use App\Http\Resources\Emotion\Emotion as EmotionResource;
 use App\Http\Resources\Activity\ActivityType as ActivityTypeResource;
 
-class Activity extends Resource
+/**
+ * @extends JsonResource<\App\Models\Account\Activity>
+ */
+class Activity extends JsonResource
 {
     /**
      * Transform the resource into an array.

app/Http/Resources/Activity/ActivityCollection.php

@@ -1,24 +0,0 @@
-<?php
-
-namespace App\Http\Resources\Activity;
-
-use Illuminate\Http\Resources\Json\ResourceCollection;
-
-class ActivityCollection extends ResourceCollection
-{
-    /**
-     * Transform the resource collection into an array.
-     *
-     * @param  \Illuminate\Http\Request $request
-     * @return array
-     */
-    public function toArray($request)
-    {
-        return [
-            'data' => $this->collection,
-            'links' => [
-                'self' => 'link-value',
-            ],
-        ];
-    }
-}

app/Http/Resources/Activity/ActivityType.php

@@ -3,10 +3,13 @@
 namespace App\Http\Resources\Activity;
 
 use App\Helpers\DateHelper;
-use Illuminate\Http\Resources\Json\Resource;
+use Illuminate\Http\Resources\Json\JsonResource;
 use App\Http\Resources\Activity\ActivityTypeCategory as ActivityTypeCategoryResource;
 
-class ActivityType extends Resource
+/**
+ * @extends JsonResource<\App\Models\Account\ActivityType>
+ */
+class ActivityType extends JsonResource
 {
     /**
      * Transform the resource into an array.

app/Http/Resources/Activity/ActivityTypeCategory.php

@@ -3,9 +3,12 @@
 namespace App\Http\Resources\Activity;
 
 use App\Helpers\DateHelper;
-use Illuminate\Http\Resources\Json\Resource;
+use Illuminate\Http\Resources\Json\JsonResource;
 
-class ActivityTypeCategory extends Resource
+/**
+ * @extends JsonResource<\App\Models\Account\ActivityTypeCategory>
+ */
+class ActivityTypeCategory extends JsonResource
 {
     /**
      * Transform the resource into an array.

app/Http/Resources/Activity/ActivityTypeCategoryCollection.php

@@ -1,24 +0,0 @@
-<?php
-
-namespace App\Http\Resources\Activity;
-
-use Illuminate\Http\Resources\Json\ResourceCollection;
-
-class ActivityTypeCategoryCollection extends ResourceCollection
-{
-    /**
-     * Transform the resource collection into an array.
-     *
-     * @param  \Illuminate\Http\Request $request
-     * @return array
-     */
-    public function toArray($request)
-    {
-        return [
-            'data' => $this->collection,
-            'links' => [
-                'self' => 'link-value',
-            ],
-        ];
-    }
-}

app/Http/Resources/Activity/ActivityTypeCollection.php

@@ -1,24 +0,0 @@
-<?php
-
-namespace App\Http\Resources\Activity;
-
-use Illuminate\Http\Resources\Json\ResourceCollection;
-
-class ActivityTypeCollection extends ResourceCollection
-{
-    /**
-     * Transform the resource collection into an array.
-     *
-     * @param  \Illuminate\Http\Request $request
-     * @return array
-     */
-    public function toArray($request)
-    {
-        return [
-            'data' => $this->collection,
-            'links' => [
-                'self' => 'link-value',
-            ],
-        ];
-    }
-}

app/Http/Resources/Address/Address.php

@@ -3,11 +3,14 @@
 namespace App\Http\Resources\Address;
 
 use App\Helpers\DateHelper;
-use Illuminate\Http\Resources\Json\Resource;
+use Illuminate\Http\Resources\Json\JsonResource;
 use App\Http\Resources\Country\Country as CountryResource;
 use App\Http\Resources\Contact\ContactShort as ContactShortResource;
 
-class Address extends Resource
+/**
+ * @extends JsonResource<\App\Models\Contact\Address>
+ */
+class Address extends JsonResource
 {
     /**
      * Transform the resource into an array.

app/Http/Resources/Address/AddressCollection.php

@@ -1,24 +0,0 @@
-<?php
-
-namespace App\Http\Resources\Address;
-
-use Illuminate\Http\Resources\Json\ResourceCollection;
-
-class AddressCollection extends ResourceCollection
-{
-    /**
-     * Transform the resource collection into an array.
-     *
-     * @param  \Illuminate\Http\Request $request
-     * @return array
-     */
-    public function toArray($request)
-    {
-        return [
-            'data' => $this->collection,
-            'links' => [
-                'self' => 'link-value',
-            ],
-        ];
-    }
-}

app/Http/Resources/Auditlog/AuditLog.php

@@ -4,9 +4,12 @@ namespace App\Http\Resources\AuditLog;
 
 use App\Helpers\DateHelper;
 use function Safe\json_decode;
-use Illuminate\Http\Resources\Json\Resource;
+use Illuminate\Http\Resources\Json\JsonResource;
 
-class AuditLog extends Resource
+/**
+ * @extends JsonResource<\App\Models\Instance\AuditLog>
+ */
+class AuditLog extends JsonResource
 {
     /**
      * Transform the resource into an array.
@@ -20,8 +23,8 @@ class AuditLog extends Resource
             'id' => $this->id,
             'object' => 'auditlog',
             'author' => ($this->author) ? [
-                'id' => $this->id,
-                'name' => $this->name,
+                'id' => $this->author->id,
+                'name' => $this->author->name,
             ] : [
                 'name' => $this->author_name,
             ],

app/Http/Resources/Auditlog/AuditLogCollection.php

@@ -1,24 +0,0 @@
-<?php
-
-namespace App\Http\Resources\Auditlog;
-
-use Illuminate\Http\Resources\Json\ResourceCollection;
-
-class AuditLogCollection extends ResourceCollection
-{
-    /**
-     * Transform the resource collection into an array.
-     *
-     * @param  \Illuminate\Http\Request $request
-     * @return array
-     */
-    public function toArray($request)
-    {
-        return [
-            'data' => $this->collection,
-            'links' => [
-                'self' => 'link-value',
-            ],
-        ];
-    }
-}

app/Http/Resources/Call/Call.php

@@ -3,11 +3,14 @@
 namespace App\Http\Resources\Call;
 
 use App\Helpers\DateHelper;
-use Illuminate\Http\Resources\Json\Resource;
+use Illuminate\Http\Resources\Json\JsonResource;
 use App\Http\Resources\Emotion\Emotion as EmotionResource;
 use App\Http\Resources\Contact\ContactShort as ContactShortResource;
 
-class Call extends Resource
+/**
+ * @extends JsonResource<\App\Models\Contact\Call>
+ */
+class Call extends JsonResource
 {
     /**
      * Transform the resource into an array.

app/Http/Resources/Call/CallCollection.php

@@ -1,24 +0,0 @@
-<?php
-
-namespace App\Http\Resources\Call;
-
-use Illuminate\Http\Resources\Json\ResourceCollection;
-
-class CallCollection extends ResourceCollection
-{
-    /**
-     * Transform the resource collection into an array.
-     *
-     * @param  \Illuminate\Http\Request $request
-     * @return array
-     */
-    public function toArray($request)
-    {
-        return [
-            'data' => $this->collection,
-            'links' => [
-                'self' => 'link-value',
-            ],
-        ];
-    }
-}

app/Http/Resources/Company/Company.php

@@ -3,9 +3,12 @@
 namespace App\Http\Resources\Company;
 
 use App\Helpers\DateHelper;
-use Illuminate\Http\Resources\Json\Resource;
+use Illuminate\Http\Resources\Json\JsonResource;
 
-class Company extends Resource
+/**
+ * @extends JsonResource<\App\Models\Account\Company>
+ */
+class Company extends JsonResource
 {
     /**
      * Transform the resource into an array.

app/Http/Resources/Company/CompanyCollection.php

@@ -1,24 +0,0 @@
-<?php
-
-namespace App\Http\Resources\Company;
-
-use Illuminate\Http\Resources\Json\ResourceCollection;
-
-class CompanyCollection extends ResourceCollection
-{
-    /**
-     * Transform the resource collection into an array.
-     *
-     * @param  \Illuminate\Http\Request $request
-     * @return array
-     */
-    public function toArray($request)
-    {
-        return [
-            'data' => $this->collection,
-            'links' => [
-                'self' => 'link-value',
-            ],
-        ];
-    }
-}

app/Http/Resources/Contact/Contact.php

@@ -2,17 +2,15 @@
 
 namespace App\Http\Resources\Contact;
 
-use App\Helpers\DateHelper;
-use Illuminate\Http\Resources\Json\Resource;
-use App\Http\Resources\Tag\Tag as TagResource;
-use App\Http\Resources\Note\Note as NoteResource;
-use App\Http\Resources\Address\Address as AddressResource;
-use App\Http\Resources\Contact\ContactShort as ContactShortResource;
-use App\Http\Resources\ContactField\ContactField as ContactFieldResource;
-use App\Http\Resources\Relationship\RelationshipShort as RelationshipShortResource;
+use Illuminate\Http\Resources\Json\JsonResource;
 
-class Contact extends Resource
+/**
+ * @extends JsonResource<\App\Models\Contact\Contact>
+ */
+class Contact extends JsonResource
 {
+    use ContactBase;
+
     /**
      * Transform the resource into an array.
      *
@@ -23,115 +21,4 @@ class Contact extends Resource
     {
         return $this->toArrayInternal($request, $request->input('with') == 'contactfields');
     }
-
-    protected function toArrayInternal($request, $withContactField)
-    {
-        return [
-            'id' => $this->id,
-            'object' => 'contact',
-            'hash_id' => $this->getHashId(),
-            'first_name' => $this->first_name,
-            'last_name' => $this->last_name,
-            'nickname' => $this->nickname,
-            'complete_name' => $this->name,
-            'initials' => $this->getInitials(),
-            'description' => $this->description,
-            'gender' => is_null($this->gender) ? null : $this->gender->name,
-            'gender_type' => is_null($this->gender) ? null : $this->gender->type,
-            'is_starred' => (bool) $this->is_starred,
-            'is_partial' => (bool) $this->is_partial,
-            'is_active' => (bool) $this->is_active,
-            'is_dead' => (bool) $this->is_dead,
-            'is_me' => $this->isMe(),
-            'last_called' => $this->when(! $this->is_partial, $this->last_talked_to),
-            'last_activity_together' => $this->when(! $this->is_partial, $this->getLastActivityDate()),
-            'stay_in_touch_frequency' => $this->when(! $this->is_partial, $this->stay_in_touch_frequency),
-            'stay_in_touch_trigger_date' => $this->when(! $this->is_partial, DateHelper::getTimestamp($this->stay_in_touch_trigger_date)),
-            'information' => [
-                'relationships' => $this->when(! $this->is_partial, [
-                    'love' => [
-                        'total' => (is_null($this->getRelationshipsByRelationshipTypeGroup('love')) ? 0 : $this->getRelationshipsByRelationshipTypeGroup('love')->count()),
-                        'contacts' => (is_null($this->getRelationshipsByRelationshipTypeGroup('love')) ? null : RelationshipShortResource::collection($this->getRelationshipsByRelationshipTypeGroup('love'))),
-                    ],
-                    'family' => [
-                        'total' => (is_null($this->getRelationshipsByRelationshipTypeGroup('family')) ? 0 : $this->getRelationshipsByRelationshipTypeGroup('family')->count()),
-                        'contacts' => (is_null($this->getRelationshipsByRelationshipTypeGroup('family')) ? null : RelationshipShortResource::collection($this->getRelationshipsByRelationshipTypeGroup('family'))),
-                    ],
-                    'friend' => [
-                        'total' => (is_null($this->getRelationshipsByRelationshipTypeGroup('friend')) ? 0 : $this->getRelationshipsByRelationshipTypeGroup('friend')->count()),
-                        'contacts' => (is_null($this->getRelationshipsByRelationshipTypeGroup('friend')) ? null : RelationshipShortResource::collection($this->getRelationshipsByRelationshipTypeGroup('friend'))),
-                    ],
-                    'work' => [
-                        'total' => (is_null($this->getRelationshipsByRelationshipTypeGroup('work')) ? 0 : $this->getRelationshipsByRelationshipTypeGroup('work')->count()),
-                        'contacts' => (is_null($this->getRelationshipsByRelationshipTypeGroup('work')) ? null : RelationshipShortResource::collection($this->getRelationshipsByRelationshipTypeGroup('work'))),
-                    ],
-                ]),
-                'dates' => [
-                    'birthdate' => [
-                        'is_age_based' => (is_null($this->birthdate) ? null : (bool) $this->birthdate->is_age_based),
-                        'is_year_unknown' => (is_null($this->birthdate) ? null : (bool) $this->birthdate->is_year_unknown),
-                        'date' => DateHelper::getTimestamp($this->birthdate),
-                    ],
-                    'deceased_date' => [
-                        'is_age_based' => (is_null($this->deceasedDate) ? null : (bool) $this->deceasedDate->is_age_based),
-                        'is_year_unknown' => (is_null($this->deceasedDate) ? null : (bool) $this->deceasedDate->is_year_unknown),
-                        'date' => DateHelper::getTimestamp($this->deceasedDate),
-                    ],
-                ],
-                'career' => $this->when(! $this->is_partial, [
-                    'job' => $this->job,
-                    'company' => $this->company,
-                ]),
-                'avatar' => $this->when(! $this->is_partial, [
-                    'url' => $this->getAvatarUrl(),
-                    'source' => $this->avatar_source,
-                    'default_avatar_color' => $this->default_avatar_color,
-                ]),
-                'food_preferences' => $this->when(! $this->is_partial, $this->food_preferences),
-                'how_you_met' => $this->when(! $this->is_partial, [
-                    'general_information' => $this->first_met_additional_info,
-                    'first_met_date' => [
-                        'is_age_based' => (is_null($this->firstMetDate) ? null : (bool) $this->firstMetDate->is_age_based),
-                        'is_year_unknown' => (is_null($this->firstMetDate) ? null : (bool) $this->firstMetDate->is_year_unknown),
-                        'date' => DateHelper::getTimestamp($this->firstMetDate),
-                    ],
-                    'first_met_through_contact' => new ContactShortResource($this->getIntroducer()),
-                ]),
-            ],
-            'addresses' => $this->when(! $this->is_partial, AddressResource::collection($this->addresses)),
-            'tags' => $this->when(! $this->is_partial, TagResource::collection($this->tags)),
-            'statistics' => $this->when(! $this->is_partial, [
-                'number_of_calls' => $this->calls->count(),
-                'number_of_notes' => $this->notes->count(),
-                'number_of_activities' => $this->activities->count(),
-                'number_of_reminders' => $this->reminders->count(),
-                'number_of_tasks' => $this->tasks->count(),
-                'number_of_gifts' => $this->gifts->count(),
-                'number_of_debts' => $this->debts->count(),
-            ]),
-            'contactFields' => $this->when($withContactField && ! $this->is_partial, ContactFieldResource::collection($this->contactFields)),
-            'notes' => $this->when($withContactField && ! $this->is_partial, NoteResource::collection($this->notes()->latest()->limit(3)->get())),
-            'url' => $this->when(! $this->is_partial, route('api.contact', $this->id)),
-            'account' => [
-                'id' => $this->account_id,
-            ],
-            'created_at' => DateHelper::getTimestamp($this->created_at),
-            'updated_at' => DateHelper::getTimestamp($this->updated_at),
-        ];
-    }
-
-    protected function getHashId()
-    {
-        $hashid = '';
-        if ($this->is_partial) {
-            $realContact = $this->getRelatedRealContact();
-            if ($realContact) {
-                $hashid = $realContact->hashID();
-            }
-        } else {
-            $hashid = $this->hashID();
-        }
-
-        return $hashid;
-    }
 }

app/Http/Resources/Contact/ContactBase.php

@@ -0,0 +1,125 @@
+<?php
+
+namespace App\Http\Resources\Contact;
+
+use App\Helpers\DateHelper;
+use App\Http\Resources\Tag\Tag as TagResource;
+use App\Http\Resources\Note\Note as NoteResource;
+use App\Http\Resources\Address\Address as AddressResource;
+use App\Http\Resources\Contact\ContactShort as ContactShortResource;
+use App\Http\Resources\ContactField\ContactField as ContactFieldResource;
+use App\Http\Resources\Relationship\RelationshipShort as RelationshipShortResource;
+
+trait ContactBase
+{
+    protected function toArrayInternal($request, $withContactField)
+    {
+        return [
+            'id' => $this->id,
+            'object' => 'contact',
+            'hash_id' => $this->getHashId(),
+            'first_name' => $this->first_name,
+            'last_name' => $this->last_name,
+            'nickname' => $this->nickname,
+            'complete_name' => $this->name,
+            'initials' => $this->getInitials(),
+            'description' => $this->description,
+            'gender' => is_null($this->gender) ? null : $this->gender->name,
+            'gender_type' => is_null($this->gender) ? null : $this->gender->type,
+            'is_starred' => (bool) $this->is_starred,
+            'is_partial' => (bool) $this->is_partial,
+            'is_active' => (bool) $this->is_active,
+            'is_dead' => (bool) $this->is_dead,
+            'is_me' => $this->isMe(),
+            'last_called' => $this->when(! $this->is_partial, $this->last_talked_to),
+            'last_activity_together' => $this->when(! $this->is_partial, $this->getLastActivityDate()),
+            'stay_in_touch_frequency' => $this->when(! $this->is_partial, $this->stay_in_touch_frequency),
+            'stay_in_touch_trigger_date' => $this->when(! $this->is_partial, DateHelper::getTimestamp($this->stay_in_touch_trigger_date)),
+            'information' => [
+                'relationships' => $this->when(! $this->is_partial, [
+                    'love' => [
+                        'total' => (is_null($this->getRelationshipsByRelationshipTypeGroup('love')) ? 0 : $this->getRelationshipsByRelationshipTypeGroup('love')->count()),
+                        'contacts' => (is_null($this->getRelationshipsByRelationshipTypeGroup('love')) ? null : RelationshipShortResource::collection($this->getRelationshipsByRelationshipTypeGroup('love'))),
+                    ],
+                    'family' => [
+                        'total' => (is_null($this->getRelationshipsByRelationshipTypeGroup('family')) ? 0 : $this->getRelationshipsByRelationshipTypeGroup('family')->count()),
+                        'contacts' => (is_null($this->getRelationshipsByRelationshipTypeGroup('family')) ? null : RelationshipShortResource::collection($this->getRelationshipsByRelationshipTypeGroup('family'))),
+                    ],
+                    'friend' => [
+                        'total' => (is_null($this->getRelationshipsByRelationshipTypeGroup('friend')) ? 0 : $this->getRelationshipsByRelationshipTypeGroup('friend')->count()),
+                        'contacts' => (is_null($this->getRelationshipsByRelationshipTypeGroup('friend')) ? null : RelationshipShortResource::collection($this->getRelationshipsByRelationshipTypeGroup('friend'))),
+                    ],
+                    'work' => [
+                        'total' => (is_null($this->getRelationshipsByRelationshipTypeGroup('work')) ? 0 : $this->getRelationshipsByRelationshipTypeGroup('work')->count()),
+                        'contacts' => (is_null($this->getRelationshipsByRelationshipTypeGroup('work')) ? null : RelationshipShortResource::collection($this->getRelationshipsByRelationshipTypeGroup('work'))),
+                    ],
+                ]),
+                'dates' => [
+                    'birthdate' => [
+                        'is_age_based' => (is_null($this->birthdate) ? null : (bool) $this->birthdate->is_age_based),
+                        'is_year_unknown' => (is_null($this->birthdate) ? null : (bool) $this->birthdate->is_year_unknown),
+                        'date' => DateHelper::getTimestamp($this->birthdate),
+                    ],
+                    'deceased_date' => [
+                        'is_age_based' => (is_null($this->deceasedDate) ? null : (bool) $this->deceasedDate->is_age_based),
+                        'is_year_unknown' => (is_null($this->deceasedDate) ? null : (bool) $this->deceasedDate->is_year_unknown),
+                        'date' => DateHelper::getTimestamp($this->deceasedDate),
+                    ],
+                ],
+                'career' => $this->when(! $this->is_partial, [
+                    'job' => $this->job,
+                    'company' => $this->company,
+                ]),
+                'avatar' => $this->when(! $this->is_partial, [
+                    'url' => $this->getAvatarUrl(),
+                    'source' => $this->avatar_source,
+                    'default_avatar_color' => $this->default_avatar_color,
+                ]),
+                'food_preferences' => $this->when(! $this->is_partial, $this->food_preferences),
+                'how_you_met' => $this->when(! $this->is_partial, [
+                    'general_information' => $this->first_met_additional_info,
+                    'first_met_date' => [
+                        'is_age_based' => (is_null($this->firstMetDate) ? null : (bool) $this->firstMetDate->is_age_based),
+                        'is_year_unknown' => (is_null($this->firstMetDate) ? null : (bool) $this->firstMetDate->is_year_unknown),
+                        'date' => DateHelper::getTimestamp($this->firstMetDate),
+                    ],
+                    'first_met_through_contact' => new ContactShortResource($this->getIntroducer()),
+                ]),
+            ],
+            'addresses' => $this->when(! $this->is_partial, AddressResource::collection($this->addresses)),
+            'tags' => $this->when(! $this->is_partial, TagResource::collection($this->tags)),
+            'statistics' => $this->when(! $this->is_partial, [
+                'number_of_calls' => $this->calls->count(),
+                'number_of_notes' => $this->notes->count(),
+                'number_of_activities' => $this->activities->count(),
+                'number_of_reminders' => $this->reminders->count(),
+                'number_of_tasks' => $this->tasks->count(),
+                'number_of_gifts' => $this->gifts->count(),
+                'number_of_debts' => $this->debts->count(),
+            ]),
+            'contactFields' => $this->when($withContactField && ! $this->is_partial, ContactFieldResource::collection($this->contactFields)),
+            'notes' => $this->when($withContactField && ! $this->is_partial, NoteResource::collection($this->notes()->latest()->limit(3)->get())),
+            'url' => $this->when(! $this->is_partial, route('api.contact', $this->id)),
+            'account' => [
+                'id' => $this->account_id,
+            ],
+            'created_at' => DateHelper::getTimestamp($this->created_at),
+            'updated_at' => DateHelper::getTimestamp($this->updated_at),
+        ];
+    }
+
+    protected function getHashId()
+    {
+        $hashid = '';
+        if ($this->is_partial) {
+            $realContact = $this->getRelatedRealContact();
+            if ($realContact) {
+                $hashid = $realContact->hashID();
+            }
+        } else {
+            $hashid = $this->hashID();
+        }
+
+        return $hashid;
+    }
+}

app/Http/Resources/Contact/ContactCollection.php

@@ -1,24 +0,0 @@
-<?php
-
-namespace App\Http\Resources\Contact;
-
-use Illuminate\Http\Resources\Json\ResourceCollection;
-
-class ContactCollection extends ResourceCollection
-{
-    /**
-     * Transform the resource collection into an array.
-     *
-     * @param  \Illuminate\Http\Request $request
-     * @return array
-     */
-    public function toArray($request)
-    {
-        return [
-            'data' => $this->collection,
-            'links' => [
-                'self' => 'link-value',
-            ],
-        ];
-    }
-}

app/Http/Resources/Contact/ContactSearch.php

@@ -2,8 +2,15 @@
 
 namespace App\Http\Resources\Contact;
 
-class ContactSearch extends Contact
+use Illuminate\Http\Resources\Json\JsonResource;
+
+/**
+ * @extends JsonResource<\App\Models\Contact\Contact>
+ */
+class ContactSearch extends JsonResource
 {
+    use ContactBase;
+
     /**
      * Transform the resource into an array.
      *

app/Http/Resources/Contact/ContactShort.php

@@ -3,9 +3,15 @@
 namespace App\Http\Resources\Contact;
 
 use App\Helpers\DateHelper;
+use Illuminate\Http\Resources\Json\JsonResource;
 
-class ContactShort extends Contact
+/**
+ * @extends JsonResource<\App\Models\Contact\Contact>
+ */
+class ContactShort extends JsonResource
 {
+    use ContactBase;
+
     /**
      * Transform the resource into an array.
      *

app/Http/Resources/Contact/ContactWithContactFields.php

@@ -2,8 +2,15 @@
 
 namespace App\Http\Resources\Contact;
 
-class ContactWithContactFields extends Contact
+use Illuminate\Http\Resources\Json\JsonResource;
+
+/**
+ * @extends JsonResource<\App\Models\Contact\Contact>
+ */
+class ContactWithContactFields extends JsonResource
 {
+    use ContactBase;
+
     /**
      * Transform the resource into an array.
      *

app/Http/Resources/Contact/ContactWithContactFieldsCollection.php

@@ -1,24 +0,0 @@
-<?php
-
-namespace App\Http\Resources\Contact;
-
-use Illuminate\Http\Resources\Json\ResourceCollection;
-
-class ContactWithContactFieldsCollection extends ResourceCollection
-{
-    /**
-     * Transform the resource collection into an array.
-     *
-     * @param  \Illuminate\Http\Request $request
-     * @return array
-     */
-    public function toArray($request)
-    {
-        return [
-            'data' => $this->collection,
-            'links' => [
-                'self' => 'link-value',
-            ],
-        ];
-    }
-}

app/Http/Resources/ContactField/ContactField.php

@@ -3,11 +3,14 @@
 namespace App\Http\Resources\ContactField;
 
 use App\Helpers\DateHelper;
-use Illuminate\Http\Resources\Json\Resource;
+use Illuminate\Http\Resources\Json\JsonResource;
 use App\Http\Resources\Contact\ContactShort as ContactShortResource;
 use App\Http\Resources\Settings\ContactFieldType\ContactFieldType as ContactFieldTypeResource;
 
-class ContactField extends Resource
+/**
+ * @extends JsonResource<\App\Models\Contact\ContactField>
+ */
+class ContactField extends JsonResource
 {
     /**
      * Transform the resource into an array.

app/Http/Resources/ContactField/ContactFieldCollection.php

@@ -1,24 +0,0 @@
-<?php
-
-namespace App\Http\Resources\ContactField;
-
-use Illuminate\Http\Resources\Json\ResourceCollection;
-
-class ContactFieldCollection extends ResourceCollection
-{
-    /**
-     * Transform the resource collection into an array.
-     *
-     * @param  \Illuminate\Http\Request $request
-     * @return array
-     */
-    public function toArray($request)
-    {
-        return [
-            'data' => $this->collection,
-            'links' => [
-                'self' => 'link-value',
-            ],
-        ];
-    }
-}

app/Http/Resources/ContactField/ContactFieldLabel.php

@@ -3,9 +3,12 @@
 namespace App\Http\Resources\ContactField;
 
 use App\Helpers\DateHelper;
-use Illuminate\Http\Resources\Json\Resource;
+use Illuminate\Http\Resources\Json\JsonResource;
 
-class ContactFieldLabel extends Resource
+/**
+ * @extends JsonResource<\App\Models\Contact\ContactFieldLabel>
+ */
+class ContactFieldLabel extends JsonResource
 {
     /**
      * Transform the resource into an array.

app/Http/Resources/ContactField/ContactFieldLabelCollection.php

@@ -1,24 +0,0 @@
-<?php
-
-namespace App\Http\Resources\ContactField;
-
-use Illuminate\Http\Resources\Json\ResourceCollection;
-
-class ContactFieldLabelCollection extends ResourceCollection
-{
-    /**
-     * Transform the resource collection into an array.
-     *
-     * @param  \Illuminate\Http\Request $request
-     * @return array
-     */
-    public function toArray($request)
-    {
-        return [
-            'data' => $this->collection,
-            'links' => [
-                'self' => 'link-value',
-            ],
-        ];
-    }
-}

app/Http/Resources/Conversation/Conversation.php

@@ -3,12 +3,15 @@
 namespace App\Http\Resources\Conversation;
 
 use App\Helpers\DateHelper;
-use Illuminate\Http\Resources\Json\Resource;
+use Illuminate\Http\Resources\Json\JsonResource;
 use App\Http\Resources\Conversation\Message as MessageResource;
 use App\Http\Resources\Contact\ContactShort as ContactShortResource;
 use App\Http\Resources\Settings\ContactFieldType\ContactFieldType as ContactFieldTypeResource;
 
-class Conversation extends Resource
+/**
+ * @extends JsonResource<\App\Models\Contact\Conversation>
+ */
+class Conversation extends JsonResource
 {
     /**
      * Transform the resource into an array.

app/Http/Resources/Conversation/ConversationCollection.php

@@ -1,24 +0,0 @@
-<?php
-
-namespace App\Http\Resources\Conversation;
-
-use Illuminate\Http\Resources\Json\ResourceCollection;
-
-class ConversationCollection extends ResourceCollection
-{
-    /**
-     * Transform the resource collection into an array.
-     *
-     * @param  \Illuminate\Http\Request $request
-     * @return array
-     */
-    public function toArray($request)
-    {
-        return [
-            'data' => $this->collection,
-            'links' => [
-                'self' => 'link-value',
-            ],
-        ];
-    }
-}

app/Http/Resources/Conversation/Message.php

@@ -3,10 +3,13 @@
 namespace App\Http\Resources\Conversation;
 
 use App\Helpers\DateHelper;
-use Illuminate\Http\Resources\Json\Resource;
+use Illuminate\Http\Resources\Json\JsonResource;
 use App\Http\Resources\Contact\ContactShort as ContactShortResource;
 
-class Message extends Resource
+/**
+ * @extends JsonResource<\App\Models\Contact\Message>
+ */
+class Message extends JsonResource
 {
     /**
      * Transform the resource into an array.

app/Http/Resources/Conversation/MessageCollection.php

@@ -1,24 +0,0 @@
-<?php
-
-namespace App\Http\Resources\Conversation;
-
-use Illuminate\Http\Resources\Json\ResourceCollection;
-
-class MessageCollection extends ResourceCollection
-{
-    /**
-     * Transform the resource collection into an array.
-     *
-     * @param  \Illuminate\Http\Request $request
-     * @return array
-     */
-    public function toArray($request)
-    {
-        return [
-            'data' => $this->collection,
-            'links' => [
-                'self' => 'link-value',
-            ],
-        ];
-    }
-}

app/Http/Resources/Country/Country.php

@@ -3,9 +3,9 @@
 namespace App\Http\Resources\Country;
 
 use App\Helpers\CountriesHelper;
-use Illuminate\Http\Resources\Json\Resource;
+use Illuminate\Http\Resources\Json\JsonResource;
 
-class Country extends Resource
+class Country extends JsonResource
 {
     /**
      * Transform the resource into an array.

app/Http/Resources/Country/CountryCollection.php

@@ -1,24 +0,0 @@
-<?php
-
-namespace App\Http\Resources\Country;
-
-use Illuminate\Http\Resources\Json\ResourceCollection;
-
-class CountryCollection extends ResourceCollection
-{
-    /**
-     * Transform the resource collection into an array.
-     *
-     * @param  \Illuminate\Http\Request $request
-     * @return array
-     */
-    public function toArray($request)
-    {
-        return [
-            'data' => $this->collection,
-            'links' => [
-                'self' => 'link-value',
-            ],
-        ];
-    }
-}

app/Http/Resources/Debt/Debt.php

@@ -4,10 +4,13 @@ namespace App\Http\Resources\Debt;
 
 use App\Helpers\DateHelper;
 use App\Helpers\MoneyHelper;
-use Illuminate\Http\Resources\Json\Resource;
+use Illuminate\Http\Resources\Json\JsonResource;
 use App\Http\Resources\Contact\ContactShort as ContactShortResource;
 
-class Debt extends Resource
+/**
+ * @extends JsonResource<\App\Models\Contact\Debt>
+ */
+class Debt extends JsonResource
 {
     /**
      * Transform the resource into an array.
@@ -23,7 +26,7 @@ class Debt extends Resource
             'in_debt' => $this->in_debt,
             'status' => $this->status,
             'amount' => $this->amount,
-            'amount_with_currency' => MoneyHelper::format($this->amount),
+            'amount_with_currency' => MoneyHelper::format((int) $this->amount),
             'reason' => $this->reason,
             'account' => [
                 'id' => $this->account_id,

app/Http/Resources/Debt/DebtCollection.php

@@ -1,24 +0,0 @@
-<?php
-
-namespace App\Http\Resources\Debt;
-
-use Illuminate\Http\Resources\Json\ResourceCollection;
-
-class DebtCollection extends ResourceCollection
-{
-    /**
-     * Transform the resource collection into an array.
-     *
-     * @param  \Illuminate\Http\Request $request
-     * @return array
-     */
-    public function toArray($request)
-    {
-        return [
-            'data' => $this->collection,
-            'links' => [
-                'self' => 'link-value',
-            ],
-        ];
-    }
-}

app/Http/Resources/Document/Document.php

@@ -3,10 +3,13 @@
 namespace App\Http\Resources\Document;
 
 use App\Helpers\DateHelper;
-use Illuminate\Http\Resources\Json\Resource;
+use Illuminate\Http\Resources\Json\JsonResource;
 use App\Http\Resources\Contact\ContactShort as ContactShortResource;
 
-class Document extends Resource
+/**
+ * @extends JsonResource<\App\Models\Contact\Document>
+ */
+class Document extends JsonResource
 {
     /**
      * Transform the resource into an array.

app/Http/Resources/Document/DocumentCollection.php

@@ -1,24 +0,0 @@
-<?php
-
-namespace App\Http\Resources\Document;
-
-use Illuminate\Http\Resources\Json\ResourceCollection;
-
-class DocumentCollection extends ResourceCollection
-{
-    /**
-     * Transform the resource collection into an array.
-     *
-     * @param  \Illuminate\Http\Request $request
-     * @return array
-     */
-    public function toArray($request)
-    {
-        return [
-            'data' => $this->collection,
-            'links' => [
-                'self' => 'link-value',
-            ],
-        ];
-    }
-}

app/Http/Resources/Emotion/Emotion.php

@@ -2,9 +2,12 @@
 
 namespace App\Http\Resources\Emotion;
 
-use Illuminate\Http\Resources\Json\Resource;
+use Illuminate\Http\Resources\Json\JsonResource;
 
-class Emotion extends Resource
+/**
+ * @extends JsonResource<\App\Models\Instance\Emotion\Emotion>
+ */
+class Emotion extends JsonResource
 {
     /**
      * Transform the resource into an array.

app/Http/Resources/Emotion/EmotionCollection.php

@@ -1,24 +0,0 @@
-<?php
-
-namespace App\Http\Resources\Emotion;
-
-use Illuminate\Http\Resources\Json\ResourceCollection;
-
-class EmotionCollection extends ResourceCollection
-{
-    /**
-     * Transform the resource collection into an array.
-     *
-     * @param  \Illuminate\Http\Request $request
-     * @return array
-     */
-    public function toArray($request)
-    {
-        return [
-            'data' => $this->collection,
-            'links' => [
-                'self' => 'link-value',
-            ],
-        ];
-    }
-}

app/Http/Resources/Gender/Gender.php

@@ -3,9 +3,12 @@
 namespace App\Http\Resources\Gender;
 
 use App\Helpers\DateHelper;
-use Illuminate\Http\Resources\Json\Resource;
+use Illuminate\Http\Resources\Json\JsonResource;
 
-class Gender extends Resource
+/**
+ * @extends JsonResource<\App\Models\Contact\Gender>
+ */
+class Gender extends JsonResource
 {
     /**
      * Transform the resource into an array.

app/Http/Resources/Gender/GenderCollection.php

@@ -1,24 +0,0 @@
-<?php
-
-namespace App\Http\Resources\Gender;
-
-use Illuminate\Http\Resources\Json\ResourceCollection;
-
-class GenderCollection extends ResourceCollection
-{
-    /**
-     * Transform the resource collection into an array.
-     *
-     * @param  \Illuminate\Http\Request $request
-     * @return array
-     */
-    public function toArray($request)
-    {
-        return [
-            'data' => $this->collection,
-            'links' => [
-                'self' => 'link-value',
-            ],
-        ];
-    }
-}

app/Http/Resources/Gift/Gift.php

@@ -3,11 +3,14 @@
 namespace App\Http\Resources\Gift;
 
 use App\Helpers\DateHelper;
-use Illuminate\Http\Resources\Json\Resource;
+use Illuminate\Http\Resources\Json\JsonResource;
 use App\Http\Resources\Photo\Photo as PhotoResource;
 use App\Http\Resources\Contact\ContactShort as ContactShortResource;
 
-class Gift extends Resource
+/**
+ * @extends JsonResource<\App\Models\Contact\Gift>
+ */
+class Gift extends JsonResource
 {
     /**
      * Transform the resource into an array.

app/Http/Resources/Gift/GiftCollection.php

@@ -1,24 +0,0 @@
-<?php
-
-namespace App\Http\Resources\Gift;
-
-use Illuminate\Http\Resources\Json\ResourceCollection;
-
-class GiftCollection extends ResourceCollection
-{
-    /**
-     * Transform the resource collection into an array.
-     *
-     * @param  \Illuminate\Http\Request $request
-     * @return array
-     */
-    public function toArray($request)
-    {
-        return [
-            'data' => $this->collection,
-            'links' => [
-                'self' => 'link-value',
-            ],
-        ];
-    }
-}

app/Http/Resources/Journal/Entry.php

@@ -3,9 +3,12 @@
 namespace App\Http\Resources\Journal;
 
 use App\Helpers\DateHelper;
-use Illuminate\Http\Resources\Json\Resource;
+use Illuminate\Http\Resources\Json\JsonResource;
 
-class Entry extends Resource
+/**
+ * @extends JsonResource<\App\Models\Journal\Entry>
+ */
+class Entry extends JsonResource
 {
     /**
      * Transform the resource into an array.

app/Http/Resources/Journal/JournalCollection.php

@@ -1,24 +0,0 @@
-<?php
-
-namespace App\Http\Resources\Journal;
-
-use Illuminate\Http\Resources\Json\ResourceCollection;
-
-class JournalCollection extends ResourceCollection
-{
-    /**
-     * Transform the resource collection into an array.
-     *
-     * @param  \Illuminate\Http\Request $request
-     * @return array
-     */
-    public function toArray($request)
-    {
-        return [
-            'data' => $this->collection,
-            'links' => [
-                'self' => 'link-value',
-            ],
-        ];
-    }
-}

app/Http/Resources/LifeEvent/LifeEvent.php

@@ -3,11 +3,14 @@
 namespace App\Http\Resources\LifeEvent;
 
 use App\Helpers\DateHelper;
-use Illuminate\Http\Resources\Json\Resource;
+use Illuminate\Http\Resources\Json\JsonResource;
 use App\Http\Resources\Contact\ContactShort as ContactShortResource;
 use App\Http\Resources\LifeEvent\LifeEventType as LifeEventTypeResource;
 
-class LifeEvent extends Resource
+/**
+ * @extends JsonResource<\App\Models\Contact\LifeEvent>
+ */
+class LifeEvent extends JsonResource
 {
     /**
      * Transform the resource into an array.

app/Http/Resources/LifeEvent/LifeEventCategory.php

@@ -3,9 +3,12 @@
 namespace App\Http\Resources\LifeEvent;
 
 use App\Helpers\DateHelper;
-use Illuminate\Http\Resources\Json\Resource;
+use Illuminate\Http\Resources\Json\JsonResource;
 
-class LifeEventCategory extends Resource
+/**
+ * @extends JsonResource<\App\Models\Contact\LifeEventCategory>
+ */
+class LifeEventCategory extends JsonResource
 {
     /**
      * Transform the resource into an array.

app/Http/Resources/LifeEvent/LifeEventType.php

@@ -3,10 +3,13 @@
 namespace App\Http\Resources\LifeEvent;
 
 use App\Helpers\DateHelper;
-use Illuminate\Http\Resources\Json\Resource;
+use Illuminate\Http\Resources\Json\JsonResource;
 use App\Http\Resources\LifeEvent\LifeEventCategory as LifeEventCategoryResource;
 
-class LifeEventType extends Resource
+/**
+ * @extends JsonResource<\App\Models\Contact\LifeEventType>
+ */
+class LifeEventType extends JsonResource
 {
     /**
      * Transform the resource into an array.

app/Http/Resources/Note/Note.php

@@ -3,10 +3,13 @@
 namespace App\Http\Resources\Note;
 
 use App\Helpers\DateHelper;
-use Illuminate\Http\Resources\Json\Resource;
+use Illuminate\Http\Resources\Json\JsonResource;
 use App\Http\Resources\Contact\ContactShort as ContactShortResource;
 
-class Note extends Resource
+/**
+ * @extends JsonResource<\App\Models\Contact\Note>
+ */
+class Note extends JsonResource
 {
     /**
      * Transform the resource into an array.

app/Http/Resources/Note/NoteCollection.php

@@ -1,24 +0,0 @@
-<?php
-
-namespace App\Http\Resources\Note;
-
-use Illuminate\Http\Resources\Json\ResourceCollection;
-
-class NoteCollection extends ResourceCollection
-{
-    /**
-     * Transform the resource collection into an array.
-     *
-     * @param  \Illuminate\Http\Request $request
-     * @return array
-     */
-    public function toArray($request)
-    {
-        return [
-            'data' => $this->collection,
-            'links' => [
-                'self' => 'link-value',
-            ],
-        ];
-    }
-}

app/Http/Resources/Occupation/Occupation.php

@@ -3,11 +3,14 @@
 namespace App\Http\Resources\Occupation;
 
 use App\Helpers\DateHelper;
-use Illuminate\Http\Resources\Json\Resource;
+use Illuminate\Http\Resources\Json\JsonResource;
 use App\Http\Resources\Company\Company as CompanyResource;
 use App\Http\Resources\Contact\ContactShort as ContactShortResource;
 
-class Occupation extends Resource
+/**
+ * @extends JsonResource<\App\Models\Contact\Occupation>
+ */
+class Occupation extends JsonResource
 {
     /**
      * Transform the resource into an array.

app/Http/Resources/Occupation/OccupationCollection.php

@@ -1,24 +0,0 @@
-<?php
-
-namespace App\Http\Resources\Occupation;
-
-use Illuminate\Http\Resources\Json\ResourceCollection;
-
-class OccupationCollection extends ResourceCollection
-{
-    /**
-     * Transform the resource collection into an array.
-     *
-     * @param  \Illuminate\Http\Request $request
-     * @return array
-     */
-    public function toArray($request)
-    {
-        return [
-            'data' => $this->collection,
-            'links' => [
-                'self' => 'link-value',
-            ],
-        ];
-    }
-}

app/Http/Resources/Pet/Pet.php

@@ -3,10 +3,13 @@
 namespace App\Http\Resources\Pet;
 
 use App\Helpers\DateHelper;
-use Illuminate\Http\Resources\Json\Resource;
+use Illuminate\Http\Resources\Json\JsonResource;
 use App\Http\Resources\Contact\ContactShort as ContactShortResource;
 
-class Pet extends Resource
+/**
+ * @extends JsonResource<\App\Models\Contact\Pet>
+ */
+class Pet extends JsonResource
 {
     /**
      * Transform the resource into an array.

app/Http/Resources/Pet/PetCategory.php

@@ -2,9 +2,12 @@
 
 namespace App\Http\Resources\Pet;
 
-use Illuminate\Http\Resources\Json\Resource;
+use Illuminate\Http\Resources\Json\JsonResource;
 
-class PetCategory extends Resource
+/**
+ * @extends JsonResource<\App\Models\Contact\PetCategory>
+ */
+class PetCategory extends JsonResource
 {
     /**
      * Transform the resource into an array.

app/Http/Resources/Pet/PetCollection.php

@@ -1,24 +0,0 @@
-<?php
-
-namespace App\Http\Resources\Pet;
-
-use Illuminate\Http\Resources\Json\ResourceCollection;
-
-class PetCollection extends ResourceCollection
-{
-    /**
-     * Transform the resource collection into an array.
-     *
-     * @param  \Illuminate\Http\Request $request
-     * @return array
-     */
-    public function toArray($request)
-    {
-        return [
-            'data' => $this->collection,
-            'links' => [
-                'self' => 'link-value',
-            ],
-        ];
-    }
-}

app/Http/Resources/Photo/Photo.php

@@ -3,10 +3,13 @@
 namespace App\Http\Resources\Photo;
 
 use App\Helpers\DateHelper;
-use Illuminate\Http\Resources\Json\Resource;
+use Illuminate\Http\Resources\Json\JsonResource;
 use App\Http\Resources\Contact\ContactShort as ContactShortResource;
 
-class Photo extends Resource
+/**
+ * @extends JsonResource<\App\Models\Account\Photo>
+ */
+class Photo extends JsonResource
 {
     /**
      * Transform the resource into an array.

app/Http/Resources/Photo/PhotoCollection.php

@@ -1,24 +0,0 @@
-<?php
-
-namespace App\Http\Resources\Photo;
-
-use Illuminate\Http\Resources\Json\ResourceCollection;
-
-class PhotoCollection extends ResourceCollection
-{
-    /**
-     * Transform the resource collection into an array.
-     *
-     * @param  \Illuminate\Http\Request $request
-     * @return array
-     */
-    public function toArray($request)
-    {
-        return [
-            'data' => $this->collection,
-            'links' => [
-                'self' => 'link-value',
-            ],
-        ];
-    }
-}

app/Http/Resources/Place/Place.php

@@ -3,10 +3,13 @@
 namespace App\Http\Resources\Place;
 
 use App\Helpers\DateHelper;
-use Illuminate\Http\Resources\Json\Resource;
+use Illuminate\Http\Resources\Json\JsonResource;
 use App\Http\Resources\Country\Country as CountryResource;
 
-class Place extends Resource
+/**
+ * @extends JsonResource<\App\Models\Account\Place>
+ */
+class Place extends JsonResource
 {
     /**
      * Transform the resource into an array.

app/Http/Resources/Place/PlaceCollection.php

@@ -1,24 +0,0 @@
-<?php
-
-namespace App\Http\Resources\Place;
-
-use Illuminate\Http\Resources\Json\ResourceCollection;
-
-class PlaceCollection extends ResourceCollection
-{
-    /**
-     * Transform the resource collection into an array.
-     *
-     * @param  \Illuminate\Http\Request $request
-     * @return array
-     */
-    public function toArray($request)
-    {
-        return [
-            'data' => $this->collection,
-            'links' => [
-                'self' => 'link-value',
-            ],
-        ];
-    }
-}

app/Http/Resources/Relationship/Relationship.php

@@ -3,11 +3,14 @@
 namespace App\Http\Resources\Relationship;
 
 use App\Helpers\DateHelper;
-use Illuminate\Http\Resources\Json\Resource;
+use Illuminate\Http\Resources\Json\JsonResource;
 use App\Http\Resources\Contact\ContactShort as ContactShortResource;
 use App\Http\Resources\RelationshipType\RelationshipType as RelationshipTypeResource;
 
-class Relationship extends Resource
+/**
+ * @extends JsonResource<\App\Models\Relationship\Relationship>
+ */
+class Relationship extends JsonResource
 {
     /**
      * Transform the resource into an array.

app/Http/Resources/Relationship/RelationshipCollection.php

@@ -1,24 +0,0 @@
-<?php
-
-namespace App\Http\Resources\Relationship;
-
-use Illuminate\Http\Resources\Json\ResourceCollection;
-
-class RelationshipCollection extends ResourceCollection
-{
-    /**
-     * Transform the resource collection into an array.
-     *
-     * @param  \Illuminate\Http\Request $request
-     * @return array
-     */
-    public function toArray($request)
-    {
-        return [
-            'data' => $this->collection,
-            'links' => [
-                'self' => 'link-value',
-            ],
-        ];
-    }
-}

app/Http/Resources/Relationship/RelationshipShort.php

@@ -2,10 +2,13 @@
 
 namespace App\Http\Resources\Relationship;
 
-use Illuminate\Http\Resources\Json\Resource;
+use Illuminate\Http\Resources\Json\JsonResource;
 use App\Http\Resources\Contact\ContactShort as ContactShortResource;
 
-class RelationshipShort extends Resource
+/**
+ * @extends JsonResource<\App\Models\Relationship\Relationship>
+ */
+class RelationshipShort extends JsonResource
 {
     /**
      * Transform the resource into an array.

app/Http/Resources/RelationshipType/RelationshipType.php

@@ -3,9 +3,12 @@
 namespace App\Http\Resources\RelationshipType;
 
 use App\Helpers\DateHelper;
-use Illuminate\Http\Resources\Json\Resource;
+use Illuminate\Http\Resources\Json\JsonResource;
 
-class RelationshipType extends Resource
+/**
+ * @extends JsonResource<\App\Models\Relationship\RelationshipType>
+ */
+class RelationshipType extends JsonResource
 {
     /**
      * Transform the resource into an array.

app/Http/Resources/RelationshipType/RelationshipTypeCollection.php

@@ -1,24 +0,0 @@
-<?php
-
-namespace App\Http\Resources\RelationshipType;
-
-use Illuminate\Http\Resources\Json\ResourceCollection;
-
-class RelationshipTypeCollection extends ResourceCollection
-{
-    /**
-     * Transform the resource collection into an array.
-     *
-     * @param  \Illuminate\Http\Request $request
-     * @return array
-     */
-    public function toArray($request)
-    {
-        return [
-            'data' => $this->collection,
-            'links' => [
-                'self' => 'link-value',
-            ],
-        ];
-    }
-}

app/Http/Resources/RelationshipTypeGroup/RelationshipTypeGroup.php

@@ -3,9 +3,12 @@
 namespace App\Http\Resources\RelationshipTypeGroup;
 
 use App\Helpers\DateHelper;
-use Illuminate\Http\Resources\Json\Resource;
+use Illuminate\Http\Resources\Json\JsonResource;
 
-class RelationshipTypeGroup extends Resource
+/**
+ * @extends JsonResource<\App\Models\Relationship\RelationshipTypeGroup>
+ */
+class RelationshipTypeGroup extends JsonResource
 {
     /**
      * Transform the resource into an array.

app/Http/Resources/RelationshipTypeGroup/RelationshipTypeGroupCollection.php

@@ -1,24 +0,0 @@
-<?php
-
-namespace App\Http\Resources\RelationshipTypeGroup;
-
-use Illuminate\Http\Resources\Json\ResourceCollection;
-
-class RelationshipTypeGroupCollection extends ResourceCollection
-{
-    /**
-     * Transform the resource collection into an array.
-     *
-     * @param  \Illuminate\Http\Request $request
-     * @return array
-     */
-    public function toArray($request)
-    {
-        return [
-            'data' => $this->collection,
-            'links' => [
-                'self' => 'link-value',
-            ],
-        ];
-    }
-}

app/Http/Resources/Reminder/Reminder.php

@@ -3,10 +3,13 @@
 namespace App\Http\Resources\Reminder;
 
 use App\Helpers\DateHelper;
-use Illuminate\Http\Resources\Json\Resource;
+use Illuminate\Http\Resources\Json\JsonResource;
 use App\Http\Resources\Contact\ContactShort as ContactShortResource;
 
-class Reminder extends Resource
+/**
+ * @extends JsonResource<\App\Models\Contact\Reminder>
+ */
+class Reminder extends JsonResource
 {
     /**
      * Transform the resource into an array.

app/Http/Resources/Reminder/ReminderCollection.php

@@ -1,24 +0,0 @@
-<?php
-
-namespace App\Http\Resources\Reminder;
-
-use Illuminate\Http\Resources\Json\ResourceCollection;
-
-class ReminderCollection extends ResourceCollection
-{
-    /**
-     * Transform the resource collection into an array.
-     *
-     * @param  \Illuminate\Http\Request $request
-     * @return array
-     */
-    public function toArray($request)
-    {
-        return [
-            'data' => $this->collection,
-            'links' => [
-                'self' => 'link-value',
-            ],
-        ];
-    }
-}

app/Http/Resources/Settings/Compliance/Compliance.php

@@ -3,9 +3,12 @@
 namespace App\Http\Resources\Settings\Compliance;
 
 use App\Helpers\DateHelper;
-use Illuminate\Http\Resources\Json\Resource;
+use Illuminate\Http\Resources\Json\JsonResource;
 
-class Compliance extends Resource
+/**
+ * @extends JsonResource<\App\Models\Settings\Term>
+ */
+class Compliance extends JsonResource
 {
     /**
      * Transform the resource into an array.

app/Http/Resources/Settings/Compliance/ComplianceCollection.php

@@ -1,24 +0,0 @@
-<?php
-
-namespace App\Http\Resources\Settings\Compliance;
-
-use Illuminate\Http\Resources\Json\ResourceCollection;
-
-class ComplianceCollection extends ResourceCollection
-{
-    /**
-     * Transform the resource collection into an array.
-     *
-     * @param  \Illuminate\Http\Request $request
-     * @return array
-     */
-    public function toArray($request)
-    {
-        return [
-            'data' => $this->collection,
-            'links' => [
-                'self' => 'link-value',
-            ],
-        ];
-    }
-}

app/Http/Resources/Settings/ContactFieldType/ContactFieldType.php

@@ -3,9 +3,12 @@
 namespace App\Http\Resources\Settings\ContactFieldType;
 
 use App\Helpers\DateHelper;
-use Illuminate\Http\Resources\Json\Resource;
+use Illuminate\Http\Resources\Json\JsonResource;
 
-class ContactFieldType extends Resource
+/**
+ * @extends JsonResource<\App\Models\Contact\ContactFieldType>
+ */
+class ContactFieldType extends JsonResource
 {
     /**
      * Transform the resource into an array.

app/Http/Resources/Settings/ContactFieldType/ContactFieldTypeCollection.php

@@ -1,24 +0,0 @@
-<?php
-
-namespace App\Http\Resources\Settings\ContactFieldType;
-
-use Illuminate\Http\Resources\Json\ResourceCollection;
-
-class ContactFieldTypeCollection extends ResourceCollection
-{
-    /**
-     * Transform the resource collection into an array.
-     *
-     * @param  \Illuminate\Http\Request $request
-     * @return array
-     */
-    public function toArray($request)
-    {
-        return [
-            'data' => $this->collection,
-            'links' => [
-                'self' => 'link-value',
-            ],
-        ];
-    }
-}