Merge branch '1.x' into dev

database/factories/FactoryHelper.php

@@ -9,7 +9,7 @@ trait FactoryHelper
     /**
      * Owner relation to add.
      *
-     * @param $owner
+     * @param  $owner
      * @return $this
      */
     public function owner($owner): self

database/factories/FriendFactory.php

@@ -32,8 +32,8 @@ public function definition(): array
     /**
      * Owner and party relations to add.
      *
-     * @param $owner
-     * @param $party
+     * @param  $owner
+     * @param  $party
      * @return $this
      */
     public function providers($owner, $party): self

database/factories/InviteFactory.php

@@ -40,7 +40,7 @@ public function definition(): array
     /**
      * Indicate thread is a group.
      *
-     * @param $expires
+     * @param  $expires
      * @return $this
      */
     public function expires($expires): self

database/factories/PendingFriendFactory.php

@@ -32,8 +32,8 @@ public function definition(): array
     /**
      * Sender and recipient relations to add.
      *
-     * @param $sender
-     * @param $recipient
+     * @param  $sender
+     * @param  $recipient
      * @return $this
      */
     public function providers($sender, $recipient): self

database/factories/SentFriendFactory.php

@@ -32,8 +32,8 @@ public function definition(): array
     /**
      * Sender and recipient relations to add.
      *
-     * @param $sender
-     * @param $recipient
+     * @param  $sender
+     * @param  $recipient
      * @return $this
      */
     public function providers($sender, $recipient): self

src/Actions/BaseMessengerAction.php

@@ -185,7 +185,7 @@ public function getJsonResource()
     }
 
     /**
-     * @param $resource
+     * @param  $resource
      * @return $this
      */
     public function setJsonResource($resource): self
@@ -229,7 +229,7 @@ public function getData(bool $withoutRelations = false)
     }
 
     /**
-     * @param $data
+     * @param  $data
      * @return $this
      */
     public function setData($data): self

src/Actions/Friends/StoreFriendRequest.php

@@ -115,6 +115,7 @@ private function locateAndSetRecipientProvider(string $alias, string $id): void
 
     /**
      * @throws FriendException|ProviderNotFoundException
+     *
      * @noinspection PhpParamsInspection
      */
     private function bailIfChecksFail(): void

src/Actions/Messages/EditMessage.php

@@ -157,10 +157,10 @@ private function handle(string $body): self
     private function generateResource(): void
     {
         $this->setJsonResource(new MessageResource(
-                $this->getMessage(),
-                $this->getThread(),
-                true
-            )
+            $this->getMessage(),
+            $this->getThread(),
+            true
+        )
         );
     }
 

src/Actions/Messages/NewMessageAction.php

@@ -179,10 +179,10 @@ protected function finalize(): void
     private function generateResource(): self
     {
         $this->setJsonResource(new MessageResource(
-                $this->getMessage(),
-                $this->getThread(),
-                true
-            )
+            $this->getMessage(),
+            $this->getThread(),
+            true
+        )
         );
 
         return $this;

src/Actions/Messenger/UpdateMessengerSettings.php

@@ -47,13 +47,13 @@ private function setOnlineCacheStatus(int $onlineStatus): void
         switch ($onlineStatus) {
             case 0:
                 $this->messenger->setProviderToOffline();
-            break;
+                break;
             case 1:
                 $this->messenger->setProviderToOnline();
-            break;
+                break;
             case 2:
                 $this->messenger->setProviderToAway();
-            break;
+                break;
         }
     }
 }

src/Actions/Threads/StoreGroupThread.php

@@ -153,6 +153,7 @@ private function creatorParticipant(): array
 
     /**
      * @param  array  $providers
+     *
      * @mixin StoreManyParticipants
      *
      * @return array

src/Broadcasting/Channels/CallChannel.php

@@ -31,7 +31,7 @@ public function __construct(Messenger $messenger)
     /**
      * Authenticate the provider's access to the channel.
      *
-     * @param $user
+     * @param  $user
      * @param  Thread  $thread
      * @param  Call  $call
      * @return ProviderResource

src/Broadcasting/Channels/ProviderChannel.php

@@ -24,7 +24,7 @@ public function __construct(Messenger $messenger)
     /**
      * Authenticate the provider's access to the channel.
      *
-     * @param $user
+     * @param  $user
      * @param  string|null  $alias
      * @param  string|null  $id
      * @return bool

src/Broadcasting/Channels/ThreadChannel.php

@@ -30,7 +30,7 @@ public function __construct(Messenger $messenger)
     /**
      * Authenticate the provider's access to the channel.
      *
-     * @param $user
+     * @param  $user
      * @param  Thread  $thread
      * @return ProviderResource
      *

src/Brokers/FriendBroker.php

@@ -219,7 +219,7 @@ private function getProviderSentFriendsBuilder(): Builder
     }
 
     /**
-     * @param $model
+     * @param  $model
      * @return Friend|null
      */
     private function getFriend($model): ?Friend
