Merge remote-tracking branch 'upstream/12.x'

Signed-off-by: Mior Muhammad Zaki <[email protected]>

Author: crynobone

.github/workflows/tests.yml

@@ -40,7 +40,7 @@ jobs:
       fail-fast: true
       matrix:
         php: [8.3, 8.4]
-        phpunit: ['10.5.35', '11.5.3', '12.0.0']
+        phpunit: ['10.5.35', '11.5.3', '12.0.0', '12.1.0']
         stability: [prefer-lowest, prefer-stable]
 
     name: PHP ${{ matrix.php }} - PHPUnit ${{ matrix.phpunit }} - ${{ matrix.stability }}
@@ -64,19 +64,12 @@ jobs:
       - name: Set Framework version
         run: composer config version "13.x-dev"
 
-      - name: Set PHPUnit
-        uses: nick-fields/retry@v3
-        with:
-          timeout_minutes: 5
-          max_attempts: 5
-          command: composer require phpunit/phpunit:^${{ matrix.phpunit }} --dev --no-interaction --no-update
-
       - name: Install dependencies
         uses: nick-fields/retry@v3
         with:
           timeout_minutes: 5
           max_attempts: 5
-          command: composer update --${{ matrix.stability }} --prefer-dist --no-interaction --no-progress
+          command: composer update --${{ matrix.stability }} --prefer-dist --no-interaction --no-progress --with="phpunit/phpunit:~${{ matrix.phpunit }}"
 
       - name: Execute tests
         run: vendor/bin/phpunit --display-deprecation ${{ matrix.stability == 'prefer-stable' && '--fail-on-deprecation' || '' }}
@@ -103,11 +96,8 @@ jobs:
       fail-fast: true
       matrix:
         php: [8.3, 8.4]
-        phpunit: ['11.5.3']
+        phpunit: ['10.5.35', '11.5.3', '12.0.0', '12.1.0']
         stability: [prefer-lowest, prefer-stable]
-        exclude:
-          - php: 8.4
-            stability: prefer-lowest
 
     name: PHP ${{ matrix.php }} - PHPUnit ${{ matrix.phpunit }} - ${{ matrix.stability }} - Windows
 
@@ -131,20 +121,12 @@ jobs:
       - name: Set Framework version
         run: composer config version "13.x-dev"
 
-      - name: Set PHPUnit
-        uses: nick-fields/retry@v3
-        with:
-          timeout_minutes: 5
-          max_attempts: 5
-          command: composer require phpunit/phpunit:^${{ matrix.phpunit }} --dev --no-interaction --no-update
-          shell: bash
-
       - name: Install dependencies
         uses: nick-fields/retry@v3
         with:
           timeout_minutes: 5
           max_attempts: 5
-          command: composer update --${{ matrix.stability }} --prefer-dist --no-interaction --no-progress
+          command: composer update --${{ matrix.stability }} --prefer-dist --no-interaction --no-progress --with="phpunit/phpunit:~${{ matrix.phpunit }}"
 
       - name: Execute tests
         run: vendor/bin/phpunit

CHANGELOG.md

@@ -1,6 +1,8 @@
 # Release Notes for 12.x
 
-## [Unreleased](https://github.com/laravel/framework/compare/v12.7.1...12.x)
+## [Unreleased](https://github.com/laravel/framework/compare/v12.7.2...12.x)
+
+## [v12.7.2](https://github.com/laravel/framework/compare/v12.7.1...v12.7.2) - 2025-04-03
 
 ## [v12.7.1](https://github.com/laravel/framework/compare/v12.7.0...v12.7.1) - 2025-04-03
 

src/Illuminate/Collections/Traits/EnumeratesValues.php

@@ -179,6 +179,19 @@ public static function times($number, ?callable $callback = null)
             ->map($callback);
     }
 
