[14.x] feat: allow per-report log levels

src/Illuminate/Contracts/Debug/ExceptionHandler.php

@@ -14,11 +14,12 @@ interface ExceptionHandler
      *
      * @param  \Throwable  $e
      * @param  array<string, mixed>  $context
+     * @param  \Psr\Log\LogLevel::*|null  $level
      * @return void
      *
      * @throws \Throwable
      */
-    public function report(Throwable $e, array $context = []);
+    public function report(Throwable $e, array $context = [], ?string $level = null);
 
     /**
      * Determine if the exception should be reported.

src/Illuminate/Foundation/Exceptions/Handler.php

@@ -419,31 +419,33 @@ public function level($type, $level)
      *
      * @param  \Throwable  $e
      * @param  array<string, mixed>  $context
+     * @param  \Psr\Log\LogLevel::*|null  $level
      * @return void
      *
      * @throws \Throwable
      */
-    public function report(Throwable $e, array $context = [])
+    public function report(Throwable $e, array $context = [], ?string $level = null)
     {
         $e = $this->mapException($e);
 
         if ($this->shouldntReport($e)) {
             return;
         }
 
-        $this->reportThrowable($e, $context);
+        $this->reportThrowable($e, $context, $level);
     }
 
     /**
      * Reports error based on report method on exception or to logger.
      *
      * @param  \Throwable  $e
      * @param  array<string, mixed>  $context
+     * @param  \Psr\Log\LogLevel::*|null  $level
      * @return void
      *
      * @throws \Throwable
      */
-    protected function reportThrowable(Throwable $e, array $context = []): void
+    protected function reportThrowable(Throwable $e, array $context = [], ?string $level = null): void
     {
         $this->reportedExceptionMap[$e] = true;
 
@@ -466,7 +468,7 @@ protected function reportThrowable(Throwable $e, array $context = []): void
             throw $e;
         }
 
-        $level = $this->mapLogLevel($e);
+        $level ??= $this->mapLogLevel($e);
 
         $originallyReporting = $this->currentlyReporting;
 

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

@@ -101,11 +101,12 @@ public function __construct($originalHandler, $except = [])
              *
              * @param  \Throwable  $e
              * @param  array<string, mixed>  $context
+             * @param  \Psr\Log\LogLevel::*|null  $level
              * @return void
              *
              * @throws \Exception
              */
-            public function report(Throwable $e, array $context = [])
+            public function report(Throwable $e, array $context = [], ?string $level = null)
             {
                 //
             }

src/Illuminate/Foundation/helpers.php

@@ -720,14 +720,15 @@ function redirect($to = null, $status = 302, $headers = [], $secure = null): Red
      *
      * @param  \Throwable|string  $exception
      * @param  array<string, mixed>  $context
+     * @param  \Psr\Log\LogLevel::*|null  $level
      */
-    function report($exception, array $context = []): void
+    function report($exception, array $context = [], ?string $level = null): void
     {
         if (is_string($exception)) {
             $exception = new Exception($exception);
         }
 
-        app(ExceptionHandler::class)->report($exception, $context);
+        app(ExceptionHandler::class)->report($exception, $context, $level);
     }
 }
 
@@ -738,11 +739,12 @@ function report($exception, array $context = []): void
      * @param  bool  $boolean
      * @param  \Throwable|string  $exception
      * @param  array<string, mixed>  $context
+     * @param  \Psr\Log\LogLevel::*|null  $level
      */
-    function report_if($boolean, $exception, array $context = []): void
+    function report_if($boolean, $exception, array $context = [], ?string $level = null): void
     {
         if ($boolean) {
-            report($exception, $context);
+            report($exception, $context, $level);
         }
     }
 }
@@ -754,11 +756,12 @@ function report_if($boolean, $exception, array $context = []): void
      * @param  bool  $boolean
      * @param  \Throwable|string  $exception
      * @param  array<string, mixed>  $context
+     * @param  \Psr\Log\LogLevel::*|null  $level
      */
-    function report_unless($boolean, $exception, array $context = []): void
+    function report_unless($boolean, $exception, array $context = [], ?string $level = null): void
     {
         if (! $boolean) {
-            report($exception, $context);
+            report($exception, $context, $level);
         }
     }
 }

