Merge branch 'main' into fix/show-create-label-button

.env.example

@@ -82,14 +82,20 @@ [email protected]
 MAIL_REPLY_TO_NAME="${APP_NAME}"
 
 # Search
-# We use Laravel Scout to do full-text search.
-# Read config/scout.php for more information.
-# Note that you have to use Meilisearch, Algolia or the database driver to enable
-# search in Monica. Searching requires a queue to be configured.
+## We use Laravel Scout to do full-text search.
+## Read config/scout.php for more information.
+## Note that you have to use: 'meilisearch', 'typesense', 'algolia' or the 'database'
+## driver to enable search in Monica. Searching requires a queue to be configured.
 SCOUT_DRIVER=database
 SCOUT_QUEUE=true
-MEILISEARCH_HOST=
+## If you never intend to use the 'database' driver, you can set this value to false:
+FULL_TEXT_INDEX=true
+## Meilisearch settings
+MEILISEARCH_URL=
 MEILISEARCH_KEY=
+## Typesense settings
+TYPESENSE_HOST=
+TYPESENSE_API_KEY=
 
 # Notification channels
 TELEGRAM_BOT_TOKEN=

.env.example.sail

@@ -42,6 +42,6 @@ MAIL_REPLY_TO_NAME="${APP_NAME}"
 
 SCOUT_DRIVER=meilisearch
 SCOUT_QUEUE=true
-MEILISEARCH_HOST=http://meilisearch:7700
+MEILISEARCH_URL=http://meilisearch:7700
 MEILISEARCH_KEY=
 MEILISEARCH_NO_ANALYTICS=false

.husky/pre-commit

@@ -1 +1 @@
-npx lint-staged
+yarn lint-staged

app/Actions/Jetstream/UserProfile.php

@@ -23,7 +23,7 @@ public function __invoke(Request $request, array $data): array
             ]);
 
         $webauthnKeys = $request->user()->webauthnKeys
