make request helper and __get consistent

src/Illuminate/Foundation/helpers.php

@@ -695,7 +695,9 @@ function request($key = null, $default = null)
             return app('request')->only($key);
         }
 
-        return data_get(app('request')->all(), $key, $default);
+        $value = app('request')->__get($key);
+
+        return is_null($value) ? value($default) : $value;
     }
 }
 

src/Illuminate/Http/Request.php

@@ -530,7 +530,9 @@ public function toArray()
      */
     public function offsetExists($offset)
     {
-        return array_key_exists($offset, $this->all());
+        return array_key_exists(
+            $offset, $this->all() + $this->route()->parameters()
+        );
     }
 
     /**
@@ -541,7 +543,7 @@ public function offsetExists($offset)
      */
     public function offsetGet($offset)
     {
-        return data_get($this->all(), $offset);
+        return $this->__get($offset);
     }
 
     /**
@@ -586,8 +588,8 @@ public function __isset($key)
      */
     public function __get($key)
     {
-        if ($this->offsetExists($key)) {
-            return $this->offsetGet($key);
+        if (array_key_exists($key, $this->all())) {
+            return data_get($this->all(), $key);
         }
 
         return $this->route($key);

tests/Http/HttpRequestTest.php

@@ -693,8 +693,8 @@ public function testMagicMethods()
 
         // Parameter 'empty' is '', then it ISSET and is EMPTY.
         $this->assertEquals($request->empty, '');
-        $this->assertEquals(isset($request->empty), true);
-        $this->assertEquals(empty($request->empty), true);
+        $this->assertTrue(isset($request->empty));
+        $this->assertTrue(empty($request->empty));
 
         // Parameter 'undefined' is undefined/null, then it NOT ISSET and is EMPTY.
         $this->assertEquals($request->undefined, null);
@@ -711,7 +711,8 @@ public function testMagicMethods()
         });
 
         // Router parameter 'foo' is 'bar', then it ISSET and is NOT EMPTY.
-        $this->assertEquals($request->foo, 'bar');
+        $this->assertEquals('bar', $request->foo);
+        $this->assertEquals('bar', $request['foo']);
         $this->assertEquals(isset($request->foo), true);
         $this->assertEquals(empty($request->foo), false);