Skip to content

Commit e264904

Browse files
authored
Refactor FormBuilder to use Request facade instead of global helpers (#657)
1 parent b6661a9 commit e264904

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

src/Html/FormBuilder.php

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?php namespace October\Rain\Html;
22

3+
use Illuminate\Support\Facades\Request;
34
use Illuminate\Session\Store as Session;
45
use Illuminate\Routing\UrlGenerator as UrlGeneratorBase;
56
use Illuminate\Support\Arr;
@@ -1052,8 +1053,9 @@ public function value($name, $value = null)
10521053
return $this->old($name);
10531054
}
10541055

1055-
if (!is_null(input($name, null))) {
1056-
return input($name);
1056+
$inputValue = Request::input(Helper::nameToDot($name));
1057+
if (!is_null($inputValue)) {
1058+
return $inputValue;
10571059
}
10581060

10591061
if (isset($this->model)) {
@@ -1083,7 +1085,9 @@ protected function requestHandler($name = null)
10831085
public function sessionKey($sessionKey = null)
10841086
{
10851087
if (!$sessionKey) {
1086-
$sessionKey = post('_session_key', $this->sessionKey);
1088+
$sessionKey = Request::getRealMethod() === 'POST'
1089+
? Request::post('_session_key', $this->sessionKey)
1090+
: $this->sessionKey;
10871091
}
10881092

10891093
return $this->hidden('_session_key', $sessionKey);

0 commit comments

Comments
 (0)