Merge branch '9.x'

# Conflicts:
#	.github/workflows/tests.yml
#	CHANGELOG.md
#	src/Illuminate/Collections/Collection.php
#	src/Illuminate/Foundation/Application.php
#	src/Illuminate/Support/Stringable.php

Author: driesvints

.github/workflows/databases.yml

@@ -1,6 +1,11 @@
 name: databases
 
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - master
+      - '*.x'
+  pull_request:
 
 jobs:
   mysql_57:

.github/workflows/static-analysis.yml

@@ -2,9 +2,10 @@ name: static analysis
 
 on:
   push:
+    branches:
+      - master
+      - '*.x'
   pull_request:
-  schedule:
-    - cron: '0 0 * * *'
 
 jobs:
   src:

.github/workflows/tests.yml

@@ -2,6 +2,9 @@ name: tests
 
 on:
   push:
+    branches:
+      - master
+      - '*.x'
   pull_request:
   schedule:
     - cron: '0 0 * * *'
@@ -38,6 +41,9 @@ jobs:
       matrix:
         php: [8.1]
         stability: [prefer-lowest, prefer-stable]
+        include:
+          - php: 8.2
+            stability: prefer-stable --ignore-platform-req=php+
 
     name: PHP ${{ matrix.php }} - ${{ matrix.stability }}
 
@@ -98,6 +104,9 @@ jobs:
       matrix:
         php: [8.1]
         stability: [prefer-lowest, prefer-stable]
+        include:
+          - php: 8.2
+            stability: prefer-stable --ignore-platform-req=php+
 
     name: PHP ${{ matrix.php }} - ${{ matrix.stability }} - Windows
 

composer.json

@@ -81,12 +81,14 @@
         "illuminate/view": "self.version"
     },
     "require-dev": {
+        "ably/ably-php": "^1.0",
         "aws/aws-sdk-php": "^3.198.1",
         "doctrine/dbal": "^2.13.3|^3.1.4",
         "fakerphp/faker": "^1.9.2",
         "guzzlehttp/guzzle": "^7.2",
         "league/flysystem-aws-s3-v3": "^3.0",
         "league/flysystem-ftp": "^3.0",
+        "league/flysystem-read-only": "^3.3",
         "league/flysystem-sftp-v3": "^3.0",
         "mockery/mockery": "^1.4.4",
         "orchestra/testbench-core": "^8.0",
@@ -150,6 +152,7 @@
         "laravel/tinker": "Required to use the tinker console command (^2.0).",
         "league/flysystem-aws-s3-v3": "Required to use the Flysystem S3 driver (^3.0).",
         "league/flysystem-ftp": "Required to use the Flysystem FTP driver (^3.0).",
+        "league/flysystem-read-only": "Required to use read-only disks (^3.3)",
         "league/flysystem-sftp-v3": "Required to use the Flysystem SFTP driver (^3.0).",
         "mockery/mockery": "Required to use mocking (^1.4.4).",
         "nyholm/psr7": "Required to use PSR-7 bridging features (^1.2).",

src/Illuminate/Auth/SessionGuard.php

@@ -58,7 +58,7 @@ class SessionGuard implements StatefulGuard, SupportsBasicAuth
      *
      * @var int
      */
-    protected $rememberDuration = 2628000;
+    protected $rememberDuration = 576000;
 
     /**
      * The session used by the guard.

src/Illuminate/Collections/Collection.php

@@ -974,7 +974,7 @@ public function put($key, $value)
     /**
      * Get one or a specified number of items randomly from the collection.
      *
-     * @param  (callable(TValue): int)|int|null  $number
+     * @param  (callable(self<TKey, TValue>): int)|int|null  $number
      * @param  bool  $preserveKeys
      * @return static<int, TValue>|TValue
      *

src/Illuminate/Collections/LazyCollection.php

@@ -398,7 +398,7 @@ public function except($keys)
     /**
      * Run a filter over each of the items.
      *
-     * @param  (callable(TValue): bool)|null  $callback
+     * @param  (callable(TValue, TKey): bool)|null  $callback
      * @return static
      */
     public function filter(callable $callback = null)

src/Illuminate/Console/GeneratorCommand.php

@@ -355,7 +355,7 @@ protected function replaceClass($stub, $name)
      */
     protected function sortImports($stub)
     {
-        if (preg_match('/(?P<imports>(?:use [^;{]+;$\n?)+)/m', $stub, $match)) {
+        if (preg_match('/(?P<imports>(?:^use [^;{]+;$\n?)+)/m', $stub, $match)) {
             $imports = explode("\n", trim($match['imports']));
 
             sort($imports);

src/Illuminate/Database/Eloquent/Concerns/HasAttributes.php

@@ -1887,6 +1887,18 @@ public function isClean($attributes = null)
         return ! $this->isDirty(...func_get_args());
     }
 
+    /**
+     * Discard attribute changes and reset the attributes to their original state.
+     *
+     * @return $this
+     */
+    public function discardChanges()
+    {
+        [$this->attributes, $this->changes] = [$this->original, []];
+
+        return $this;
+    }
+
     /**
      * Determine if the model or any of the given attribute(s) were changed when the model was last saved.
      *

src/Illuminate/Database/Eloquent/Model.php

@@ -441,7 +441,9 @@ public function fill(array $attributes)
     {
         $totallyGuarded = $this->totallyGuarded();
 
-        foreach ($this->fillableFromArray($attributes) as $key => $value) {
+        $fillable = $this->fillableFromArray($attributes);
+
+        foreach ($fillable as $key => $value) {
             // The developers may choose to place some attributes in the "fillable" array
             // which means only those attributes may be set through mass assignment to
             // the model, and all others will just get ignored for security reasons.
@@ -455,6 +457,14 @@ public function fill(array $attributes)
             }
         }
 
+        if (count($attributes) !== count($fillable) &&
+            static::preventsSilentlyDiscardingAttributes()) {
+            throw new MassAssignmentException(sprintf(
+                'Add fillable property to allow mass assignment on [%s].',
+                get_class($this)
+            ));
+        }
+
         return $this;
     }