Merge branch '9.x' into 10.x

# Conflicts:
#	CHANGELOG.md
#	composer.json
#	src/Illuminate/Foundation/Application.php
#	src/Illuminate/Foundation/Bootstrap/HandleExceptions.php

Author: driesvints

src/Illuminate/Cache/CacheManager.php

@@ -58,7 +58,7 @@ public function store($name = null)
     {
         $name = $name ?: $this->getDefaultDriver();
 
-        return $this->stores[$name] = $this->get($name);
+        return $this->stores[$name] ??= $this->resolve($name);
     }
 
     /**
@@ -72,17 +72,6 @@ public function driver($driver = null)
         return $this->store($driver);
     }
 
-    /**
-     * Attempt to get the store from the local cache.
-     *
-     * @param  string  $name
-     * @return \Illuminate\Contracts\Cache\Repository
-     */
-    protected function get($name)
-    {
-        return $this->stores[$name] ?? $this->resolve($name);
-    }
-
     /**
      * Resolve the given store.
      *

src/Illuminate/Foundation/Bootstrap/HandleExceptions.php

@@ -181,11 +181,15 @@ public function handleException(Throwable $e)
         try {
             $this->getExceptionHandler()->report($e);
         } catch (Exception) {
-            //
+            $exceptionHandlerFailed = true;
         }
 
         if (static::$app->runningInConsole()) {
             $this->renderForConsole($e);
+
+            if ($exceptionHandlerFailed ?? false) {
+                exit(1);
+            }
         } else {
             $this->renderHttpResponse($e);
         }

src/Illuminate/Foundation/Testing/WithFaker.php

@@ -43,12 +43,14 @@ protected function faker($locale = null)
      */
     protected function makeFaker($locale = null)
     {
-        $locale ??= config('app.faker_locale', Factory::DEFAULT_LOCALE);
+        if (isset($this->app)) {
+            $locale ??= $this->app->make('config')->get('app.faker_locale', Factory::DEFAULT_LOCALE);
 
-        if (isset($this->app) && $this->app->bound(Generator::class)) {
-            return $this->app->make(Generator::class, ['locale' => $locale]);
+            if ($this->app->bound(Generator::class)) {
+                return $this->app->make(Generator::class, ['locale' => $locale]);
+            }
         }
 
-        return Factory::create($locale);
+        return Factory::create($locale ?? Factory::DEFAULT_LOCALE);
     }
 }

src/Illuminate/Queue/Queue.php

@@ -325,7 +325,7 @@ function () use ($payload, $queue, $delay, $callback, $job) {
      */
     protected function shouldDispatchAfterCommit($job)
     {
-        if (is_object($job) && isset($job->afterCommit)) {
+        if (! $job instanceof Closure && is_object($job) && isset($job->afterCommit)) {
             return $job->afterCommit;
         }
 

src/Illuminate/Routing/PendingSingletonResourceRegistration.php

@@ -90,25 +90,23 @@ public function except($methods)
     /**
      * Indicate that the resource should have creation and storage routes.
      *
-     * @param  bool  $creatable
      * @return $this
      */
-    public function creatable($creatable = true)
+    public function creatable()
     {
-        $this->options['creatable'] = $creatable;
+        $this->options['creatable'] = true;
 
         return $this;
     }
 
     /**
      * Indicate that the resource should have a deletion route.
      *
-     * @param  bool  $destroyable
      * @return $this
      */
-    public function destroyable($destroyable = true)
+    public function destroyable()
     {
-        $this->options['destroyable'] = $destroyable;
+        $this->options['destroyable'] = true;
 
         return $this;
     }

src/Illuminate/Support/Testing/Fakes/EventFake.php

@@ -95,7 +95,10 @@ public function assertListening($expectedEvent, $expectedListener)
                     if (Str::contains($expectedListener, '@')) {
                         $normalizedListener = Str::parseCallback($expectedListener);
                     } else {
-                        $normalizedListener = [$expectedListener, 'handle'];
+                        $normalizedListener = [
+                            $expectedListener,
+                            method_exists($expectedListener, 'handle') ? 'handle' : '__invoke',
+                        ];
                     }
                 }
             }

src/Illuminate/Validation/ValidationData.php

@@ -54,7 +54,7 @@ protected static function extractValuesForWildcards($masterData, $data, $attribu
     {
         $keys = [];
 
-        $pattern = str_replace('\*', '[^\.]+', preg_quote($attribute));
+        $pattern = str_replace('\*', '[^\.]+', preg_quote($attribute, '/'));
 
         foreach ($data as $key => $value) {
             if ((bool) preg_match('/^'.$pattern.'/', $key, $matches)) {

tests/Integration/Console/CommandSchedulingTest.php

@@ -65,16 +65,16 @@ protected function tearDown(): void
     /**
      * @dataProvider executionProvider
      */
-    public function testExecutionOrder($background)
+    public function testExecutionOrder($background, $expected)
     {
         $event = $this->app->make(Schedule::class)
             ->command("test:{$this->id}")
             ->onOneServer()
             ->after(function () {
-                $this->fs->append($this->logfile, "after\n");
+                $this->fs->append($this->logfile, "foreground:after\n");
             })
             ->before(function () {
-                $this->fs->append($this->logfile, "before\n");
+                $this->fs->append($this->logfile, "foreground:before\n");
             });
 
         if ($background) {
@@ -89,17 +89,17 @@ public function testExecutionOrder($background)
         if ($background) {
             // Since our command is running in a separate process, we need to wait
             // until it has finished executing before running our assertions.
-            $this->waitForLogMessages('before', 'handled', 'after');
+            $this->waitForLogMessages(...$expected);
         }
 
-        $this->assertLogged('before', 'handled', 'after');
+        $this->assertLogged(...$expected);
     }
 
     public static function executionProvider()
     {
         return [
-            'Foreground' => [false],
-            'Background' => [true],
+            'Foreground' => [false, ['foreground:before', 'handled', 'foreground:after']],
+            'Background' => [true, ['foreground:before', 'handled', 'background:after']],
         ];
     }
 
@@ -184,11 +184,11 @@ public function handle()
             \$schedule->command("test:{$this->id}")
                 ->after(function() use (\$fs) {
                     \$logfile = {$logfile};
-                    \$fs->append(\$logfile, "after\\n");
+                    \$fs->append(\$logfile, "background:after\\n");
                 })
                 ->before(function() use (\$fs) {
                     \$logfile = {$logfile};
-                    \$fs->append(\$logfile, "before\\n");
+                    \$fs->append(\$logfile, "background:before\\n");
                 });
         });
     });

tests/Integration/Events/EventFakeTest.php

@@ -147,6 +147,7 @@ public function testAssertListening()
             'Illuminate\\Tests\\Integration\\Events\\PostAutoEventSubscriber@handle',
             PostEventSubscriber::class,
             [PostEventSubscriber::class, 'foo'],
+            InvokableEventSubscriber::class,
         ]);
 
         foreach ($listenersOfSameEventInRandomOrder as $listener) {
@@ -172,6 +173,7 @@ public function testAssertListening()
         Event::assertListening(NonImportantEvent::class, Closure::class);
         Event::assertListening('eloquent.saving: '.Post::class, PostObserver::class.'@saving');
         Event::assertListening('eloquent.saving: '.Post::class, [PostObserver::class, 'saving']);
+        Event::assertListening('event', InvokableEventSubscriber::class);
     }
 
     public function testMissingMethodsAreForwarded()