@@ -232,7 +232,7 @@ private function getFriend($model): ?Friend
     }
 
     /**
-     * @param $model
+     * @param  $model
      * @return SentFriend|null
      */
     private function getSentFriend($model): ?SentFriend
@@ -245,7 +245,7 @@ private function getSentFriend($model): ?SentFriend
     }
 
     /**
-     * @param $model
+     * @param  $model
      * @return PendingFriend|null
      */
     private function getPendingFriend($model): ?PendingFriend

src/Contracts/Ownerable.php

@@ -9,6 +9,7 @@
  * @property string|int $owner_id
  * @property string $owner_type
  * @property-read Model|MessengerProvider $owner
+ *
  * @mixin Model|\Eloquent
  */
 interface Ownerable

src/Exceptions/Handler.php

@@ -66,8 +66,8 @@ public function renderForConsole($output, Throwable $e): void
     }
 
     /**
-     * @param $method
-     * @param $parameters
+     * @param  $method
+     * @param  $parameters
      * @return mixed
      */
     public function __call($method, $parameters)

src/Http/Collections/AudioMessageCollection.php

@@ -12,7 +12,7 @@ class AudioMessageCollection extends MessengerCollection
     /**
      * AudioMessageCollection constructor.
      *
-     * @param $resource
+     * @param  $resource
      * @param  Thread  $thread
      * @param  bool  $paginate
      * @param  string|null  $pageId

src/Http/Collections/CallCollection.php

@@ -12,7 +12,7 @@ class CallCollection extends MessengerCollection
     /**
      * CallCollection constructor.
      *
-     * @param $resource
+     * @param  $resource
      * @param  Thread  $thread
      * @param  bool  $paginate
      * @param  string|null  $pageId

src/Http/Collections/DocumentMessageCollection.php

@@ -12,7 +12,7 @@ class DocumentMessageCollection extends MessengerCollection
     /**
      * DocumentMessageCollection constructor.
      *
-     * @param $resource
+     * @param  $resource
      * @param  Thread  $thread
      * @param  bool  $paginate
      * @param  string|null  $pageId

src/Http/Collections/GroupThreadCollection.php

@@ -12,7 +12,7 @@ class GroupThreadCollection extends MessengerCollection
     /**
      * GroupThreadCollection constructor.
      *
-     * @param $resource
+     * @param  $resource
      * @param  bool  $paginate
      * @param  string|null  $pageId
      */

src/Http/Collections/ImageMessageCollection.php

@@ -12,7 +12,7 @@ class ImageMessageCollection extends MessengerCollection
     /**
      * ImagesCollection constructor.
      *
-     * @param $resource
+     * @param  $resource
      * @param  Thread  $thread
      * @param  bool  $paginate
      * @param  string|null  $pageId

src/Http/Collections/InviteCollection.php

@@ -13,7 +13,7 @@ class InviteCollection extends MessengerCollection
     /**
      * InviteCollection constructor.
      *
-     * @param $resource
+     * @param  $resource
      * @param  Thread  $thread
      */
     public function __construct($resource, Thread $thread)

src/Http/Collections/MessageCollection.php