-            ->map(fn (WebauthnKey $key) => [
+            ->map(fn (WebauthnKey $key) => [ // @phpstan-ignore-line
                 'id' => $key->id,
                 'name' => $key->name,
                 'type' => $key->type,

app/Console/Commands/SetupScout.php

@@ -2,6 +2,7 @@
 
 namespace App\Console\Commands;
 
+use App\Helpers\ScoutHelper;
 use Illuminate\Console\Command;
 use Illuminate\Console\ConfirmableTrait;
 use Symfony\Component\Console\Attribute\AsCommand;
@@ -49,17 +50,18 @@ public function handle(): void
      */
     protected function scoutConfigure(): void
     {
-        if (config('scout.driver') === 'meilisearch' && config('scout.meilisearch.host') !== '') {
-            $this->artisan('☐ Updating indexes on Meilisearch', 'scout:sync-index-settings', ['--verbose' => true]);
+        if (ScoutHelper::isIndexed()) {
+            $this->artisan('☐ Updating indexes', 'scout:sync-index-settings', ['--verbose' => true]);
         }
     }
 
     /**
-     * Import models.
+     * Flush indexes.
      */
     protected function scoutFlush(): void
     {
-        if (config('scout.driver') !== null && $this->option('flush')) {
+        if ($this->option('flush') && ScoutHelper::isIndexed()) {
+            // Using meilisearch config for any driver
             foreach (config('scout.meilisearch.index-settings') as $index => $settings) {
                 $name = (new $index)->getTable();
                 $this->artisan("☐ Flush {$name} index", 'scout:flush', ['model' => $index, '--verbose' => true]);
@@ -74,7 +76,8 @@ protected function scoutFlush(): void
      */
     protected function scoutImport(): void
     {
-        if (config('scout.driver') !== null && $this->option('import')) {
+        if ($this->option('import') && ScoutHelper::isIndexed()) {
+            // Using meilisearch config for any driver
             foreach (config('scout.meilisearch.index-settings') as $index => $settings) {
                 $name = (new $index)->getTable();
                 $this->artisan("☐ Import {$name}", 'scout:import', ['model' => $index, '--verbose' => true]);

app/Domains/Contact/Dav/Services/GetEtag.php

@@ -44,7 +44,7 @@ public function execute(array $data): string
         /** @var VCardResource */
         $entry = $data['entry'];
 
-        if ($entry->vault_id !== $this->vault->id) {
+        if ($entry->vault_id != $this->vault->id) {
             throw new ModelNotFoundException;
         }
 

app/Domains/Contact/Dav/Web/Backend/CardDAV/CardDAVBackend.php

@@ -85,7 +85,7 @@ public function getAddressBooksForUser($principalUri): array
 
     private function getAddressBookDetails(Vault $vault): array
     {
-        $token = $this->getCurrentSyncToken($vault->id);
+        $token = $this->getCurrentSyncToken((string) $vault->id);
 
         $des = [
             'id' => $vault->id,

app/Domains/Contact/DavClient/Jobs/GetMultipleVCard.php

@@ -55,7 +55,7 @@ private function run(): void
         $data = $this->addressbookMultiget();
 
         $jobs = collect($data)
-            ->filter(fn (array $contact): bool => is_array($contact) && $contact['status'] === '200')
+            ->filter(fn (array $contact): bool => $contact['status'] === '200')
             ->map(fn (array $contact, string $href): ?UpdateVCard => $this->updateVCard($contact, $href))
             ->filter();
 

app/Domains/Contact/ManageContact/Dav/ExportContactInformation.php

@@ -46,7 +46,7 @@ private function addContactInformationToVCard(VCard $vcard, ContactInformation $
             case trans('Phone'):
                 // https://datatracker.ietf.org/doc/html/rfc6350#section-6.4.1
                 $vcard->add('TEL', $contactInformation->data, [
-                    //'TYPE' => $contactInformation->contactInformationType->type,
+                    // 'TYPE' => $contactInformation->contactInformationType->type,
                 ]);
                 break;
             case trans('Facebook'):

app/Domains/Contact/ManageContact/Dav/ImportContact.php

@@ -83,7 +83,7 @@ private function getExistingContact(VCard $vcard): ?Contact
         $contact = null;
 
         if (($uri = Arr::get($this->context->data, 'uri')) !== null) {
-            $contact = $backend->getObject($this->vault()->id, $uri);
+            $contact = $backend->getObject((string) $this->vault()->id, $uri);
 
             if ($contact === null) {
                 $contact = Contact::firstWhere([

app/Domains/Contact/ManageContact/Services/CopyContactToAnotherVault.php

@@ -79,7 +79,7 @@ private function copy(): void
         $this->newContact = new Contact;
 
         $this->newContact = $this->contact->replicate();
-        $this->newContact->vault_id = $this->newVault->id;
+        $this->newContact->vault_id = (string) $this->newVault->id;
         $this->newContact->save();
     }
 

app/Domains/Contact/ManageContact/Services/MoveContactToAnotherVault.php

@@ -91,7 +91,7 @@ private function moveCompanyInformation(): void
     {
         if ($this->contact->company) {
             if ($this->contact->company->contacts->count() === 1) {
-                $this->contact->company->vault_id = $this->newVault->id;
+                $this->contact->company->vault_id = (string) $this->newVault->id;
                 $this->contact->company->save();
             } else {
                 $newCompany = (new CreateCompany)->execute([

app/Domains/Contact/ManageContact/Web/Controllers/ContactVCardController.php

@@ -16,7 +16,7 @@ class ContactVCardController extends Controller
 {
     public function download(Request $request, Vault $vault, Contact $contact)
     {
-        $cardData = $this->exportVCard($vault->id, $contact->id);
+        $cardData = $this->exportVCard((string) $vault->id, $contact->id);
         $name = Str::of($contact->name)->slug(language: App::getLocale());
 
         return Redirect::back()->with('flash', [

app/Domains/Contact/ManageGroups/Web/ViewHelpers/GroupIndexViewHelper.php

@@ -31,7 +31,7 @@ public static function data(Vault $vault): Collection
                         ]),
                     ]);
 
-                return [
+                return [ // @phpstan-ignore-line
                     'id' => $group->id,
                     'name' => $group->name,
                     'url' => [

app/Domains/Contact/ManageGroups/Web/ViewHelpers/GroupShowViewHelper.php

@@ -22,7 +22,7 @@ public static function data(Group $group): array
             : $group->groupType->groupTypeRoles()
                 ->orderBy('position')
                 ->get()
-                ->map(function (GroupTypeRole $role) use ($group) {
+                ->map(function (GroupTypeRole $role) use ($group) { // @phpstan-ignore-line
                     $contactsCollection = $group->contacts()
                         ->wherePivot('group_type_role_id', $role->id)
                         ->get()
@@ -37,7 +37,7 @@ public static function data(Group $group): array
                             ]),
                         ]);
 
-                    return [
+                    return [ // @phpstan-ignore-line
                         'id' => $role->id,
                         'label' => $role->label,
                         'contacts' => $contactsCollection,

app/Domains/Contact/ManageLoans/Web/ViewHelpers/ModuleLoanViewHelper.php

@@ -17,11 +17,11 @@ public static function data(Contact $contact, User $user): array
         $loansAsLoaner = $contact->loansAsLoaner()->where('settled', false)->get();
         $loansAsLoanee = $contact->loansAsLoanee()->where('settled', false)->get();
 
-        $loans = $loansAsLoaner->concat($loansAsLoanee)->sortBy('loaned_at')->unique('id');
-
-        $loansAssociatedWithContactCollection = $loans->map(function ($loan) use ($contact, $user) {
-            return self::dtoLoan($loan, $contact, $user);
-        });
+        $loansAssociatedWithContactCollection = $loansAsLoaner
+            ->concat($loansAsLoanee)
+            ->sortBy('loaned_at')
+            ->unique('id')
+            ->map(fn (Loan $loan): array => self::dtoLoan($loan, $contact, $user)); // @phpstan-ignore-line
 
         return [
             'loans' => $loansAssociatedWithContactCollection,

app/Domains/Settings/ManageUsers/Services/DestroyUser.php

@@ -55,8 +55,10 @@ private function validate(): void
     {
         $this->validateRules($this->data);
 
-        $this->user = $this->account()->users()
+        /** @var User */
+        $user = $this->account()->users()
             ->findOrFail($this->data['user_id']);
+        $this->user = $user;
 
         if ($this->data['user_id'] === $this->data['author_id']) {
             throw new ValidationException(

app/Domains/Settings/ManageUsers/Services/GiveAdministratorPrivilege.php

@@ -38,6 +38,7 @@ public function execute(array $data): User
     {
         $this->validateRules($data);
 
+        /** @var User */
         $user = $this->account()->users()
             ->findOrFail($data['user_id']);
 

app/Domains/Settings/ManageUsers/Services/RemoveAdministratorPrivilege.php

@@ -38,6 +38,7 @@ public function execute(array $data): User
     {
         $this->validateRules($data);
 
+        /** @var User */
         $user = $this->account()->users()
             ->findOrFail($data['user_id']);
 

app/Domains/Settings/ManageUsers/Web/ViewHelpers/UserIndexViewHelper.php

@@ -9,11 +9,10 @@ class UserIndexViewHelper
 {
     public static function data(User $loggedUser): array
     {
+        /** @var \Illuminate\Database\Eloquent\Collection<int,User> */
         $users = $loggedUser->account->users;
 
-        $userCollection = $users->map(function ($user) use ($loggedUser) {
-            return self::dtoUser($user, $loggedUser);
-        });
+        $userCollection = $users->map(fn (User $user): array => self::dtoUser($user, $loggedUser));
 
         return [
             'users' => $userCollection,

app/Domains/Vault/ManageJournals/Services/AddPostToSliceOfLife.php

@@ -11,8 +11,6 @@ class AddPostToSliceOfLife extends BaseService implements ServiceInterface
 {
     private Post $post;
 
-    private ?SliceOfLife $slice;
-
     private array $data;
 
     /**

app/Domains/Vault/ManageJournals/Web/ViewHelpers/JournalShowViewHelper.php

@@ -148,13 +148,14 @@ public static function postsInYear(Journal $journal, int $year, User $user): Col
      */
     public static function yearsOfContentInJournal(Journal $journal): Collection
     {
+        /** @var Collection<int,Post> */
         $posts = Post::where('journal_id', $journal->id)
             ->select(DB::raw(SQLHelper::year('written_at').' as year'))
             ->distinct()
             ->orderBy('year', 'desc')
             ->get();
 
-        return $posts->map(fn (Post $post) => [
+        return $posts->map(fn (Post $post): array => [ // @phpstan-ignore-line
             'year' => $post->year,
             'posts' => Post::where('journal_id', $journal->id)
                 ->whereYear('written_at', $post->year)
@@ -196,7 +197,7 @@ public static function tags(Journal $journal): Collection
 
     public static function slices(Journal $journal): Collection
     {
-        $slicesCollection = $journal
+        return $journal
             ->slicesOfLife()
             ->get()
             ->map(fn (SliceOfLife $slice) => [
@@ -212,7 +213,5 @@ public static function slices(Journal $journal): Collection
                     ]),
                 ],
             ]);
-
-        return $slicesCollection;
     }
 }

app/Domains/Vault/ManageVault/Web/ViewHelpers/VaultIndexViewHelper.php

@@ -128,7 +128,7 @@ public static function data(User $user): array
     private static function getContacts(Vault $vault): Collection
     {
         return $vault->contacts
-            ->random(fn (Collection $items): int => min(5, count($items)))
+            ->random(fn (Collection $items): int => min(5, count($items))) // @phpstan-ignore-line
             ->map(fn (Contact $contact) => [
                 'id' => $contact->id,
                 'name' => $contact->name,

app/Domains/Vault/ManageVault/Web/ViewHelpers/VaultReminderIndexViewHelper.php

@@ -58,7 +58,7 @@ public static function data(Vault $vault, User $user): Collection
                 $reminder = ContactReminder::where('id', $contactReminderScheduled->contact_reminder_id)->with('contact')->first();
                 $contact = $reminder->contact;
 
-                if ($contact->vault_id !== $vault->id) {
+                if ($contact->vault_id != $vault->id) {
                     continue;
                 }
 

app/Domains/Vault/ManageVault/Web/ViewHelpers/VaultShowViewHelper.php

@@ -55,7 +55,7 @@ public static function upcomingReminders(Vault $vault, User $user): array
         $remindersCollection = $contactRemindersScheduled->map(function ($reminder) use ($vault, $user) {
             $contact = $reminder->contact;
 
-            if ($contact->vault_id !== $vault->id) {
+            if ($contact->vault_id != $vault->id) {
                 return null;
             }
 

app/Domains/Vault/ManageVaultSettings/Services/ChangeVaultAccess.php

@@ -56,8 +56,10 @@ private function validate(): void
     {
         $this->validateRules($this->data);
 
-        $this->user = $this->account()->users()
+        /** @var User */
+        $user = $this->account()->users()
             ->findOrFail($this->data['user_id']);
+        $this->user = $user;
 
         if ($this->user->id === $this->author->id) {
             throw new SameUserException;

app/Domains/Vault/ManageVaultSettings/Services/GrantVaultAccessToUser.php

@@ -59,8 +59,10 @@ private function validate(): void
     {
         $this->validateRules($this->data);
 
-        $this->user = $this->account()->users()
+        /** @var User */
+        $user = $this->account()->users()
             ->findOrFail($this->data['user_id']);
+        $this->user = $user;
 
         if ($this->user->id === $this->author->id) {
             throw new SameUserException;

app/Domains/Vault/ManageVaultSettings/Services/RemoveVaultAccess.php

@@ -55,8 +55,10 @@ private function validate(): void
     {
         $this->validateRules($this->data);
 
-        $this->user = $this->account()->users()
+        /** @var User */
+        $user = $this->account()->users()
             ->findOrFail($this->data['user_id']);
+        $this->user = $user;
 
         if ($this->user->id === $this->author->id) {
             throw new SameUserException;

app/Domains/Vault/ManageVaultSettings/Web/ViewHelpers/VaultSettingsIndexViewHelper.php

@@ -31,12 +31,8 @@ public static function data(Vault $vault): array
         $usersInAccount = $vault->account->users()->whereNotNull('email_verified_at')->get();
         $usersInVault = $vault->users()->get();
         $usersInAccount = $usersInAccount->diff($usersInVault);
-        $usersInAccountCollection = $usersInAccount->map(function ($user) use ($vault) {
-            return self::dtoUser($user, $vault);
-        });
-        $usersInVaultCollection = $usersInVault->map(function ($user) use ($vault) {
-            return self::dtoUser($user, $vault);
-        });
+        $usersInAccountCollection = $usersInAccount->map(fn (User $user): array => self::dtoUser($user, $vault)); // @phpstan-ignore-line
+        $usersInVaultCollection = $usersInVault->map(fn (User $user): array => self::dtoUser($user, $vault));
 
         // labels
         $labels = $vault->labels()

app/Exceptions/Handler.php

@@ -19,7 +19,7 @@ class Handler extends ExceptionHandler
     /**
      * A list of the inputs that are never flashed for validation exceptions.
      *
-     * @var array<int, string>
+     * @var list<string>
      */
     protected $dontFlash = [
         'current_password',

app/Helpers/CollectionHelper.php

@@ -70,10 +70,6 @@ public static function getCollator(?string $locale = null): \Collator
      */
     protected static function valueRetriever(callable|string $value): callable
     {
-        if (! is_string($value) && is_callable($value)) {
-            return $value;
-        }
-
-        return fn ($item) => data_get($item, $value);
+        return is_callable($value) ? $value : fn ($item) => data_get($item, $value);
     }
 }

app/Helpers/ImportantDateHelper.php

@@ -101,7 +101,7 @@ public static function determineType(ContactImportantDate $date): ?string
         }
 
         // case: only know the month and day. In this case, we can't calculate
-        //the age at all
+        // the age at all
         if ($date->day && $date->month && ! $date->year) {
             $type = ContactImportantDate::TYPE_MONTH_DAY;
         }