Merge branch '9.x'

Author: GrahamCampbell

src/Illuminate/Bus/UniqueLock.php

@@ -36,13 +36,17 @@ public function acquire($job)
                     ? $job->uniqueId()
                     : ($job->uniqueId ?? '');
 
+        $uniqueFor = method_exists($job, 'uniqueFor')
+                    ? $job->uniqueFor()
+                    : ($job->uniqueFor ?? 0);
+
         $cache = method_exists($job, 'uniqueVia')
                     ? $job->uniqueVia()
                     : $this->cache;
 
         return (bool) $cache->lock(
             $key = 'laravel_unique_job:'.get_class($job).$uniqueId,
-            $job->uniqueFor ?? 0
+            $uniqueFor
         )->get();
     }
 }

src/Illuminate/Contracts/Debug/ExceptionHandler.php

@@ -41,6 +41,8 @@ public function render($request, Throwable $e);
      * @param  \Symfony\Component\Console\Output\OutputInterface  $output
      * @param  \Throwable  $e
      * @return void
+     *
+     * @internal This method is not meant to be used or overwritten outside the framework.
      */
     public function renderForConsole($output, Throwable $e);
 }

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

@@ -297,7 +297,7 @@ protected function addCastAttributesToArray(array $attributes, array $mutatedAtt
                 $attributes[$key] = $this->serializeClassCastableAttribute($key, $attributes[$key]);
             }
 
-            if ($this->isEnumCastable($key)) {
+            if ($this->isEnumCastable($key) && (! ($attributes[$key] ?? null) instanceof Arrayable)) {
                 $attributes[$key] = isset($attributes[$key]) ? $attributes[$key]->value : null;
             }
 
@@ -500,6 +500,10 @@ public function getRelationValue($key)
      */
     public function isRelation($key)
     {
+        if ($this->hasAttributeMutator($key)) {
+            return false;
+        }
+
         return method_exists($this, $key) ||
             (static::$relationResolvers[get_class($this)][$key] ?? null);
     }

src/Illuminate/Database/Eloquent/Relations/Concerns/AsPivot.php

@@ -76,7 +76,9 @@ public static function fromRawAttributes(Model $parent, $attributes, $table, $ex
 
         $instance->timestamps = $instance->hasTimestampAttributes($attributes);
 
-        $instance->setRawAttributes($attributes, $exists);
+        $instance->setRawAttributes(
+            array_merge($instance->getRawOriginal(), $attributes), $exists
+        );
 
         return $instance;
     }

src/Illuminate/Database/Schema/Blueprint.php

@@ -413,6 +413,38 @@ public function dropConstrainedForeignId($column)
         return $this->dropColumn($column);
     }
 
