Merge branch '9.x'

# Conflicts:
#	CHANGELOG.md
#	src/Illuminate/Foundation/Application.php

Author: driesvints

.github/workflows/databases.yml

@@ -213,7 +213,7 @@ jobs:
           command: composer update --prefer-stable --prefer-dist --no-interaction --no-progress
 
       - name: Execute tests
-        run: vendor/bin/phpunit tests/Integration/Database --verbose --exclude-group SkipMSSQL
+        run: vendor/bin/phpunit tests/Integration/Database --verbose
         env:
           DB_CONNECTION: sqlsrv
           DB_DATABASE: master

.github/workflows/tests.yml

@@ -49,7 +49,7 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php }}
-          extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, gd, redis-phpredis/[email protected], igbinary, msgpack, lzf, zstd, lz4, memcached
+          extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, gd, redis-phpredis/[email protected], igbinary, msgpack, lzf, zstd, lz4, memcached, gmp
           ini-values: error_reporting=E_ALL
           tools: composer:v2
           coverage: none
@@ -114,7 +114,7 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php }}
-          extensions: dom, curl, libxml, mbstring, zip, pdo, sqlite, pdo_sqlite, gd, pdo_mysql, fileinfo, ftp, redis, memcached
+          extensions: dom, curl, libxml, mbstring, zip, pdo, sqlite, pdo_sqlite, gd, pdo_mysql, fileinfo, ftp, redis, memcached, gmp
           tools: composer:v2
           coverage: none
 

src/Illuminate/Bus/DatabaseBatchRepository.php

@@ -341,4 +341,25 @@ protected function toBatch($batch)
             $batch->finished_at ? CarbonImmutable::createFromTimestamp($batch->finished_at) : $batch->finished_at
         );
     }
+
+    /**
+     * Get the underlying database connection.
+     *
+     * @return \Illuminate\Database\Connection
+     */
+    public function getConnection()
+    {
+        return $this->connection;
+    }
+
+    /**
+     * Set the underlying database connection.
+     *
+     * @param  \Illuminate\Database\Connection  $connection
+     * @return void
+     */
+    public function setConnection(Connection $connection)
+    {
+        $this->connection = $connection;
+    }
 }

src/Illuminate/Cache/RateLimiting/Limit.php

@@ -7,7 +7,7 @@ class Limit
     /**
      * The rate limit signature key.
      *
-     * @var mixed|string
+     * @var mixed
      */
     public $key;
 
@@ -35,7 +35,7 @@ class Limit
     /**
      * Create a new limit instance.
      *
-     * @param  mixed|string  $key
+     * @param  mixed  $key
      * @param  int  $maxAttempts
      * @param  int  $decayMinutes
      * @return void
@@ -107,7 +107,7 @@ public static function none()
     /**
      * Set the key of the rate limit.
      *
-     * @param  string  $key
+     * @param  mixed  $key
      * @return $this
      */
     public function by($key)

src/Illuminate/Collections/Enumerable.php

@@ -735,15 +735,15 @@ public function union($items);
      * Get the min value of a given key.
      *
      * @param  (callable(TValue):mixed)|string|null  $callback
-     * @return TValue
+     * @return mixed
      */
     public function min($callback = null);
 
     /**
      * Get the max value of a given key.
      *
      * @param  (callable(TValue):mixed)|string|null  $callback
-     * @return TValue
+     * @return mixed
      */
     public function max($callback = null);
 

src/Illuminate/Collections/Traits/EnumeratesValues.php

@@ -409,7 +409,7 @@ public function mapInto($class)
      * Get the min value of a given key.
      *
      * @param  (callable(TValue):mixed)|string|null  $callback
