[8.x] fix Request offsetExists without routeResolver (#42754)

* fix Request offsetExists without routeResolver * simplify test * formatting Co-authored-by: Taylor Otwell <[email protected]>
laravel · Jun 10, 2022 · cd6e76f · cd6e76f
1 parent 76faca7
commit cd6e76f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/src/Illuminate/Http/Request.php b/src/Illuminate/Http/Request.php
@@ -669,8 +669,10 @@ public function toArray()
     #[\ReturnTypeWillChange]
     public function offsetExists($offset)
     {
+        $route = $this->route();
+
         return Arr::has(
-            $this->all() + $this->route()->parameters(),
+            $this->all() + ($route ? $route->parameters() : []),
             $offset
         );
     }

diff --git a/tests/Http/HttpRequestTest.php b/tests/Http/HttpRequestTest.php
@@ -613,6 +613,17 @@ public function testArrayAccess()
         $this->assertSame('foo', $request['id']);
     }
 
+    public function testArrayAccessWithoutRouteResolver()
+    {
+        $request = Request::create('/', 'GET', ['name' => 'Taylor']);
+
+        $this->assertFalse(isset($request['non-existent']));
+        $this->assertNull($request['non-existent']);
+
+        $this->assertTrue(isset($request['name']));
+        $this->assertSame('Taylor', $request['name']);
+    }
+
     public function testAllMethod()
     {
         $request = Request::create('/', 'GET', ['name' => 'Taylor', 'age' => null]);