Skip to content

Commit 6a05006

Browse files
authored
[12.x] fix no arguments return type in request class (#55631)
* fix `null` parameter return type in request class * fix styling
1 parent 39fa0e9 commit 6a05006

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

src/Illuminate/Http/Request.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,7 @@ public function get(string $key, mixed $default = null): mixed
417417
*
418418
* @param string|null $key
419419
* @param mixed $default
420-
* @return \Symfony\Component\HttpFoundation\InputBag|mixed
420+
* @return ($key is null ? \Symfony\Component\HttpFoundation\InputBag : mixed)
421421
*/
422422
public function json($key = null, $default = null)
423423
{
@@ -633,7 +633,7 @@ public function user($guard = null)
633633
*
634634
* @param string|null $param
635635
* @param mixed $default
636-
* @return \Illuminate\Routing\Route|object|string|null
636+
* @return ($param is null ? \Illuminate\Routing\Route : object|string|null)
637637
*/
638638
public function route($param = null, $default = null)
639639
{

types/Http/Request.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,9 @@ enum TestEnum: string
1414
]);
1515

1616
assertType('TestEnum|null', $request->enum('key', TestEnum::class));
17+
18+
assertType('Illuminate\Routing\Route', $request->route());
19+
assertType('object|string|null', $request->route('key'));
20+
21+
assertType('Symfony\Component\HttpFoundation\InputBag', $request->json());
22+
assertType('mixed', $request->json('key'));

0 commit comments

Comments
 (0)