Correct framework types and small Laravel fixes

src/auth/src/Authenticatable.php

@@ -71,7 +71,7 @@ public function getRememberToken(): ?string
     /**
      * Set the token value for the "remember me" session.
      */
-    public function setRememberToken(string $value): void
+    public function setRememberToken(?string $value): void
     {
         if (! empty($this->getRememberTokenName())) {
             $this->{$this->getRememberTokenName()} = $value;

src/auth/src/GenericUser.php

@@ -45,7 +45,7 @@ public function getAuthPasswordName(): string
      */
     public function getAuthPassword(): ?string
     {
-        return $this->attributes[$this->getAuthPasswordName()];
+        return $this->attributes[$this->getAuthPasswordName()] ?? null;
     }
 
     /**
@@ -59,7 +59,7 @@ public function getRememberToken(): ?string
     /**
      * Set the "remember me" token value.
      */
-    public function setRememberToken(string $value): void
+    public function setRememberToken(?string $value): void
     {
         $this->attributes[$this->getRememberTokenName()] = $value;
     }

src/auth/src/Notifications/ResetPassword.php

@@ -10,6 +10,7 @@
 use Hypervel\Container\Container;
 use Hypervel\Context\CoroutineContext;
 use Hypervel\Contracts\Config\Repository as ConfigContract;
+use Hypervel\Contracts\Mail\Mailable;
 use Hypervel\Notifications\Messages\MailMessage;
 use Hypervel\Notifications\Notification;
 use Hypervel\Support\Facades\Lang;
@@ -29,7 +30,7 @@ class ResetPassword extends Notification
     /**
      * The callback that should be used to build the mail message.
      *
-     * @var null|(Closure(mixed, string): MailMessage)
+     * @var null|(Closure(mixed, string): (Mailable|MailMessage))
      */
     public static ?Closure $toMailCallback = null;
 
@@ -59,7 +60,7 @@ public function via(mixed $notifiable): array
     /**
      * Build the mail representation of the notification.
      */
-    public function toMail(mixed $notifiable): MailMessage
+    public function toMail(mixed $notifiable): MailMessage|Mailable
     {
         if (static::$toMailCallback) {
             return call_user_func(static::$toMailCallback, $notifiable, $this->token);
@@ -132,7 +133,7 @@ public static function createUrlUsing(Closure $callback): void
      * Boot-only. The callback persists in a static property for the worker
      * lifetime and runs on every reset-password notification.
      *
-     * @param Closure(mixed, string): MailMessage $callback
+     * @param Closure(mixed, string): (Mailable|MailMessage) $callback
      */
     public static function toMailUsing(Closure $callback): void
     {

src/auth/src/Notifications/VerifyEmail.php

@@ -5,6 +5,7 @@
 namespace Hypervel\Auth\Notifications;
 
 use Closure;
+use Hypervel\Contracts\Mail\Mailable;
 use Hypervel\Notifications\Messages\MailMessage;
 use Hypervel\Notifications\Notification;
 use Hypervel\Support\CarbonImmutable;
@@ -24,7 +25,7 @@ class VerifyEmail extends Notification
     /**
      * The callback that should be used to build the mail message.
      *
-     * @var null|(Closure(mixed, string): MailMessage)
+     * @var null|(Closure(mixed, string): (Mailable|MailMessage))
      */
     public static ?Closure $toMailCallback = null;
 
@@ -39,7 +40,7 @@ public function via(mixed $notifiable): array
     /**
      * Build the mail representation of the notification.
      */
-    public function toMail(mixed $notifiable): MailMessage
+    public function toMail(mixed $notifiable): MailMessage|Mailable
     {
         $verificationUrl = $this->verificationUrl($notifiable);
 
@@ -100,7 +101,7 @@ public static function createUrlUsing(Closure $callback): void
      * Boot-only. The callback persists in a static property for the worker
      * lifetime and runs on every email-verification notification.
      *
-     * @param Closure(mixed, string): MailMessage $callback
+     * @param Closure(mixed, string): (Mailable|MailMessage) $callback
      */
     public static function toMailUsing(Closure $callback): void
     {

src/auth/src/SessionGuard.php

@@ -315,7 +315,7 @@ public function basic(string $field = 'email', array $extraConditions = []): ?Re
             return null;
         }
 
-        return $this->failedBasicResponse();
+        $this->failedBasicResponse();
     }
 
     /**
@@ -328,7 +328,7 @@ public function onceBasic(string $field = 'email', array $extraConditions = []):
         $credentials = $this->basicCredentials($this->getRequest(), $field);
 
         if (! $this->once(array_merge($credentials, $extraConditions))) {
-            return $this->failedBasicResponse();
+            $this->failedBasicResponse();
         }
 
         return null;

src/broadcasting/src/AnonymousEvent.php

@@ -137,6 +137,8 @@ public function broadcastWith(): array
 
     /**
      * Get the channels the event should broadcast on.
+     *
+     * @return Channel|Channel[]|string[]
      */
     public function broadcastOn(): Channel|array
     {

src/collections/src/Collection.php

@@ -1440,7 +1440,7 @@ public function hasSole(callable|string|null $key = null, mixed $operator = null
     /**
      * Get the first item in the collection but throw an exception if no matching items exist.
      *
-     * @param (callable(TValue, TKey): bool)|string $key
+     * @param null|(callable(TValue, TKey): bool)|string $key
      * @return TValue
      *
      * @throws ItemNotFoundException

src/collections/src/Enumerable.php

@@ -713,7 +713,7 @@ public function nth(int $step, int $offset = 0): static;
     /**
      * Get the items with the specified keys.
      *
-     * @param array<array-key, TKey>|Enumerable<array-key, TKey>|string $keys
+     * @param null|array<array-key, TKey>|Enumerable<array-key, TKey>|string $keys
      */
     public function only(mixed $keys): static;
 
@@ -1034,7 +1034,8 @@ public function pipeThrough(array $pipes): mixed;
     /**
      * Get the values of a given key.
      *
-     * @param array<array-key, string>|string $value
+     * @param null|array<array-key, string>|Closure|int|string $value
+     * @param null|array<array-key, string>|Closure|int|string $key
      * @return static<array-key, mixed>
      */
     public function pluck(Closure|string|int|array|null $value, Closure|string|int|array|null $key = null): Collection|static;

src/collections/src/LazyCollection.php

@@ -740,6 +740,7 @@ public function last(?callable $callback = null, mixed $default = null): mixed
      * Get the values of a given key.
      *
      * @param null|array<array-key, string>|Closure|int|string $value
+     * @param null|array<array-key, string>|Closure|int|string $key
      * @return static<array-key, mixed>
      */
     public function pluck(Closure|string|int|array|null $value, Closure|string|int|array|null $key = null): static
@@ -1909,6 +1910,10 @@ protected function makeIterator(IteratorAggregate|Iterator|array|callable $sourc
 
     /**
      * Explode the "value" and "key" arguments passed to "pluck".
+     *
+     * @param null|array<array-key, string>|Closure|int|string $value
+     * @param null|array<array-key, string>|Closure|int|string $key
+     * @return array{null|array<array-key, string>|Closure|int, null|array<array-key, string>|Closure|int}
      */
     protected function explodePluckParameters(Closure|string|int|array|null $value, Closure|string|int|array|null $key): array
     {

src/console/src/Commands/ScheduleListCommand.php

@@ -118,6 +118,7 @@ protected function displayJson(Collection $events, DateTimeZone $timezone): void
                 'has_mutex' => $event->mutex->exists($event),
                 'repeat_seconds' => $event->isRepeatable() ? $event->repeatSeconds : null,
                 'environments' => $event->environments,
+                'on_one_server' => $event->onOneServer,
             ];
         })->values()->toJson(), OutputInterface::OUTPUT_RAW);
     }

src/container/src/Container.php

@@ -243,7 +243,7 @@ class Container implements ContainerContract
     /**
      * The callback used to determine the container's environment.
      *
-     * @var null|(callable(array<int, string>|string): bool|string)
+     * @var null|(callable(array<int, string>|string): (bool|string))
      */
     protected $environmentResolver;
 

src/contracts/src/Auth/Authenticatable.php

@@ -34,7 +34,7 @@ public function getRememberToken(): ?string;
     /**
      * Set the token value for the "remember me" session.
      */
-    public function setRememberToken(string $value): void;
+    public function setRememberToken(?string $value): void;
 
     /**
      * Get the column name for the "remember me" token.

src/contracts/src/Mail/Mailable.php

@@ -52,7 +52,7 @@ public function to(array|object|string $address, ?string $name = null): static;
      *
      * @return $this
      */
-    public function locale(string $locale): static;
+    public function locale(?string $locale): static;
 
     /**
      * Set the name of the mailer that should be used to send the message.

src/contracts/src/Support/DeferringDisplayableValue.php

@@ -9,5 +9,5 @@ interface DeferringDisplayableValue
     /**
      * Resolve the displayable value that the class is deferring.
      */
-    public function resolveDisplayableValue(): Htmlable|string;
+    public function resolveDisplayableValue(): mixed;
 }

src/database/src/Eloquent/Builder.php

@@ -1673,7 +1673,7 @@ public function with(array|string $relations, Closure|string|null $callback = nu
         if ($callback instanceof Closure) {
             $eagerLoad = $this->parseWithRelations([$relations => $callback]);
         } else {
-            $eagerLoad = $this->parseWithRelations(is_string($relations) ? func_get_args() : $relations);
+            $eagerLoad = $this->parseWithRelations(is_string($relations) ? array_filter(func_get_args()) : $relations);
         }
 
         $this->eagerLoad = array_merge($this->eagerLoad, $eagerLoad);

src/database/src/Eloquent/Casts/AsBinary.php

@@ -6,6 +6,7 @@
 
 use Hypervel\Contracts\Database\Eloquent\Castable;
 use Hypervel\Contracts\Database\Eloquent\CastsAttributes;
+use Hypervel\Database\Eloquent\Model;
 use Hypervel\Support\BinaryCodec;
 use InvalidArgumentException;
 
@@ -43,7 +44,7 @@ public function __construct(protected array $arguments)
             /**
              * Transform the attribute from the underlying model values.
              */
-            public function get(mixed $model, string $key, mixed $value, array $attributes): ?string
+            public function get(Model $model, string $key, mixed $value, array $attributes): ?string
             {
                 $attribute = $attributes[$key] ?? null;
 
@@ -61,7 +62,7 @@ public function get(mixed $model, string $key, mixed $value, array $attributes):
             /**
              * Transform the attribute to its underlying model values.
              */
-            public function set(mixed $model, string $key, mixed $value, array $attributes): array
+            public function set(Model $model, string $key, mixed $value, array $attributes): array
             {
                 return [$key => BinaryCodec::encode($value, $this->format)];
             }

src/database/src/Eloquent/Casts/AsHtmlString.php

@@ -6,6 +6,8 @@
 
 use Hypervel\Contracts\Database\Eloquent\Castable;
 use Hypervel\Contracts\Database\Eloquent\CastsAttributes;
+use Hypervel\Contracts\Database\Eloquent\SerializesCastableAttributes;
+use Hypervel\Database\Eloquent\Model;
 use Hypervel\Support\HtmlString;
 
 class AsHtmlString implements Castable
@@ -17,13 +19,27 @@ class AsHtmlString implements Castable
      */
     public static function castUsing(array $arguments): CastsAttributes
     {
-        return new class implements CastsAttributes {
-            public function get(mixed $model, string $key, mixed $value, array $attributes): ?HtmlString
+        return new class implements CastsAttributes, SerializesCastableAttributes {
+            /**
+             * Cast the stored value to an HTML string.
+             */
+            public function get(Model $model, string $key, mixed $value, array $attributes): ?HtmlString
             {
                 return isset($value) ? new HtmlString($value) : null;
             }
 
-            public function set(mixed $model, string $key, mixed $value, array $attributes): ?string
+            /**
+             * Prepare the HTML string for storage.
+             */
+            public function set(Model $model, string $key, mixed $value, array $attributes): ?string
+            {
+                return isset($value) ? (string) $value : null;
+            }
+
+            /**
+             * Serialize the HTML string for an array or JSON response.
+             */
+            public function serialize(Model $model, string $key, mixed $value, array $attributes): ?string
             {
                 return isset($value) ? (string) $value : null;
             }

src/database/src/Eloquent/Casts/AsStringable.php

@@ -6,6 +6,7 @@
 
 use Hypervel\Contracts\Database\Eloquent\Castable;
 use Hypervel\Contracts\Database\Eloquent\CastsAttributes;
+use Hypervel\Database\Eloquent\Model;
 use Hypervel\Support\Stringable;
 use Stringable as BaseStringable;
 
@@ -19,12 +20,18 @@ class AsStringable implements Castable
     public static function castUsing(array $arguments): CastsAttributes
     {
         return new class implements CastsAttributes {
-            public function get(mixed $model, string $key, mixed $value, array $attributes): ?Stringable
+            /**
+             * Cast the stored value to a stringable instance.
+             */
+            public function get(Model $model, string $key, mixed $value, array $attributes): ?Stringable
             {
                 return isset($value) ? new Stringable($value) : null;
             }
 
-            public function set(mixed $model, string $key, mixed $value, array $attributes): ?string
+            /**
+             * Prepare the stringable value for storage.
+             */
+            public function set(Model $model, string $key, mixed $value, array $attributes): ?string
             {
                 return isset($value) ? (string) $value : null;
             }

src/database/src/Eloquent/Casts/AsUri.php

@@ -6,6 +6,7 @@
 
 use Hypervel\Contracts\Database\Eloquent\Castable;
 use Hypervel\Contracts\Database\Eloquent\CastsAttributes;
+use Hypervel\Database\Eloquent\Model;
 use Hypervel\Support\Uri;
 
 class AsUri implements Castable
@@ -18,12 +19,18 @@ class AsUri implements Castable
     public static function castUsing(array $arguments): CastsAttributes
     {
         return new class implements CastsAttributes {
-            public function get(mixed $model, string $key, mixed $value, array $attributes): ?Uri
+            /**
+             * Cast the stored value to a URI.
+             */
+            public function get(Model $model, string $key, mixed $value, array $attributes): ?Uri
             {
                 return isset($value) ? new Uri($value) : null;
             }
 
-            public function set(mixed $model, string $key, mixed $value, array $attributes): ?string
+            /**
+             * Prepare the URI for storage.
+             */
+            public function set(Model $model, string $key, mixed $value, array $attributes): ?string
             {
                 return isset($value) ? (string) $value : null;
             }

src/database/src/Eloquent/Collection.php

@@ -257,7 +257,7 @@ public function loadMissing(array|string $relations): static
             $relations = func_get_args();
         }
 
-        if ($this->isNotEmpty()) {
+        if ($this->isNotEmpty() && $relations !== []) {
             $query = $this->first()->newQueryWithoutRelationships()->with($relations);
 
             foreach ($query->getEagerLoads() as $key => $value) {

src/database/src/Eloquent/Concerns/QueriesRelationships.php

@@ -699,7 +699,7 @@ protected function getMorphTypeForQuery(string $model): string
     /**
      * Add a "belongs to" relationship where clause to the query.
      *
-     * @param EloquentCollection<int, Model>|Model $related
+     * @param EloquentCollection<int, covariant Model>|Model $related
      *
      * @throws InvalidArgumentException
      * @throws RelationNotFoundException
@@ -743,6 +743,8 @@ public function whereBelongsTo(mixed $related, ?string $relationshipName = null,
 
     /**
      * Add a "BelongsTo" relationship with an "or where" clause to the query.
+     *
+     * @param EloquentCollection<int, covariant Model>|Model $related
      */
     public function orWhereBelongsTo(mixed $related, ?string $relationshipName = null): static
     {
@@ -752,7 +754,7 @@ public function orWhereBelongsTo(mixed $related, ?string $relationshipName = nul
     /**
      * Add a "belongs to many" relationship where clause to the query.
      *
-     * @param EloquentCollection<int, Model>|Model $related
+     * @param EloquentCollection<int, covariant Model>|Model $related
      *
      * @throws InvalidArgumentException
      * @throws RelationNotFoundException
@@ -793,6 +795,8 @@ public function whereAttachedTo(mixed $related, ?string $relationshipName = null
     /**
      * Add a "belongs to many" relationship with an "or where" clause to the query.
      *
+     * @param EloquentCollection<int, covariant Model>|Model $related
+     *
      * @throws RuntimeException
      */
     public function orWhereAttachedTo(mixed $related, ?string $relationshipName = null): static