Merge branch 'master' into merge

.github/ISSUE_TEMPLATE/1_Bug_report.md

@@ -14,3 +14,5 @@ about: "Report something that's broken. Please ensure your Laravel version is st
 
 
 ### Steps To Reproduce:
+
+<!-- If possible, please provide a GitHub repository to demonstrate your issue -->

.github/workflows/tests.yml

@@ -28,6 +28,7 @@ jobs:
         ports:
           - 6379:6379
         options: --entrypoint redis-server
+
     strategy:
       fail-fast: true
       matrix:
@@ -38,7 +39,6 @@ jobs:
             flags: "--ignore-platform-req=php"
             stability: prefer-stable
 
-
     name: PHP ${{ matrix.php }} - ${{ matrix.stability }}
 
     steps:

composer.json

@@ -198,7 +198,7 @@
         "phpunit/phpunit": "Required to use assertions and run tests (^9.4).",
         "predis/predis": "Required to use the predis connector (^1.1.2).",
         "psr/http-message": "Required to allow Storage::put to accept a StreamInterface (^1.0).",
-        "pusher/pusher-php-server": "Required to use the Pusher broadcast driver (^5.0).",
+        "pusher/pusher-php-server": "Required to use the Pusher broadcast driver (^5.0|^6.0).",
         "symfony/cache": "Required to PSR-6 cache bridge (^5.3).",
         "symfony/filesystem": "Required to enable support for relative symbolic links (^5.3).",
         "symfony/psr-http-message-bridge": "Required to use PSR-7 bridging features (^2.0).",

src/Illuminate/Broadcasting/Broadcasters/AblyBroadcaster.php

@@ -76,7 +76,7 @@ public function validAuthenticationResponse($request, $result)
             $request->channel_name,
             $request->socket_id,
             $userData = array_filter([
-                'user_id' => $this->retrieveUser($request, $channelName)->getAuthIdentifier(),
+                'user_id' => (string) $this->retrieveUser($request, $channelName)->getAuthIdentifier(),
                 'user_info' => $result,
             ])
         );

src/Illuminate/Broadcasting/composer.json

