Sync Laravel updates: #58017 → #58251

.github/workflows/release.yml

@@ -58,10 +58,14 @@ jobs:
               core.setFailed('Workflow failed. Release version does not match with selected target branch. Did you select the correct branch?')
 
       - name: Update Application.php version
-        run: sed -i "s/const VERSION = '.*';/const VERSION = '${{ steps.version.outputs.version }}';/g" src/foundation/src/Application.php
+        run: |
+          sed -i "s/const string VERSION = '.*';/const string VERSION = '${VERSION}';/g" src/foundation/src/Application.php
+          grep -Fq -- "const string VERSION = '${VERSION}';" src/foundation/src/Application.php
+        env:
+          VERSION: ${{ steps.version.outputs.version }}
 
       - name: Commit version change
-        uses: stefanzweifel/git-auto-commit-action@v5
+        uses: stefanzweifel/git-auto-commit-action@4a55954c782fc1ea30b9056cd3e7a2b40ca8887d # v7.2.0
         with:
           commit_message: "Update version to v${{ steps.version.outputs.version }}"
 

README.md

@@ -1,7 +1,7 @@
 <p align="center"><a href="https://hypervel.org" target="_blank"><img src="https://hypervel.org/logo.png" width="400"></a></p>
 
 <p align="center">
-<a href="https://github.com/hypervel/components/actions"><img src="https://github.com/hypervel/components/workflows/tests/badge.svg" alt="Build Status"></a>
+<a href="https://github.com/hypervel/components/actions"><img src="https://github.com/hypervel/components/actions/workflows/tests.yml/badge.svg" alt="Build Status"></a>
 <a href="https://packagist.org/packages/hypervel/components"><img src="https://img.shields.io/packagist/dt/hypervel/framework" alt="Total Downloads"></a>
 <a href="https://packagist.org/packages/hypervel/components"><img src="https://img.shields.io/packagist/v/hypervel/components" alt="Latest Stable Version"></a>
 <a href="https://packagist.org/packages/hypervel/components"><img src="https://img.shields.io/packagist/l/hypervel/components" alt="License"></a>

bin/release.sh

@@ -18,7 +18,7 @@ fi
 
 # Initialize variables
 NOW=$(date +%s)
-RELEASE_BRANCH="0.3"
+RELEASE_BRANCH="0.4"
 CURRENT_BRANCH=$(git rev-parse --abbrev-ref HEAD)
 BASEPATH=$(cd `dirname $0`; cd ../src/; pwd)
 VERSION=$1
@@ -106,4 +106,4 @@ done
 
 TIME=$(echo "$(date +%s) - $NOW" | bc)
 
-printf "Execution time: %f seconds" $TIME
+printf "Execution time: %f seconds" $TIME

src/auth/src/Recaller.php

@@ -21,7 +21,8 @@ class Recaller
      */
     public function __construct(string $recaller)
     {
-        $this->recaller = @unserialize($recaller, ['allowed_classes' => false]) ?: $recaller;
+        // Cookie middleware owns serialization; legacy cookie decoding is intentionally omitted.
+        $this->recaller = $recaller;
         $this->segments = explode('|', $this->recaller);
     }
 

src/broadcasting/src/AnonymousEvent.php

@@ -8,6 +8,7 @@
 use Hypervel\Contracts\Support\Arrayable;
 use Hypervel\Foundation\Events\Dispatchable;
 use Hypervel\Support\Arr;
