[9.x] Add handling of object being passed into old method (#41842)

* Add handling of model being passed into old method

* decouple database concern with the http concern

* check if object, and add test to cover an array being passed through

* lint

* check if instance of model instead of object with a getAttribute method

* Update InteractsWithFlashData.php

* Update InteractsWithFlashData.php

Co-authored-by: Taylor Otwell <[email protected]>

Author: Drewdan

src/Illuminate/Http/Concerns/InteractsWithFlashData.php

@@ -2,17 +2,21 @@
 
 namespace Illuminate\Http\Concerns;
 
+use Illuminate\Database\Eloquent\Model;
+
 trait InteractsWithFlashData
 {
     /**
      * Retrieve an old input item.
      *
      * @param  string|null  $key
-     * @param  string|array|null  $default
+     * @param  \Illuminate\Database\Eloquent\Model|string|array|null  $default
      * @return string|array|null
      */
     public function old($key = null, $default = null)
     {
+        $default = $default instanceof Model ? $default->getAttribute($key) : $default;
+
         return $this->hasSession() ? $this->session()->getOldInput($key, $default) : $default;
     }
 

tests/Http/HttpRequestTest.php

@@ -8,6 +8,7 @@
 use Illuminate\Session\Store;
 use Illuminate\Support\Carbon;
 use Illuminate\Support\Collection;
+use Illuminate\Tests\Database\Fixtures\Models\Money\Price;
 use InvalidArgumentException;
 use Mockery as m;
 use PHPUnit\Framework\TestCase;
@@ -950,6 +951,26 @@ public function testOldMethodCallsSession()
         $this->assertSame('boom', $request->old('foo', 'bar'));
     }
 
+    public function testOldMethodCallsSessionWhenDefaultIsArray()
+    {
+        $request = Request::create('/');
+        $session = m::mock(Store::class);
+        $session->shouldReceive('getOldInput')->once()->with('foo', ['bar'])->andReturn(['bar']);
+        $request->setLaravelSession($session);
+        $this->assertSame(['bar'], $request->old('foo', ['bar']));
+    }
+
+    public function testOldMethodCanGetDefaultValueFromModelByKey()
+    {
+        $request = Request::create('/');
+        $model = m::mock(Price::class);
+        $model->shouldReceive('getAttribute')->once()->with('name')->andReturn('foobar');
+        $session = m::mock(Store::class);
+        $session->shouldReceive('getOldInput')->once()->with('name', 'foobar')->andReturn('foobar');
+        $request->setLaravelSession($session);
+        $this->assertSame('foobar', $request->old('name', $model));
+    }
+
     public function testFlushMethodCallsSession()
     {
         $request = Request::create('/');