-     * @return TValue
+     * @return mixed
      */
     public function min($callback = null)
     {
@@ -424,7 +424,7 @@ public function min($callback = null)
      * Get the max value of a given key.
      *
      * @param  (callable(TValue):mixed)|string|null  $callback
-     * @return TValue
+     * @return mixed
      */
     public function max($callback = null)
     {

src/Illuminate/Console/Command.php

@@ -13,6 +13,7 @@ class Command extends SymfonyCommand
     use Concerns\CallsCommands,
         Concerns\HasParameters,
         Concerns\InteractsWithIO,
+        Concerns\InteractsWithSignals,
         Macroable;
 
     /**
@@ -120,9 +121,13 @@ public function run(InputInterface $input, OutputInterface $output): int
 
         $this->components = $this->laravel->make(Factory::class, ['output' => $this->output]);
 
-        return parent::run(
-            $this->input = $input, $this->output
-        );
+        try {
+            return parent::run(
+                $this->input = $input, $this->output
+            );
+        } finally {
+            $this->untrap();
+        }
     }
 
     /**

src/Illuminate/Console/Concerns/InteractsWithSignals.php

@@ -0,0 +1,51 @@
+<?php
+
+namespace Illuminate\Console\Concerns;
+
+use Illuminate\Console\Signals;
+use Illuminate\Support\Arr;
+
+trait InteractsWithSignals
+{
+    /**
+     * The signal registrar instance.
+     *
+     * @var \Illuminate\Console\Signals|null
+     */
+    protected $signals;
+
+    /**
+     * Define a callback to be run when the given signal(s) occurs.
+     *
+     * @param  iterable<array-key, int>|int  $signals
+     * @param  callable(int $signal): void  $callback
+     * @return void
+     */
+    public function trap($signals, $callback)
+    {
+        Signals::whenAvailable(function () use ($signals, $callback) {
+            $this->signals ??= new Signals(
+                $this->getApplication()->getSignalRegistry(),
+            );
+
+            collect(Arr::wrap($signals))
+                ->each(fn ($signal) => $this->signals->register($signal, $callback));
+        });
+    }
+
+    /**
+     * Untrap signal handlers set within the command's handler.
+     *
+     * @return void
+     *
+     * @internal
+     */
+    public function untrap()
+    {
+        if (! is_null($this->signals)) {
+            $this->signals->unregister();
+
+            $this->signals = null;
+        }
+    }
+}

src/Illuminate/Console/Signals.php

@@ -0,0 +1,152 @@
+<?php
+
+namespace Illuminate\Console;
+
+/**
+ * @internal
+ */
+class Signals
+{
+    /**
+     * The signal registry instance.
+     *
+     * @var \Symfony\Component\Console\SignalRegistry\SignalRegistry
+     */
+    protected $registry;
+
+    /**
+     * The signal registry's previous list of handlers.
+     *
+     * @var array<int, array<int, callable>>|null
+     */
+    protected $previousHandlers;
+
+    /**
+     * The current availability resolver, if any.
+     *
+     * @var (callable(): bool)|null
+     */
+    protected static $availabilityResolver;
+
+    /**
+     * Create a new signal registrar instance.
+     *
+     * @param  \Symfony\Component\Console\SignalRegistry\SignalRegistry  $registry
+     * @return void
+     */
+    public function __construct($registry)
+    {
+        $this->registry = $registry;
+
+        $this->previousHandlers = $this->getHandlers();
+    }
+
+    /**
+     * Register a new signal handler.
+     *
+     * @param  int  $signal
+     * @param  callable(int $signal): void  $callback
+     * @return void
+     */
+    public function register($signal, $callback)
+    {
+        $this->previousHandlers[$signal] ??= $this->initializeSignal($signal);
+
+        with($this->getHandlers(), function ($handlers) use ($signal) {
+            $handlers[$signal] ??= $this->initializeSignal($signal);
+
+            $this->setHandlers($handlers);
+        });
+
+        $this->registry->register($signal, $callback);
+
+        with($this->getHandlers(), function ($handlers) use ($signal) {
+            $lastHandlerInserted = array_pop($handlers[$signal]);
+
+            array_unshift($handlers[$signal], $lastHandlerInserted);
+
+            $this->setHandlers($handlers);
+        });
+    }
+
+    /**
+     * Gets the signal's existing handler in array format.
+     *
+     * @return array<int, callable(int $signal): void>
+     */
+    protected function initializeSignal($signal)
+    {
+        return is_callable($existingHandler = pcntl_signal_get_handler($signal))
+            ? [$existingHandler]
+            : null;
+    }
+
+    /**
+     * Unregister the current signal handlers.
+     *
+     * @return array<int, array<int, callable(int $signal): void>>
+     */
+    public function unregister()
+    {
+        $previousHandlers = $this->previousHandlers;
+
+        foreach ($previousHandlers as $signal => $handler) {
+            if (is_null($handler)) {
+                pcntl_signal($signal, SIG_DFL);
+
+                unset($previousHandlers[$signal]);
+            }
+        }
+
+        $this->setHandlers($previousHandlers);
+    }
+
+    /**
+     * Execute the given callback if "signals" should be used and are available.
+     *
+     * @param  callable  $callback
+     * @return void
+     */
+    public static function whenAvailable($callback)
+    {
+        $resolver = static::$availabilityResolver;
+
+        if ($resolver()) {
+            $callback();
+        }
+    }
+
+    /**
+     * Get the registry's handlers.
+     *
+     * @return array<int, array<int, callable>>
+     */
+    protected function getHandlers()
+    {
+        return (fn () => $this->signalHandlers)
+            ->call($this->registry);
+    }
+
+    /**
+     * Set the registry's handlers.
+     *
+     * @param  array<int, array<int, callable(int $signal):void>>  $handlers
+     * @return void
+     */
+    protected function setHandlers($handlers)
+    {
+        (fn () => $this->signalHandlers = $handlers)
+            ->call($this->registry);
+    }
+
+    /**
+     * Set the availability resolver.
+     *
+     * @param  callable(): bool
+     * @return void
+     */
+    public static function resolveAvailabilityUsing($resolver)
+    {
+        static::$availabilityResolver = $resolver;
+    }
+}

src/Illuminate/Cookie/CookieJar.php

@@ -71,7 +71,7 @@ public function make($name, $value, $minutes = 0, $path = null, $domain = null,
     }
 
     /**
-     * Create a cookie that lasts "forever" (five years).
+     * Create a cookie that lasts "forever" (400 days).
      *
      * @param  string  $name
      * @param  string  $value
@@ -85,7 +85,7 @@ public function make($name, $value, $minutes = 0, $path = null, $domain = null,
      */
     public function forever($name, $value, $path = null, $domain = null, $secure = null, $httpOnly = true, $raw = false, $sameSite = null)
     {
-        return $this->make($name, $value, 2628000, $path, $domain, $secure, $httpOnly, $raw, $sameSite);
+        return $this->make($name, $value, 576000, $path, $domain, $secure, $httpOnly, $raw, $sameSite);
     }
 
     /**