Sync Laravel updates: cross-disk transfers, Eloquent and cache fixes

src/bus/src/Batch.php

@@ -90,8 +90,8 @@ public function add(array|object $jobs): ?Batch
 
             $this->queue->connection($this->options['connection'] ?? null)->bulk(
                 $jobs->all(),
-                $data = '',
-                $this->options['queue'] ?? null
+                data: '',
+                queue: $this->options['queue'] ?? null
             );
         });
 

src/cache/src/AnyModeTaggedCache.php

@@ -126,7 +126,7 @@ public function pull(UnitEnum|string $key, mixed $default = null): mixed
      *
      * @throws BadMethodCallException always - tags are for writing and flushing only
      */
-    public function forget(UnitEnum|string $key): bool
+    public function forget(array|UnitEnum|string $key): bool
     {
         throw new BadMethodCallException(
             'Cannot forget items via tags in any mode. Tags are for writing and flushing only. '

src/cache/src/Repository.php

@@ -105,6 +105,16 @@ public function __construct(Store $store, array $config = [])
      */
     public function has(array|UnitEnum|string $key): bool
     {
+        if (is_array($key)) {
+            $keys = [];
+
+            foreach ($key as $name => $value) {
+                $keys[] = is_string($name) ? $name : $value;
+            }
+
+            return ! in_array(null, $this->many($keys), true);
+        }
+
         return ! is_null($this->get($key));
     }
 
@@ -807,8 +817,12 @@ public function funnel(UnitEnum|string $name): ConcurrencyLimiterBuilder
     /**
      * Remove an item from the cache.
      */
-    public function forget(UnitEnum|string $key): bool
+    public function forget(array|UnitEnum|string $key): bool
     {
+        if (is_array($key)) {
+            return $this->deleteMultiple($key);
+        }
+
         $key = $key instanceof UnitEnum ? (string) enum_value($key) : $key;
 
         if ($this->events?->hasListeners(ForgettingKey::class)) {

src/collections/src/Collection.php

@@ -226,7 +226,7 @@ public function containsStrict(mixed $key, mixed $value = null): bool
         }
 
         if ($this->useAsCallable($key)) {
-            return ! is_null($this->first($key));
+            return array_any($this->items, $key);
         }
 
         return in_array($key, $this->items, true);

src/collections/src/LazyCollection.php

@@ -318,7 +318,9 @@ public function containsStrict(mixed $key, mixed $value = null): bool
         }
 
         if ($this->useAsCallable($key)) {
-            return ! is_null($this->first($key));
+            $placeholder = new stdClass;
+
+            return $this->first($key, $placeholder) !== $placeholder;
         }
 
         foreach ($this as $item) {

src/collections/src/Traits/EnumeratesValues.php

@@ -50,6 +50,7 @@
  * @property-read HigherOrderCollectionProxy<'reject', TValue, static> $reject
  * @property-read HigherOrderCollectionProxy<'skipUntil', TValue, static> $skipUntil
  * @property-read HigherOrderCollectionProxy<'skipWhile', TValue, static> $skipWhile
+ * @property-read HigherOrderCollectionProxy<'sole', TValue, static> $sole
  * @property-read HigherOrderCollectionProxy<'some', TValue, static> $some
  * @property-read HigherOrderCollectionProxy<'sortBy', TValue, static> $sortBy
  * @property-read HigherOrderCollectionProxy<'sortByDesc', TValue, static> $sortByDesc
@@ -96,6 +97,7 @@ trait EnumeratesValues
         'reject',
         'skipUntil',
         'skipWhile',
+        'sole',
         'some',
         'sortBy',
         'sortByDesc',

src/console/src/Concerns/InteractsWithIO.php

@@ -146,7 +146,7 @@ public function ask(string $question, ?string $default = null): mixed
     /**
      * Prompt the user for input with auto completion.
      *
-     * @param (callable(string): string[])|iterable $choices
+     * @param (callable(string): list<string>)|iterable $choices
      */
     public function anticipate(string $question, iterable|callable $choices, ?string $default = null): mixed
     {
@@ -156,7 +156,7 @@ public function anticipate(string $question, iterable|callable $choices, ?string
     /**
      * Prompt the user for input with auto completion.
      *
-     * @param (callable(string): string[])|iterable $choices
+     * @param (callable(string): list<string>)|iterable $choices
      */
     public function askWithCompletion(string $question, iterable|callable $choices, ?string $default = null): mixed
     {

src/contracts/src/Cache/Repository.php

@@ -180,7 +180,7 @@ public function touch(UnitEnum|string $key, DateInterval|DateTimeInterface|int $
     /**
      * Remove an item from the cache.
      */
-    public function forget(UnitEnum|string $key): bool;
+    public function forget(array|UnitEnum|string $key): bool;
 
     /**
      * Get the cache store implementation.

src/database/src/Connection.php

@@ -496,6 +496,7 @@ public function withoutPretending(Closure $callback): mixed
     /**
      * Execute the given callback in "dry run" mode.
      *
+     * @param (Closure(): (array{query: string, bindings: array, time: null|float}[])) $callback
      * @return array{query: string, bindings: array, time: null|float}[]
      */
     protected function withFreshQueryLog(Closure $callback): array

src/database/src/Eloquent/Builder.php

@@ -2015,6 +2015,16 @@ public function qualifyColumn(Expression|string $column): string
     {
         $column = $column instanceof Expression ? $column->getValue($this->getGrammar()) : $column;
 
+        if (! is_null($alias = $this->getTableAlias())) {
+            if (! str_contains($column, '.')) {
+                return $alias . '.' . $column;
+            }
+
+            if (str_starts_with($column, $table = $this->model->getTable() . '.')) {
+                return $alias . '.' . substr($column, strlen($table));
+            }
+        }
+
         return $this->model->qualifyColumn($column);
     }
 
@@ -2023,7 +2033,21 @@ public function qualifyColumn(Expression|string $column): string
      */
     public function qualifyColumns(array $columns): array
     {
-        return $this->model->qualifyColumns($columns);
+        $qualified = [];
+
+        foreach ($columns as $key => $column) {
+            $qualified[$key] = $this->qualifyColumn($column);
+        }
+
+        return $qualified;
+    }
+
+    /**
+     * Get the alias or table name that qualifies the query's source columns.
+     */
+    protected function getTableAlias(): ?string
+    {
+        return $this->query->getFromAlias();
     }
 
     /**

src/database/src/Eloquent/Concerns/HasAttributes.php

@@ -522,11 +522,13 @@ protected function throwMissingAttributeExceptionIfApplicable(string $key): mixe
             && ! $this->wasRecentlyCreated
             && static::preventsAccessingMissingAttributes()
             && ! CoroutineContext::get(self::MISSING_ATTRIBUTE_ACCESS_SUPPRESSED_CONTEXT_KEY, false)) {
+            $exception = new MissingAttributeException($this, $key);
+
             if (isset(static::$missingAttributeViolationCallback)) {
-                return call_user_func(static::$missingAttributeViolationCallback, $this, $key);
+                return call_user_func(static::$missingAttributeViolationCallback, $this, $key, $exception);
             }
 
-            throw new MissingAttributeException($this, $key);
+            throw $exception;
         }
 
         return null;
@@ -600,15 +602,22 @@ public function isRelation(string $key): bool
      */
     protected function handleLazyLoadingViolation(string $key): mixed
     {
+        $exception = new LazyLoadingViolationException($this, $key);
+
         if (isset(static::$lazyLoadingViolationCallback)) {
-            return call_user_func(static::$lazyLoadingViolationCallback, $this, $key);
+            return call_user_func(
+                static::$lazyLoadingViolationCallback,
+                $this,
+                $key,
+                $exception
+            );
         }
 
         if (! $this->exists || $this->wasRecentlyCreated) {
             return null;
         }
 
-        throw new LazyLoadingViolationException($this, $key);
+        throw $exception;
     }
 
     /**
@@ -1981,7 +1990,7 @@ public function getOriginal(?string $key = null, mixed $default = null): mixed
     {
         return (new static)->setRawAttributes(
             $this->original,
-            $sync = true
+            sync: true
         )->getOriginalWithoutRewindingModel($key, $default);
     }
 

src/database/src/Eloquent/Factories/Factory.php

@@ -209,6 +209,10 @@ public function raw(callable|array $attributes = [], ?Model $parent = null): arr
             return $this->state($attributes)->getExpandedAttributes($parent);
         }
 
+        if ($this->count < 1) {
+            return [];
+        }
+
         return array_map(function () use ($attributes, $parent) {
             return $this->state($attributes)->getExpandedAttributes($parent);
         }, range(1, $this->count));

src/database/src/Eloquent/MassPrunable.php

@@ -15,17 +15,16 @@ trait MassPrunable
      */
     public function pruneAll(int $chunkSize = 1000): int
     {
-        $query = tap($this->prunable(), function ($query) use ($chunkSize) {
-            $query->when(! $query->getQuery()->limit, function ($query) use ($chunkSize) {
-                $query->limit($chunkSize);
-            });
+        $softDeletable = static::isSoftDeletable();
+
+        $query = tap($this->prunable(), function (Builder $query) use ($chunkSize, $softDeletable): void {
+            $query->when($softDeletable, fn (Builder $query): Builder => $query->withTrashed())
+                ->when(! $query->getQuery()->limit, fn (Builder $query): Builder => $query->limit($chunkSize));
         });
 
         $total = 0;
         $events = null;
 
-        $softDeletable = static::isSoftDeletable();
-
         do {
             $total += $count = $softDeletable
                 ? $query->forceDelete()

src/database/src/Eloquent/Model.php

@@ -36,6 +36,7 @@
 use Hypervel\Database\Eloquent\Relations\HasManyThrough;
 use Hypervel\Database\Eloquent\Relations\Pivot;
 use Hypervel\Database\Eloquent\Relations\Relation;
+use Hypervel\Database\LazyLoadingViolationException;
 use Hypervel\Database\Query\Builder as QueryBuilder;
 use Hypervel\Engine\Coroutine;
 use Hypervel\Support\Arr;
@@ -228,9 +229,9 @@ abstract class Model implements Arrayable, ArrayAccess, CanBeEscapedWhenCastToSt
     /**
      * The callback that is responsible for handling lazy loading violations.
      *
-     * @var null|(callable(self, string): mixed)
+     * @var null|(callable(self, string, LazyLoadingViolationException): mixed)
      */
-    protected static $lazyLoadingViolationCallback;
+    protected static mixed $lazyLoadingViolationCallback = null;
 
     /**
      * Indicates if an exception should be thrown instead of silently discarding non-fillable attributes.
@@ -240,9 +241,9 @@ abstract class Model implements Arrayable, ArrayAccess, CanBeEscapedWhenCastToSt
     /**
      * The callback that is responsible for handling discarded attribute violations.
      *
-     * @var null|(callable(self, array): mixed)
+     * @var null|(callable(self, array, MassAssignmentException): mixed)
      */
-    protected static $discardedAttributeViolationCallback;
+    protected static mixed $discardedAttributeViolationCallback = null;
 
     /**
      * Indicates if an exception should be thrown when trying to access a missing attribute on a retrieved model.
@@ -252,9 +253,9 @@ abstract class Model implements Arrayable, ArrayAccess, CanBeEscapedWhenCastToSt
     /**
      * The callback that is responsible for handling missing attribute violations.
      *
-     * @var null|(callable(self, string): mixed)
+     * @var null|(callable(self, string, MissingAttributeException): mixed)
      */
-    protected static $missingAttributeViolationCallback;
+    protected static mixed $missingAttributeViolationCallback = null;
 
     /**
      * Indicates if invalid value exceptions during implicit route model binding should be reported.
@@ -679,7 +680,7 @@ public static function automaticallyEagerLoadRelationships(bool $value = true):
      * Boot-only. The callback persists in a static property for the worker
      * lifetime and runs on every lazy-loading violation across all coroutines.
      *
-     * @param null|(callable(self, string): mixed) $callback
+     * @param null|(callable(self, string, LazyLoadingViolationException): mixed) $callback
      */
     public static function handleLazyLoadingViolationUsing(?callable $callback): void
     {
@@ -704,7 +705,7 @@ public static function preventSilentlyDiscardingAttributes(bool $value = true):
      * lifetime and runs on every discarded-attribute violation across all
      * coroutines.
      *
-     * @param null|(callable(self, array): mixed) $callback
+     * @param null|(callable(self, array, MassAssignmentException): mixed) $callback
      */
     public static function handleDiscardedAttributeViolationUsing(?callable $callback): void
     {
@@ -729,7 +730,7 @@ public static function preventAccessingMissingAttributes(bool $value = true): vo
      * lifetime and runs on every missing-attribute violation across all
      * coroutines.
      *
-     * @param null|(callable(self, string): mixed) $callback
+     * @param null|(callable(self, string, MissingAttributeException): mixed) $callback
      */
     public static function handleMissingAttributeViolationUsing(?callable $callback): void
     {
@@ -796,14 +797,16 @@ public function fill(array $attributes): static
             if ($this->isFillable($key)) {
                 $this->setAttribute($key, $value);
             } elseif ($totallyGuarded || static::preventsSilentlyDiscardingAttributes()) {
+                $exception = new MassAssignmentException(sprintf(
+                    'Add [%s] to fillable property to allow mass assignment on [%s].',
+                    $key,
+                    get_class($this)
+                ));
+
                 if (isset(static::$discardedAttributeViolationCallback)) {
-                    call_user_func(static::$discardedAttributeViolationCallback, $this, [$key]);
+                    call_user_func(static::$discardedAttributeViolationCallback, $this, [$key], $exception);
                 } else {
-                    throw new MassAssignmentException(sprintf(
-                        'Add [%s] to fillable property to allow mass assignment on [%s].',
-                        $key,
-                        get_class($this)
-                    ));
+                    throw $exception;
                 }
             }
         }
@@ -812,14 +815,16 @@ public function fill(array $attributes): static
             && static::preventsSilentlyDiscardingAttributes()) {
             $keys = array_diff(array_keys($attributes), array_keys($fillable));
 
+            $exception = new MassAssignmentException(sprintf(
+                'Add fillable property [%s] to allow mass assignment on [%s].',
+                implode(', ', $keys),
+                get_class($this)
+            ));
+
             if (isset(static::$discardedAttributeViolationCallback)) {
-                call_user_func(static::$discardedAttributeViolationCallback, $this, $keys);
+                call_user_func(static::$discardedAttributeViolationCallback, $this, $keys, $exception);
             } else {
-                throw new MassAssignmentException(sprintf(
-                    'Add fillable property [%s] to allow mass assignment on [%s].',
-                    implode(', ', $keys),
-                    get_class($this)
-                ));
+                throw $exception;
             }
         }
 
@@ -2016,12 +2021,7 @@ public function newEloquentBuilder(QueryBuilder $query): Builder
      */
     protected function resolveCustomBuilderClass(): string|false
     {
-        $attributes = (new ReflectionClass($this))
-            ->getAttributes(UseEloquentBuilder::class);
-
-        return ! empty($attributes)
-            ? $attributes[0]->newInstance()->builderClass
-            : false;
+        return static::resolveClassAttribute(UseEloquentBuilder::class, 'builderClass') ?? false;
     }
 
     /**