[12.x] Improve Context::scope() return type

src/Illuminate/Log/Context/Repository.php

@@ -535,12 +535,14 @@ protected function isHiddenStackable($key)
     }
 
     /**
+     * @template TReturn of mixed
+     *
      * Run the callback function with the given context values and restore the original context state when complete.
      *
-     * @param  callable  $callback
+     * @param  (callable(): TReturn)  $callback
      * @param  array<string, mixed>  $data
      * @param  array<string, mixed>  $hidden
-     * @return mixed
+     * @return TReturn
      *
      * @throws \Throwable
      */

types/Log/Context.php

@@ -0,0 +1,15 @@
+<?php
+
+use Illuminate\Events\Dispatcher;
+use Illuminate\Log\Context\Repository;
+
+use function PHPStan\Testing\assertType;
+
+$repository = new Repository(new Dispatcher());
+
+$value = $repository->scope(fn (): int => random_int(-100, 100));
+assertType('int<-100, 100>', $value);
+
+$void = $repository->scope(function () { // @phpstan-ignore method.void
+});
+assertType('null', $void);