+    /**
+     * Create a new collection by decoding a JSON string.
+     *
+     * @param  string  $json
+     * @param  int  $depth
+     * @param  int  $flags
+     * @return static<TKey, TValue>
+     */
+    public static function fromJson($json, $depth = 512, $flags = 0)
+    {
+        return new static(json_decode($json, true, $depth, $flags));
+    }
+
     /**
      * Get the average value of a given key.
      *
@@ -1046,11 +1059,8 @@ public function __get($key)
      */
     protected function getArrayableItems($items)
     {
-        if (is_array($items)) {
-            return $items;
-        }
-
         return match (true) {
+            is_array($items) => $items,
             $items instanceof WeakMap => throw new InvalidArgumentException('Collections can not be created using instances of WeakMap.'),
             $items instanceof Enumerable => $items->all(),
             $items instanceof Arrayable => $items->toArray(),

src/Illuminate/Collections/Traits/TransformsToResourceCollection.php

@@ -3,7 +3,6 @@
 namespace Illuminate\Support\Traits;
 
 use Illuminate\Database\Eloquent\Model;
-use Illuminate\Http\Resources\Json\JsonResource;
 use Illuminate\Http\Resources\Json\ResourceCollection;
 use LogicException;
 
@@ -12,8 +11,8 @@ trait TransformsToResourceCollection
     /**
      * Create a new resource collection instance for the given resource.
      *
-     * @param  class-string<JsonResource>|null  $resourceClass
-     * @return ResourceCollection
+     * @param  class-string<\Illuminate\Http\Resources\Json\JsonResource>|null  $resourceClass
+     * @return \Illuminate\Http\Resources\Json\ResourceCollection
      *
      * @throws \Throwable
      */
@@ -29,7 +28,7 @@ public function toResourceCollection(?string $resourceClass = null): ResourceCol
     /**
      * Guess the resource collection for the items.
      *
-     * @return ResourceCollection
+     * @return \Illuminate\Http\Resources\Json\ResourceCollection
      *
      * @throws \Throwable
      */

src/Illuminate/Collections/composer.json

@@ -34,6 +34,7 @@
         }
     },
     "suggest": {
+        "illuminate/http": "Required to convert collections to API resources (^12.0).",
         "symfony/var-dumper": "Required to use the dump method (^7.2)."
     },
     "config": {

src/Illuminate/Http/Resources/TransformsToResource.php renamed to src/Illuminate/Database/Eloquent/Concerns/TransformsToResource.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Illuminate\Http\Resources;
+namespace Illuminate\Database\Eloquent\Concerns;
 
 use Illuminate\Http\Resources\Json\JsonResource;
 use Illuminate\Support\Str;
@@ -11,8 +11,8 @@ trait TransformsToResource
     /**
      * Create a new resource object for the given resource.
      *
-     * @param  class-string<JsonResource>|null  $resourceClass
-     * @return JsonResource
+     * @param  class-string<\Illuminate\Http\Resources\Json\JsonResource>|null  $resourceClass
+     * @return \Illuminate\Http\Resources\Json\JsonResource
      *
      * @throws \Throwable
      */
@@ -28,7 +28,7 @@ public function toResource(?string $resourceClass = null): JsonResource
     /**
      * Guess the resource class for the model.
      *
-     * @return JsonResource
+     * @return \Illuminate\Http\Resources\Json\JsonResource
      *
      * @throws \Throwable
      */
@@ -46,7 +46,7 @@ protected function guessResource(): JsonResource
     /**
      * Guess the resource class name for the model.
      *
-     * @return array<class-string<JsonResource>>
+     * @return array<class-string<\Illuminate\Http\Resources\Json\JsonResource>>
      */
     public static function guessResourceName(): array
     {

src/Illuminate/Database/Eloquent/MassPrunable.php

@@ -23,8 +23,10 @@ public function pruneAll(int $chunkSize = 1000)
 
         $total = 0;
 
+        $softDeletable = in_array(SoftDeletes::class, class_uses_recursive(get_class($this)));
+
         do {
-            $total += $count = in_array(SoftDeletes::class, class_uses_recursive(get_class($this)))
+            $total += $count = $softDeletable
                 ? $query->forceDelete()
                 : $query->delete();
 

src/Illuminate/Database/Eloquent/Model.php

@@ -17,7 +17,6 @@
 use Illuminate\Database\Eloquent\Relations\Concerns\AsPivot;
 use Illuminate\Database\Eloquent\Relations\HasManyThrough;
 use Illuminate\Database\Eloquent\Relations\Pivot;
-use Illuminate\Http\Resources\TransformsToResource;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Collection as BaseCollection;
 use Illuminate\Support\Str;
@@ -40,8 +39,8 @@ abstract class Model implements Arrayable, ArrayAccess, CanBeEscapedWhenCastToSt
         Concerns\HidesAttributes,
         Concerns\GuardsAttributes,
         Concerns\PreventsCircularRecursion,
-        ForwardsCalls,
-        TransformsToResource;
+        Concerns\TransformsToResource,
+        ForwardsCalls;
     /** @use HasCollection<\Illuminate\Database\Eloquent\Collection<array-key, static & self>> */
     use HasCollection;
 

src/Illuminate/Database/Eloquent/Relations/HasOneOrMany.php

@@ -436,6 +436,34 @@ public function createManyQuietly(iterable $records)
         return Model::withoutEvents(fn () => $this->createMany($records));
     }
 
+    /**
+     * Create a Collection of new instances of the related model, allowing mass-assignment.
+     *
+     * @param  iterable  $records
+     * @return \Illuminate\Database\Eloquent\Collection<int, TRelatedModel>
+     */
+    public function forceCreateMany(iterable $records)
+    {
+        $instances = $this->related->newCollection();
+
+        foreach ($records as $record) {
+            $instances->push($this->forceCreate($record));
+        }
+
+        return $instances;
+    }
+
+    /**
+     * Create a Collection of new instances of the related model, allowing mass-assignment and without raising any events to the parent model.
+     *
+     * @param  iterable  $records
+     * @return \Illuminate\Database\Eloquent\Collection<int, TRelatedModel>
+     */
+    public function forceCreateManyQuietly(iterable $records)
+    {
+        return Model::withoutEvents(fn () => $this->forceCreateMany($records));
+    }
+
     /**
      * Set the foreign ID for creating a related model.
      *

src/Illuminate/Database/Query/Grammars/Grammar.php

@@ -1203,7 +1203,7 @@ public function compileInsertOrIgnore(Builder $query, array $values)
      *
      * @param  \Illuminate\Database\Query\Builder  $query
      * @param  array  $values
-     * @param  string  $sequence
+     * @param  string|null  $sequence
      * @return string
      */
     public function compileInsertGetId(Builder $query, $values, $sequence)