@@ -34,7 +34,7 @@
         }
     },
     "suggest": {
-        "pusher/pusher-php-server": "Required to use the Pusher broadcast driver (^5.0)."
+        "pusher/pusher-php-server": "Required to use the Pusher broadcast driver (^5.0|^6.0)."
     },
     "config": {
         "sort-packages": true

src/Illuminate/Database/Eloquent/Factories/Sequence.php

@@ -44,7 +44,7 @@ public function __construct(...$sequence)
      */
     public function __invoke()
     {
-        if ($this->index > ($this->count - 1)) {
+        if ($this->index >= $this->count) {
             $this->index = 0;
         }
 

src/Illuminate/Database/Schema/Grammars/SqlServerGrammar.php

@@ -64,7 +64,7 @@ public function compileDropDatabaseIfExists($name)
      */
     public function compileTableExists()
     {
-        return "select * from sysobjects where type = 'U' and name = ?";
+        return "select * from sys.sysobjects where id = object_id(?, 'U')";
     }
 
     /**
@@ -75,9 +75,7 @@ public function compileTableExists()
      */
     public function compileColumnListing($table)
     {
-        return "select col.name from sys.columns as col
-                join sys.objects as obj on col.object_id = obj.object_id
-                where obj.type = 'U' and obj.object_id = object_id('$table')";
+        return "select name from sys.columns where object_id = object_id('$table', 'U')";
     }
 
     /**
@@ -194,7 +192,7 @@ public function compileDrop(Blueprint $blueprint, Fluent $command)
      */
     public function compileDropIfExists(Blueprint $blueprint, Fluent $command)
     {
-        return sprintf('if exists (select * from INFORMATION_SCHEMA.TABLES where TABLE_NAME = %s) drop table %s',
+        return sprintf('if exists (select * from sys.sysobjects where id = object_id(%s, \'U\')) drop table %s',
             "'".str_replace("'", "''", $this->getTablePrefix().$blueprint->getTable())."'",
             $this->wrapTable($blueprint)
         );

src/Illuminate/Database/Schema/PostgresSchemaState.php

@@ -25,7 +25,7 @@ public function dump(Connection $connection, $path)
                         })->implode(' ');
 
         $this->makeProcess(
-            $this->baseDumpCommand().' --file=$LARAVEL_LOAD_PATH '.$excludedTables
+            $this->baseDumpCommand().' --file="${:LARAVEL_LOAD_PATH}" '.$excludedTables
         )->mustRun($this->output, array_merge($this->baseVariables($this->connection->getConfig()), [
             'LARAVEL_LOAD_PATH' => $path,
         ]));
@@ -39,10 +39,10 @@ public function dump(Connection $connection, $path)
      */
     public function load($path)
     {
-        $command = 'PGPASSWORD=$LARAVEL_LOAD_PASSWORD pg_restore --no-owner --no-acl --clean --if-exists --host=$LARAVEL_LOAD_HOST --port=$LARAVEL_LOAD_PORT --username=$LARAVEL_LOAD_USER --dbname=$LARAVEL_LOAD_DATABASE $LARAVEL_LOAD_PATH';
+        $command = 'pg_restore --no-owner --no-acl --clean --if-exists --host="${:LARAVEL_LOAD_HOST}" --port="${:LARAVEL_LOAD_PORT}" --username="${:LARAVEL_LOAD_USER}" --dbname="${:LARAVEL_LOAD_DATABASE}" "${:LARAVEL_LOAD_PATH}"';
 
         if (Str::endsWith($path, '.sql')) {
-            $command = 'PGPASSWORD=$LARAVEL_LOAD_PASSWORD psql --file=$LARAVEL_LOAD_PATH --host=$LARAVEL_LOAD_HOST --port=$LARAVEL_LOAD_PORT --username=$LARAVEL_LOAD_USER --dbname=$LARAVEL_LOAD_DATABASE';
+            $command = 'psql --file="${:LARAVEL_LOAD_PATH}" --host="${:LARAVEL_LOAD_HOST}" --port="${:LARAVEL_LOAD_PORT}" --username="${:LARAVEL_LOAD_USER}" --dbname="${:LARAVEL_LOAD_DATABASE}"';
         }
 
         $process = $this->makeProcess($command);
@@ -59,7 +59,7 @@ public function load($path)
      */
     protected function baseDumpCommand()
     {
-        return 'PGPASSWORD=$LARAVEL_LOAD_PASSWORD pg_dump --no-owner --no-acl -Fc --host=$LARAVEL_LOAD_HOST --port=$LARAVEL_LOAD_PORT --username=$LARAVEL_LOAD_USER $LARAVEL_LOAD_DATABASE';
+        return 'pg_dump --no-owner --no-acl -Fc --host="${:LARAVEL_LOAD_HOST}" --port="${:LARAVEL_LOAD_PORT}" --username="${:LARAVEL_LOAD_USER}" --dbname="${:LARAVEL_LOAD_DATABASE}"';
     }
 
     /**
@@ -76,7 +76,7 @@ protected function baseVariables(array $config)
             'LARAVEL_LOAD_HOST' => is_array($config['host']) ? $config['host'][0] : $config['host'],
             'LARAVEL_LOAD_PORT' => $config['port'],
             'LARAVEL_LOAD_USER' => $config['username'],
-            'LARAVEL_LOAD_PASSWORD' => $config['password'],
+            'PGPASSWORD' => $config['password'],
             'LARAVEL_LOAD_DATABASE' => $config['database'],
         ];
     }

src/Illuminate/Foundation/Exceptions/Handler.php

@@ -54,28 +54,28 @@ class Handler implements ExceptionHandlerContract
     /**
      * A list of the exception types that are not reported.
      *
-     * @var array
+     * @var string[]
      */
     protected $dontReport = [];
 
     /**
      * The callbacks that should be used during reporting.
      *
-     * @var array
+     * @var \Illuminate\Foundation\Exceptions\ReportableHandler[]
      */
     protected $reportCallbacks = [];
 
     /**
      * The callbacks that should be used during rendering.
      *
-     * @var array
+     * @var \Closure[]
      */
     protected $renderCallbacks = [];
 
     /**
      * The registered exception mappings.
      *
-     * @var array
+     * @var array<string, \Closure>
      */
     protected $exceptionMap = [];
 

src/Illuminate/Foundation/Http/Kernel.php

@@ -388,6 +388,16 @@ protected function syncMiddlewareToRouter()
         }
     }
 
+    /**
+     * Get the priority-sorted list of middleware.
+     *
+     * @return array
+     */
+    public function getMiddlewarePriority()
+    {
+        return $this->middlewarePriority;
+    }
+
     /**
      * Get the bootstrap classes for the application.
      *

src/Illuminate/Queue/Jobs/Job.php

@@ -214,7 +214,7 @@ protected function failed($e)
         list($class, $method) = JobName::parse($payload['job']);
 
         if (method_exists($this->instance = $this->resolve($class), 'failed')) {
-            $this->instance->failed($payload['data'], $e, $payload['uuid']);
+            $this->instance->failed($payload['data'], $e, $payload['uuid'] ?? '');
         }
     }
 

src/Illuminate/Routing/Router.php

@@ -707,11 +707,13 @@ protected function runRouteWithinStack(Route $route, Request $request)
      */
     public function gatherRouteMiddleware(Route $route)
     {
+        $computedMiddleware = $route->gatherMiddleware();
+
         $excluded = collect($route->excludedMiddleware())->map(function ($name) {
             return (array) MiddlewareNameResolver::resolve($name, $this->middleware, $this->middlewareGroups);
         })->flatten()->values()->all();
 
-        $middleware = collect($route->gatherMiddleware())->map(function ($name) {
+        $middleware = collect($computedMiddleware)->map(function ($name) {
             return (array) MiddlewareNameResolver::resolve($name, $this->middleware, $this->middlewareGroups);
         })->flatten()->reject(function ($name) use ($excluded) {
             if (empty($excluded)) {

src/Illuminate/Support/Facades/Broadcast.php

@@ -7,7 +7,7 @@
 /**
  * @method static \Illuminate\Broadcasting\Broadcasters\Broadcaster channel(string $channel, callable|string  $callback, array $options = [])
  * @method static mixed auth(\Illuminate\Http\Request $request)
- * @method static void connection($name = null);
+ * @method static \Illuminate\Contracts\Broadcasting\Broadcaster connection($name = null);
  * @method static void routes(array $attributes = null)
  * @method static \Illuminate\Broadcasting\BroadcastManager socket($request = null)
  *

src/Illuminate/Support/Facades/File.php

@@ -19,6 +19,7 @@
  * @method static bool isReadable(string $path)
  * @method static bool isWritable(string $path)
  * @method static bool makeDirectory(string $path, int $mode = 0755, bool $recursive = false, bool $force = false)
+ * @method static bool missing(string $path)
  * @method static bool move(string $path, string $target)
  * @method static bool moveDirectory(string $from, string $to, bool $overwrite = false)
  * @method static int append(string $path, string $data)
@@ -27,8 +28,8 @@
  * @method static int size(string $path)
  * @method static int|bool put(string $path, string $contents, bool $lock = false)
  * @method static mixed chmod(string $path, int|null $mode = null)
- * @method static mixed getRequire(string $path)
- * @method static mixed requireOnce(string $file)
+ * @method static mixed getRequire(string $path, array $data = [])
+ * @method static mixed requireOnce(string $file, array $data = [])
  * @method static string basename(string $path)
  * @method static string dirname(string $path)
  * @method static string extension(string $path)
@@ -38,6 +39,7 @@
  * @method static string sharedGet(string $path)
  * @method static string type(string $path)
  * @method static string|false mimeType(string $path)
+ * @method static string|null guessExtension(string $path)
  * @method static void ensureDirectoryExists(string $path, int $mode = 0755, bool $recursive = true)
  * @method static void link(string $target, string $link)
  * @method static \Illuminate\Support\LazyCollection lines(string $path)

src/Illuminate/Support/Facades/Storage.php

@@ -8,7 +8,10 @@
  * @method static \Illuminate\Contracts\Filesystem\Filesystem assertExists(string|array $path)
  * @method static \Illuminate\Contracts\Filesystem\Filesystem assertMissing(string|array $path)
  * @method static \Illuminate\Contracts\Filesystem\Filesystem cloud()
- * @method static \Illuminate\Contracts\Filesystem\Filesystem disk(string $name = null)
+ * @method static \Illuminate\Contracts\Filesystem\Filesystem disk(string|null $name = null)
+ * @method static \Illuminate\Filesystem\FilesystemManager extend(string $driver, \Closure $callback)
+ * @method static \Symfony\Component\HttpFoundation\StreamedResponse download(string $path, string|null $name = null, array|null $headers = [])
+ * @method static \Symfony\Component\HttpFoundation\StreamedResponse response(string $path, string|null $name = null, array|null $headers = [], string|null $disposition = 'inline')
  * @method static array allDirectories(string|null $directory = null)
  * @method static array allFiles(string|null $directory = null)
  * @method static array directories(string|null $directory = null, bool $recursive = false)
@@ -18,23 +21,24 @@
  * @method static bool delete(string|array $paths)
  * @method static bool deleteDirectory(string $directory)
  * @method static bool exists(string $path)
- * @method static \Illuminate\Filesystem\FilesystemManager extend(string $driver, \Closure $callback)
  * @method static bool makeDirectory(string $path)
+ * @method static bool missing(string $path)
  * @method static bool move(string $from, string $to)
- * @method static string path(string $path)
  * @method static bool prepend(string $path, string $data)
  * @method static bool put(string $path, string|resource $contents, mixed $options = [])
- * @method static string|false putFile(string $path, \Illuminate\Http\File|\Illuminate\Http\UploadedFile|string $file, mixed $options = [])
- * @method static string|false putFileAs(string $path, \Illuminate\Http\File|\Illuminate\Http\UploadedFile|string $file, string $name, mixed $options = [])
  * @method static bool setVisibility(string $path, string $visibility)
  * @method static bool writeStream(string $path, resource $resource, array $options = [])
  * @method static int lastModified(string $path)
  * @method static int size(string $path)
  * @method static resource|null readStream(string $path)
  * @method static string get(string $path)
  * @method static string getVisibility(string $path)
+ * @method static string path(string $path)
  * @method static string temporaryUrl(string $path, \DateTimeInterface $expiration, array $options = [])
  * @method static string url(string $path)
+ * @method static string|false mimeType(string $path)
+ * @method static string|false putFile(string $path, \Illuminate\Http\File|\Illuminate\Http\UploadedFile|string $file, mixed $options = [])
+ * @method static string|false putFileAs(string $path, \Illuminate\Http\File|\Illuminate\Http\UploadedFile|string $file, string $name, mixed $options = [])
  *
  * @see \Illuminate\Filesystem\FilesystemManager
  */

src/Illuminate/Support/Str.php

@@ -182,10 +182,16 @@ public static function camel($value)
      *
      * @param  string  $haystack
      * @param  string|string[]  $needles
+     * @param  bool  $ignoreCase
      * @return bool
      */
-    public static function contains($haystack, $needles)
+    public static function contains($haystack, $needles, $ignoreCase = false)
     {
+        if ($ignoreCase) {
+            $haystack = mb_strtolower($haystack);
+            $needles = array_map('mb_strtolower', (array) $needles);
+        }
+
         foreach ((array) $needles as $needle) {
             if ($needle !== '' && mb_strpos($haystack, $needle) !== false) {
                 return true;
@@ -200,10 +206,16 @@ public static function contains($haystack, $needles)
      *
      * @param  string  $haystack
      * @param  string[]  $needles
+     * @param  bool  $ignoreCase
      * @return bool
      */
-    public static function containsAll($haystack, array $needles)
+    public static function containsAll($haystack, array $needles, $ignoreCase = false)
     {
+        if ($ignoreCase) {
+            $haystack = mb_strtolower($haystack);
+            $needles = array_map('mb_strtolower', $needles);
+        }
+
         foreach ($needles as $needle) {
             if (! static::contains($haystack, $needle)) {
                 return false;

src/Illuminate/Support/Stringable.php

@@ -710,6 +710,19 @@ public function ucfirst()
         return new static(Str::ucfirst($this->value));
     }
 
+    /**
+     * Apply the callback's string changes if the given "value" is false.
+     *
+     * @param  mixed  $value
+     * @param  callable  $callback
+     * @param  callable|null  $default
+     * @return mixed|$this
+     */
+    public function unless($value, $callback, $default = null)
+    {
+        return $this->when(! $value, $callback, $default);
+    }
+
     /**
      * Apply the callback's string changes if the given "value" is true.
      *

src/Illuminate/Validation/Concerns/ValidatesAttributes.php

@@ -1540,9 +1540,9 @@ public function validateExcludeUnless($attribute, $value, $parameters)
     {
         $this->requireParameterCount(2, $parameters, 'exclude_unless');
 
-        if (! Arr::has($this->data, $parameters[0])) {
-            return true;
-        }
+        // if (! Arr::has($this->data, $parameters[0])) {
+        //     return true;
+        // }
 
         list($values, $other) = $this->parseDependentRuleParameters($parameters);
 
@@ -1561,9 +1561,9 @@ public function validateRequiredUnless($attribute, $value, $parameters)
     {
         $this->requireParameterCount(2, $parameters, 'required_unless');
 
-        if (! Arr::has($this->data, $parameters[0])) {
-            return true;
-        }
+        // if (! Arr::has($this->data, $parameters[0])) {
+        //     return true;
+        // }
 
         list($values, $other) = $this->parseDependentRuleParameters($parameters);
 

tests/Cache/RedisCacheIntegrationTest.php

@@ -5,7 +5,6 @@
 use Illuminate\Cache\RedisStore;
 use Illuminate\Cache\Repository;
 use Illuminate\Foundation\Testing\Concerns\InteractsWithRedis;
-use Mockery as m;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -25,7 +24,6 @@ protected function tearDown()
     {
         parent::tearDown();
         $this->tearDownRedis();
-        m::close();
     }
 
     /**