Skip to content

Commit 764c796

Browse files
authored
[11.x] Prefer new Fluent over fluent() helper (#53890)
1 parent fadcb3d commit 764c796

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

src/Illuminate/Http/Concerns/InteractsWithInput.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
use Illuminate\Http\UploadedFile;
66
use Illuminate\Support\Arr;
7+
use Illuminate\Support\Fluent;
78
use Illuminate\Support\Traits\Dumpable;
89
use Illuminate\Support\Traits\InteractsWithData;
910
use SplFileInfo;
@@ -121,7 +122,7 @@ public function input($key = null, $default = null)
121122
*/
122123
public function fluent($key = null)
123124
{
124-
return fluent(is_array($key) ? $this->only($key) : $this->input($key));
125+
return new Fluent(is_array($key) ? $this->only($key) : $this->input($key));
125126
}
126127

127128
/**

tests/Http/HttpClientTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -414,10 +414,10 @@ public function testResponseCanBeReturnedAsFluent()
414414
$response = $this->factory->get('http://foo.com/api');
415415

416416
$this->assertInstanceOf(Fluent::class, $response->fluent());
417-
$this->assertEquals(fluent(['result' => ['foo' => 'bar']]), $response->fluent());
418-
$this->assertEquals(fluent(['foo' => 'bar']), $response->fluent('result'));
419-
$this->assertEquals(fluent(['bar']), $response->fluent('result.foo'));
420-
$this->assertEquals(fluent([]), $response->fluent('missing_key'));
417+
$this->assertEquals(new Fluent(['result' => ['foo' => 'bar']]), $response->fluent());
418+
$this->assertEquals(new Fluent(['foo' => 'bar']), $response->fluent('result'));
419+
$this->assertEquals(new Fluent(['bar']), $response->fluent('result.foo'));
420+
$this->assertEquals(new Fluent([]), $response->fluent('missing_key'));
421421
}
422422

423423
public function testSendRequestBodyAsJsonByDefault()

0 commit comments

Comments
 (0)