@@ -12,7 +12,7 @@ class MessageCollection extends MessengerCollection
     /**
      * MessageCollection constructor.
      *
-     * @param $resource
+     * @param  $resource
      * @param  Thread  $thread
      * @param  bool  $paginate
      * @param  string|null  $pageId

src/Http/Collections/MessengerCollection.php

@@ -270,37 +270,37 @@ protected function isFinalPage(): bool
         switch ($this->collectionType) {
             case 'threads':
                 $model = app(ThreadRepository::class)->getProviderOldestThread();
-            break;
+                break;
             case 'groups':
                 $model = app(GroupThreadRepository::class)->getProviderOldestGroupThread();
-            break;
+                break;
             case 'privates':
                 $model = app(PrivateThreadRepository::class)->getProviderOldestPrivateThread();
-            break;
+                break;
             case 'participants':
                 $model = $this->thread->participants()->latest()->first();
-            break;
+                break;
             case 'messages':
                 $model = $this->thread->messages()->oldest()->first();
-            break;
+                break;
             case 'calls':
                 $model = $this->thread->calls()->videoCall()->oldest()->first();
-            break;
+                break;
             case 'logs':
                 $model = $this->thread->messages()->system()->oldest()->first();
-            break;
+                break;
             case 'images':
                 $model = $this->thread->messages()->image()->oldest()->first();
-            break;
+                break;
             case 'audio':
                 $model = $this->thread->messages()->audio()->oldest()->first();
-            break;
+                break;
             case 'documents':
                 $model = $this->thread->messages()->document()->oldest()->first();
-            break;
+                break;
             case 'videos':
                 $model = $this->thread->messages()->video()->oldest()->first();
-            break;
+                break;
         }
 
         return (bool) $this->collection->firstWhere('id', optional($model)->getKey());

src/Http/Collections/ParticipantCollection.php

@@ -12,7 +12,7 @@ class ParticipantCollection extends MessengerCollection
     /**
      * ParticipantCollection constructor.
      *
-     * @param $resource
+     * @param  $resource
      * @param  Thread  $thread
      * @param  bool  $paginate
      * @param  string|null  $pageId

src/Http/Collections/PrivateThreadCollection.php

@@ -12,7 +12,7 @@ class PrivateThreadCollection extends MessengerCollection
     /**
      * GroupThreadCollection constructor.
      *
-     * @param $resource
+     * @param  $resource
      * @param  bool  $paginate
      * @param  string|null  $pageId
      */

src/Http/Collections/SearchCollection.php

@@ -27,7 +27,7 @@ class SearchCollection extends MessengerCollection
     /**
      * SearchCollection constructor.
      *
-     * @param $resource
+     * @param  $resource
      * @param  null  $searchQuery
      * @param  array|null  $searchQueryItems
      * @param  bool  $addOptions

src/Http/Collections/SystemMessageCollection.php

@@ -12,7 +12,7 @@ class SystemMessageCollection extends MessengerCollection
     /**
      * SystemMessageCollection constructor.
      *
-     * @param $resource
+     * @param  $resource
      * @param  Thread  $thread
      * @param  bool  $paginate
      * @param  string|null  $pageId

src/Http/Collections/ThreadCollection.php

@@ -12,7 +12,7 @@ class ThreadCollection extends MessengerCollection
     /**
      * ThreadCollection constructor.
      *
-     * @param $resource
+     * @param  $resource
      * @param  bool  $paginate
      * @param  string|null  $pageId
      */

src/Http/Collections/VideoMessageCollection.php

@@ -12,7 +12,7 @@ class VideoMessageCollection extends MessengerCollection
     /**
      * VideoMessageCollection constructor.
      *
-     * @param $resource
+     * @param  $resource
      * @param  Thread  $thread
      * @param  bool  $paginate
      * @param  string|null  $pageId

src/Messenger.php

@@ -309,7 +309,7 @@ public function flush(): void
     }
 
     /**
-     * @param $provider
+     * @param  $provider
      * @return Model|string|null
      */
     private function getClassNameString($provider = null): ?string

src/MessengerBots.php

@@ -242,7 +242,7 @@ public function findHandler(?string $handlerOrAlias = null): ?string
         }
 
         return $this->handlers->search(
-            fn (BotActionHandlerDTO $handler) =>  $handler->alias === $handlerOrAlias
+            fn (BotActionHandlerDTO $handler) => $handler->alias === $handlerOrAlias
         ) ?: null;
     }
 
@@ -406,7 +406,7 @@ public function findPackagedBot(?string $packageOrAlias = null): ?string
         }
 
         return $this->packagedBots->search(
-            fn (PackagedBotDTO $package) =>  $package->alias === $packageOrAlias
+            fn (PackagedBotDTO $package) => $package->alias === $packageOrAlias
         ) ?: null;
     }