+use Hypervel\Support\Collection;
 
 class AnonymousEvent implements ShouldBroadcast
 {
@@ -75,7 +76,7 @@ public function with(array|Arrayable $payload): static
     {
         $this->payload = $payload instanceof Arrayable
             ? $payload->toArray()
-            : collect($payload)->map(
+            : (new Collection($payload))->map(
                 fn ($p) => $p instanceof Arrayable ? $p->toArray() : $p
             )->all();
 

src/cache/src/DatabaseLock.php

@@ -33,8 +33,10 @@ class DatabaseLock extends Lock implements RefreshableLock
 
     /**
      * The prune probability odds.
+     *
+     * @var null|array{int, int}|array{}
      */
-    protected array $lottery;
+    protected ?array $lottery;
 
     /**
      * The default number of seconds that a lock should be held.
@@ -43,6 +45,8 @@ class DatabaseLock extends Lock implements RefreshableLock
 
     /**
      * Create a new lock instance.
+     *
+     * @param null|array{int, int}|array{} $lottery the prune probability odds, or null to disable automatic pruning
      */
     public function __construct(
         ConnectionResolverInterface $resolver,
@@ -51,7 +55,7 @@ public function __construct(
         string $table,
         int $seconds,
         ?string $owner = null,
-        array $lottery = [2, 100],
+        ?array $lottery = [2, 100],
         int $defaultTimeoutInSeconds = 86400
     ) {
         parent::__construct($name, $seconds, $owner);
@@ -73,6 +77,8 @@ protected function connection(): ConnectionInterface
 
     /**
      * Attempt to acquire the lock.
+     *
+     * @throws Throwable
      */
     public function acquire(): bool
     {
@@ -99,7 +105,7 @@ public function acquire(): bool
             $acquired = $updated >= 1;
         }
 
-        if (count($this->lottery) === 2 && random_int(1, $this->lottery[1]) <= $this->lottery[0]) {
+        if (count($this->lottery ?? []) === 2 && random_int(1, $this->lottery[1]) <= $this->lottery[0]) {
             $this->pruneExpiredLocks();
         }
 

src/collections/src/Collection.php

@@ -14,8 +14,10 @@
 use Hypervel\Support\Traits\Macroable;
 use Hypervel\Support\Traits\TransformsToResourceCollection;
 use InvalidArgumentException;
+use Override;
 use SortDirection;
 use stdClass;
+use Stringable as BaseStringable;
 use Traversable;
 use UnitEnum;
 
@@ -505,7 +507,18 @@ public function getOrPut(mixed $key, mixed $value): mixed
 
     /**
      * Group an associative array by a field or using a callback.
+     *
+     * @template TGroupKey of array-key|bool|null|UnitEnum|BaseStringable
+     *
+     * @param array|(callable(TValue, TKey): (array<array-key, TGroupKey>|TGroupKey))|string $groupBy
+     * @return static<
+     *  ($groupBy is (array|string)
+     *      ? array-key
+     *      : (TGroupKey is array-key ? TGroupKey : (TGroupKey is bool ? int : (TGroupKey is (BaseStringable|null) ? string : array-key)))),
+     *  static<($preserveKeys is true ? TKey : int), ($groupBy is array ? mixed : TValue)>
+     * >
      */
+    #[Override]
     public function groupBy(callable|array|string $groupBy, bool $preserveKeys = false): static
     {
         if (! $this->useAsCallable($groupBy) && is_array($groupBy)) {
@@ -529,7 +542,7 @@ public function groupBy(callable|array|string $groupBy, bool $preserveKeys = fal
                 $groupKey = match (true) {
                     is_bool($groupKey) => (int) $groupKey,
                     $groupKey instanceof UnitEnum => enum_value($groupKey),
-                    $groupKey instanceof \Stringable => (string) $groupKey,
+                    $groupKey instanceof BaseStringable => (string) $groupKey,
                     is_null($groupKey) => (string) $groupKey,
                     default => $groupKey,
                 };
@@ -554,13 +567,8 @@ public function groupBy(callable|array|string $groupBy, bool $preserveKeys = fal
 
     /**
      * Key an associative array by a field or using a callback.
-     *
-     * @template TNewKey of array-key|\UnitEnum
-     *
-     * @param array|(callable(TValue, TKey): TNewKey)|string $keyBy
-     * @return static<($keyBy is (array|string) ? array-key : (TNewKey is UnitEnum ? array-key : TNewKey)), TValue>
-     * @phpstan-ignore method.childReturnType (complex conditional types PHPStan can't match)
      */
+    #[Override]
     public function keyBy(callable|array|string $keyBy): static
     {
         $keyBy = $this->valueRetriever($keyBy);
@@ -1572,7 +1580,7 @@ protected function sortByMany(array $comparisons = [], int $options = SORT_REGUL
                         }
                     } else {
                         $result = match ($options) {
-                            SORT_NUMERIC => (int) $values[0] <=> (int) $values[1],
+                            SORT_NUMERIC => (float) $values[0] <=> (float) $values[1],
                             SORT_STRING => strcmp((string) $values[0], (string) $values[1]),
                             SORT_NATURAL => strnatcmp((string) $values[0], (string) $values[1]),
                             SORT_LOCALE_STRING => strcoll((string) $values[0], (string) $values[1]),
@@ -1816,9 +1824,9 @@ public function count(): int
     /**
      * Count the number of items in the collection by a field or using a callback.
      *
-     * @param null|(callable(TValue, TKey): (array-key|UnitEnum))|string $countBy
      * @return static<array-key, int>
      */
+    #[Override]
     public function countBy(callable|string|null $countBy = null): Collection
     {
         return $this->newInstance($this->lazy()->countBy($countBy)->all());

src/collections/src/Enumerable.php

@@ -15,8 +15,10 @@
 use JsonException;
 use JsonSerializable;
 use SortDirection;
+use Stringable as BaseStringable;
 use Traversable;
 use UnexpectedValueException;
+use UnitEnum;
 
 /**
  * Some transformations may return a base collection when an implementation
@@ -435,26 +437,25 @@ public function get(mixed $key, mixed $default = null): mixed;
     /**
      * Group an associative array by a field or using a callback.
      *
-     * @template TGroupKey of array-key|\UnitEnum|\Stringable
+     * @template TGroupKey of array-key|bool|null|UnitEnum|BaseStringable
      *
      * @param array|(callable(TValue, TKey): (array<array-key, TGroupKey>|TGroupKey))|string $groupBy
      * @return static<
      *  ($groupBy is (array|string)
      *      ? array-key
-     *      : (TGroupKey is \UnitEnum ? array-key : (TGroupKey is \Stringable ? string : TGroupKey))),
-     *  static<($preserveKeys is true ? TKey : int), ($groupBy is array ? mixed : TValue)>
+     *      : (TGroupKey is array-key ? TGroupKey : (TGroupKey is bool ? int : (TGroupKey is (BaseStringable|null) ? string : array-key)))),
+     *  Collection<($preserveKeys is true ? TKey : int), ($groupBy is array ? mixed : TValue)>
      * >
-     * @phpstan-ignore generics.notSubtype (PHPStan cannot prove normalized conditional group keys satisfy array-key)
      */
     public function groupBy(callable|array|string $groupBy, bool $preserveKeys = false): static;
 
     /**
      * Key an associative array by a field or using a callback.
      *
-     * @template TNewKey of array-key
+     * @template TNewKey of array-key|UnitEnum|BaseStringable
      *
      * @param array|(callable(TValue, TKey): TNewKey)|string $keyBy
-     * @return static<($keyBy is string ? array-key : ($keyBy is array ? array-key : TNewKey)), TValue>
+     * @return static<($keyBy is (array|string) ? array-key : (TNewKey is array-key ? TNewKey : (TNewKey is BaseStringable ? string : array-key))), TValue>
      */
     public function keyBy(callable|array|string $keyBy): static;
 
@@ -1085,8 +1086,8 @@ public function count(): int;
     /**
      * Count the number of items in the collection by a field or using a callback.
      *
-     * @param null|(callable(TValue, TKey): array-key)|string $countBy
-     * @return static<array-key, int>
+     * @param null|(callable(TValue, TKey): (array-key|bool|UnitEnum))|string $countBy
+     * @return Collection<array-key, int>|static<array-key, int>
      */
     public function countBy(callable|string|null $countBy = null): Collection|static;
 

src/collections/src/LazyCollection.php

@@ -354,9 +354,9 @@ public function crossJoin(Arrayable|iterable ...$arrays): static
     /**
      * Count the number of items in the collection by a field or using a callback.
      *
-     * @param null|(callable(TValue, TKey): (array-key|UnitEnum))|string $countBy
      * @return static<array-key, int>
      */
+    #[Override]
     public function countBy(callable|string|null $countBy = null): static
     {
         $countBy = is_null($countBy)
@@ -557,13 +557,8 @@ public function groupBy(callable|array|string $groupBy, bool $preserveKeys = fal
 
     /**
      * Key an associative array by a field or using a callback.
-     *
-     * @template TNewKey of array-key|\UnitEnum
-     *
-     * @param array|(callable(TValue, TKey): TNewKey)|string $keyBy
-     * @return static<($keyBy is (array|string) ? array-key : (TNewKey is UnitEnum ? array-key : TNewKey)), TValue>
-     * @phpstan-ignore method.childReturnType (complex conditional return type PHPStan can't verify)
      */
+    #[Override]
     public function keyBy(callable|array|string $keyBy): static
     {
         return $this->newInstance(function () use ($keyBy) {

src/conditionable/README.md

@@ -0,0 +1,6 @@
+Conditionable for Hypervel
+===
+
+[![Ask DeepWiki](https://deepwiki.com/badge.svg)](https://deepwiki.com/hypervel/conditionable)
+
+Ported from: https://github.com/laravel/framework/tree/13.x/src/Illuminate/Conditionable

src/console/src/GeneratorCommand.php

@@ -485,10 +485,9 @@ protected function userProviderModel(): ?string
      */
     protected function isReservedName(string $name): bool
     {
-        return in_array(
-            strtolower($name),
-            array_map('strtolower', $this->reservedNames)
-        );
+        $name = strtolower($name);
+
+        return array_any($this->reservedNames, fn ($reservedName) => strtolower($reservedName) === $name);
     }
 
     /**

src/database/src/Connection.php

@@ -215,6 +215,7 @@ public function __construct(string $database = '', string $tablePrefix = '', arr
         $this->configuredTablePrefix = $tablePrefix;
 
         $this->config = $config;
+        $this->config['mask_bindings_in_exception_messages'] = (bool) ($config['mask_bindings_in_exception_messages'] ?? false);
 
         $this->readWriteType = $config[self::READ_WRITE_TYPE_CONFIG_KEY] ?? null;
 
@@ -616,8 +617,8 @@ protected function runQueryCallback(string $query, array $bindings, Closure $cal
         }
 
         // If an exception occurs when attempting to run a query, we'll format the error
-        // message to include the bindings with SQL, which will make this exception a
-        // lot more helpful to the developer instead of just the database's errors.
+        // message to include the SQL and, unless masked, its bindings. This provides
+        // more context for the developer than just the database's original error.
         catch (CanceledException $exception) {
             throw $exception;
         } catch (Exception $e) {
@@ -634,6 +635,7 @@ protected function runQueryCallback(string $query, array $bindings, Closure $cal
                 $e,
                 $this->getConnectionDetails(),
                 $this->latestReadWriteTypeUsed(),
+                $this->getConfig('mask_bindings_in_exception_messages'),
             );
 
             if ($isUniqueConstraintError && $queryException instanceof UniqueConstraintViolationException) {

src/database/src/Eloquent/Collection.php

@@ -653,7 +653,7 @@ public function makeHidden(array|string $attributes): static
     public function mergeHidden(array|string $attributes): static
     {
         // @phpstan-ignore return.type (HigherOrderProxy returns $this, not TModel)
-        return $this->each->mergeHidden($attributes);
+        return $this->each->mergeHidden((array) $attributes);
     }
 
     /**
@@ -686,7 +686,7 @@ public function makeVisible(array|string $attributes): static
     public function mergeVisible(array|string $attributes): static
     {
         // @phpstan-ignore return.type (HigherOrderProxy returns $this, not TModel)
-        return $this->each->mergeVisible($attributes);
+        return $this->each->mergeVisible((array) $attributes);
     }
 
     /**
@@ -993,7 +993,7 @@ public function toQuery(): Builder
 
         $class = get_class($model);
 
-        if ($this->reject(fn ($model) => $model instanceof $class)->isNotEmpty()) {
+        if ($this->contains(fn ($model) => ! $model instanceof $class)) {
             throw new LogicException('Unable to create query for collection with mixed types.');
         }