@@ -238,3 +240,11 @@ public function saving(Post $post)
         $post->slug = sprintf('%s-Test', $post->title);
     }
 }
+
+class InvokableEventSubscriber
+{
+    public function __invoke($event)
+    {
+        //
+    }
+}

tests/Integration/Foundation/ExceptionHandlerTest.php

@@ -6,9 +6,21 @@
 use Illuminate\Auth\Access\Response;
 use Illuminate\Support\Facades\Route;
 use Orchestra\Testbench\TestCase;
+use Symfony\Component\Process\PhpProcess;
 
 class ExceptionHandlerTest extends TestCase
 {
+    /**
+     * Resolve application HTTP exception handler.
+     *
+     * @param  \Illuminate\Foundation\Application  $app
+     * @return void
+     */
+    protected function resolveApplicationExceptionHandler($app)
+    {
+        $app->singleton('Illuminate\Contracts\Debug\ExceptionHandler', 'Illuminate\Foundation\Exceptions\Handler');
+    }
+
     public function testItRendersAuthorizationExceptions()
     {
         Route::get('test-route', fn () => Response::deny('expected message', 321)->authorize());
@@ -107,4 +119,36 @@ public function testItHasFallbackErrorMessageForUnknownStatusCodes()
                 'message' => 'Whoops, looks like something went wrong.',
             ]);
     }
+
+    /**
+     * @dataProvider exitCodesProvider
+     */
+    public function testItReturnsNonZeroExitCodesForUncaughtExceptions($providers, $successful)
+    {
+        $basePath = static::applicationBasePath();
+        $providers = json_encode($providers, true);
+
+        $process = new PhpProcess(<<<EOF
+<?php
+
+require 'vendor/autoload.php';
+
+\$laravel = Orchestra\Testbench\Foundation\Application::create(basePath: '$basePath', options: ['extra' => ['providers' => $providers]]);
+\$laravel->singleton('Illuminate\Contracts\Debug\ExceptionHandler', 'Illuminate\Foundation\Exceptions\Handler');
+
+\$kernel = \$laravel[Illuminate\Contracts\Console\Kernel::class];
+
+return \$kernel->call('throw-exception-command');
+EOF, __DIR__.'/../../../', ['APP_RUNNING_IN_CONSOLE' => true]);
+
+        $process->run();
+
+        $this->assertSame($successful, $process->isSuccessful());
+    }
+
+    public static function exitCodesProvider()
+    {
+        yield 'Throw exception' => [[Fixtures\Providers\ThrowUncaughtExceptionServiceProvider::class], false];
+        yield 'Do not throw exception' => [[Fixtures\Providers\ThrowExceptionServiceProvider::class], true];
+    }
 }