src/Illuminate/Support/Facades/Exceptions.php

@@ -19,7 +19,7 @@
  * @method static bool shouldStopRetries(\Throwable $e)
  * @method static \Illuminate\Foundation\Exceptions\Handler dontFlash(array|string $attributes)
  * @method static \Illuminate\Foundation\Exceptions\Handler level(string $type, string $level)
- * @method static void report(\Throwable $e, array $context = [])
+ * @method static void report(\Throwable $e, array $context = [], ?string $level = null)
  * @method static bool isReporting(\Throwable $e)
  * @method static bool shouldReport(\Throwable $e)
  * @method static \Illuminate\Foundation\Exceptions\Handler throttleUsing(callable $throttleUsing)

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

@@ -147,14 +147,15 @@ public function assertNothingReported()
      *
      * @param  \Throwable  $e
      * @param  array<string, mixed>  $context
+     * @param  \Psr\Log\LogLevel::*|null  $level
      * @return void
      *
      * @throws \Throwable
      */
-    public function report($e, array $context = [])
+    public function report($e, array $context = [], ?string $level = null)
     {
         if (! $this->isFakedException($e)) {
-            $this->handler->report($e, $context);
+            $this->handler->report($e, $context, $level);
 
             return;
         }

tests/Foundation/FoundationExceptionsHandlerTest.php

@@ -168,6 +168,25 @@ public function testHandlerReportsExceptionWithCustomLogLevel()
         $this->handler->report(new OutOfRangeException('Custom message'));
     }
 
+    public function testHandlerReportsExceptionWithInlineLogLevel()
+    {
+        $logger = Mockery::mock(LoggerInterface::class);
+        $this->container->instance(LoggerInterface::class, $logger);
+
+        $logger->expects('warning')->withArgs([
+            'Warning message',
+            Mockery::subset(['from' => 'user@example.com']),
+        ]);
+
+        $this->handler->level(InvalidArgumentException::class, LogLevel::CRITICAL);
+
+        $this->handler->report(
+            new InvalidArgumentException('Warning message'),
+            ['from' => 'user@example.com'],
+            LogLevel::WARNING,
+        );
+    }
+
     public function testHandlerIgnoresNotReportableExceptions()
     {
         $logger = Mockery::mock(LoggerInterface::class);

tests/Integration/Foundation/FoundationHelpersTest.php

@@ -8,9 +8,24 @@
 use Illuminate\Support\Str;
 use Orchestra\Testbench\Attributes\WithConfig;
 use Orchestra\Testbench\TestCase;
+use Psr\Log\LogLevel;
 
 class FoundationHelpersTest extends TestCase
 {
+    public function testReportHelpersForwardContextAndLevel()
+    {
+        $handler = new FakeHandler;
+        $this->app->instance(ExceptionHandler::class, $handler);
+
+        report($first = new Exception('First'), ['id' => 1], LogLevel::WARNING);
+        report_if(true, $second = new Exception('Second'), ['id' => 2], LogLevel::NOTICE);
+        report_unless(false, $third = new Exception('Third'), ['id' => 3], LogLevel::INFO);
+
+        $this->assertSame([$first, $second, $third], $handler->reported);
+        $this->assertSame([['id' => 1], ['id' => 2], ['id' => 3]], $handler->contexts);
+        $this->assertSame([LogLevel::WARNING, LogLevel::NOTICE, LogLevel::INFO], $handler->levels);
+    }
+
     public function testRescue()
     {
         $this->assertSame(
@@ -164,10 +179,14 @@ protected function makeManifest($directory = '')
 class FakeHandler
 {
     public $reported = [];
+    public $contexts = [];
+    public $levels = [];
 
-    public function report($exception)
+    public function report($exception, array $context = [], ?string $level = null)
     {
         $this->reported[] = $exception;
+        $this->contexts[] = $context;
+        $this->levels[] = $level;
     }
 
     public function render($exception)

tests/Queue/QueueWorkerTest.php

@@ -812,7 +812,7 @@ public function getConnectionName()
 
 class ShouldntRetryExceptionHandler implements ExceptionHandler
 {
-    public function report(\Throwable $e, array $context = [])
+    public function report(\Throwable $e, array $context = [], ?string $level = null)
     {
         //
     }