+    /**
+     * Indicate that the given foreign key should be dropped.
+     *
+     * @param  \Illuminate\Database\Eloquent\Model|string  $model
+     * @param  string|null  $column
+     * @return \Illuminate\Support\Fluent
+     */
+    public function dropForeignIdFor($model, $column = null)
+    {
+        if (is_string($model)) {
+            $model = new $model;
+        }
+
+        return $this->dropForeign([$column ?: $model->getForeignKey()]);
+    }
+
+    /**
+     * Indicate that the given foreign key should be dropped.
+     *
+     * @param  \Illuminate\Database\Eloquent\Model|string  $model
+     * @param  string|null  $column
+     * @return \Illuminate\Support\Fluent
+     */
+    public function dropConstrainedForeignIdFor($model, $column = null)
+    {
+        if (is_string($model)) {
+            $model = new $model;
+        }
+
+        return $this->dropConstrainedForeignId($column ?: $model->getForeignKey());
+    }
+
     /**
      * Indicate that the given indexes should be renamed.
      *

src/Illuminate/Foundation/Bootstrap/HandleExceptions.php

@@ -67,11 +67,11 @@ public function bootstrap(Application $app)
      */
     public function handleError($level, $message, $file = '', $line = 0, $context = [])
     {
-        if (error_reporting() & $level) {
-            if ($this->isDeprecation($level)) {
-                return $this->handleDeprecation($message, $file, $line);
-            }
+        if ($this->isDeprecation($level)) {
+            return $this->handleDeprecation($message, $file, $line);
+        }
 
+        if (error_reporting() & $level) {
             throw new ErrorException($message, 0, $level, $file, $line);
         }
     }

src/Illuminate/Foundation/Console/RouteListCommand.php

@@ -212,9 +212,10 @@ protected function getMiddleware($route)
      */
     protected function filterRoute(array $route)
     {
-        if (($this->option('name') && ! str_contains($route['name'], $this->option('name'))) ||
-            $this->option('path') && ! str_contains($route['uri'], $this->option('path')) ||
-            $this->option('method') && ! str_contains($route['method'], strtoupper($this->option('method')))) {
+        if (($this->option('name') && ! Str::contains($route['name'], $this->option('name'))) ||
+            ($this->option('path') && ! Str::contains($route['uri'], $this->option('path'))) ||
+            ($this->option('method') && ! Str::contains($route['method'], strtoupper($this->option('method')))) ||
+            ($this->option('domain') && ! Str::contains($route['domain'], $this->option('domain')))) {
             return;
         }
 
@@ -418,6 +419,7 @@ protected function getOptions()
             ['json', null, InputOption::VALUE_NONE, 'Output the route list as JSON'],
             ['method', null, InputOption::VALUE_OPTIONAL, 'Filter the routes by method'],
             ['name', null, InputOption::VALUE_OPTIONAL, 'Filter the routes by name'],
+            ['domain', null, InputOption::VALUE_OPTIONAL, 'Filter the routes by domain'],
             ['path', null, InputOption::VALUE_OPTIONAL, 'Only show routes matching the given path pattern'],
             ['except-path', null, InputOption::VALUE_OPTIONAL, 'Do not display the routes matching the given path pattern'],
             ['reverse', 'r', InputOption::VALUE_NONE, 'Reverse the ordering of the routes'],

src/Illuminate/Foundation/Exceptions/views/layout.blade.php

@@ -11,7 +11,7 @@
             html, body {
                 background-color: #fff;
                 color: #636b6f;
-                font-family: ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";;
+                font-family: ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
                 font-weight: 100;
                 height: 100vh;
                 margin: 0;

src/Illuminate/Foundation/Testing/Concerns/InteractsWithDeprecationHandling.php

@@ -38,7 +38,7 @@ protected function withoutDeprecationHandling()
     {
         if ($this->originalDeprecationHandler == null) {
             $this->originalDeprecationHandler = set_error_handler(function ($level, $message, $file = '', $line = 0) {
-                if (error_reporting() & $level) {
+                if (in_array($level, [E_DEPRECATED, E_USER_DEPRECATED]) || (error_reporting() & $level)) {
                     throw new ErrorException($message, 0, $level, $file, $line);
                 }
             });

src/Illuminate/Http/Client/PendingRequest.php

@@ -11,6 +11,7 @@
 use Illuminate\Http\Client\Events\ConnectionFailed;
 use Illuminate\Http\Client\Events\RequestSending;
 use Illuminate\Http\Client\Events\ResponseReceived;
+use Illuminate\Support\Arr;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Str;
 use Illuminate\Support\Traits\Conditionable;
@@ -155,6 +156,20 @@ class PendingRequest
      */
     protected $request;
 
+    /**
+     * The Guzzle request options that are mergable via array_merge_recursive.
+     *
+     * @var array
+     */
+    protected $mergableOptions = [
+        'cookies',
+        'form_params',
+        'headers',
+        'json',
+        'multipart',
+        'query',
+    ];
+
     /**
      * Create a new HTTP Client instance.
      *
@@ -488,15 +503,18 @@ public function retry(int $times, int $sleep = 0, ?callable $when = null, bool $
     }
 
     /**
-     * Merge new options into the client.
+     * Replace the specified options on the request.
      *
      * @param  array  $options
      * @return $this
      */
     public function withOptions(array $options)
     {
         return tap($this, function ($request) use ($options) {
-            return $this->options = array_merge_recursive($this->options, $options);
+            return $this->options = array_replace_recursive(
+                array_merge_recursive($this->options, Arr::only($options, $this->mergableOptions)),
+                $options
+            );
         });
     }
 
@@ -1018,14 +1036,17 @@ public function runBeforeSendingCallbacks($request, array $options)
     }
 
     /**
-     * Merge the given options with the current request options.
+     * Replace the given options with the current request options.
      *
      * @param  array  $options
      * @return array
      */
     public function mergeOptions(...$options)
     {
-        return array_merge_recursive($this->options, ...$options);
+        return array_replace_recursive(
+            array_merge_recursive($this->options, Arr::only($options, $this->mergableOptions)),
+            ...$options
+        );
     }
 
     /**
@@ -1131,4 +1152,14 @@ public function setHandler($handler)
 
         return $this;
     }
+
+    /**
+     * Get the pending request options.
+     *
+     * @return array
+     */
+    public function getOptions()
+    {
+        return $this->options;
+    }
 }