Skip to content

Commit 3d4a3ed

Browse files
committed
Merge branch '6.4' into 7.0
* 6.4: [HttpFoundation] replace $request->request by getPayload()
2 parents d482950 + 345b4e5 commit 3d4a3ed

9 files changed

+14
-14
lines changed

controller.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -598,7 +598,7 @@ the ``Request`` class::
598598

599599
// retrieves GET and POST variables respectively
600600
$request->query->get('page');
601-
$request->request->get('page');
601+
$request->getPayload()->get('page');
602602

603603
// retrieves SERVER variables
604604
$request->server->get('HTTP_HOST');

create_framework/http_foundation.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ fingertips thanks to a nice and simple API::
178178

179179
// retrieves GET and POST variables respectively
180180
$request->query->get('foo');
181-
$request->request->get('bar', 'default value if bar does not exist');
181+
$request->getPayload()->get('bar', 'default value if bar does not exist');
182182

183183
// retrieves SERVER variables
184184
$request->server->get('HTTP_HOST');

form/direct_submit.rst

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ control over when exactly your form is submitted and what data is passed to it::
1717
$form = $this->createForm(TaskType::class, $task);
1818

1919
if ($request->isMethod('POST')) {
20-
$form->submit($request->request->all($form->getName()));
20+
$form->submit($request->getPayload()->get($form->getName()));
2121

2222
if ($form->isSubmitted() && $form->isValid()) {
2323
// perform some action...
@@ -41,7 +41,7 @@ the fields defined by the form class. Otherwise, you'll see a form validation er
4141
if ($request->isMethod('POST')) {
4242
// '$json' represents payload data sent by React/Angular/Vue
4343
// the merge of parameters is needed to submit all form fields
44-
$form->submit(array_merge($json, $request->request->all()));
44+
$form->submit(array_merge($json, $request->getPayload()->all()));
4545

4646
// ...
4747
}
@@ -73,4 +73,4 @@ the fields defined by the form class. Otherwise, you'll see a form validation er
7373
manually so that they are validated::
7474

7575
// 'email' and 'username' are added manually to force their validation
76-
$form->submit(array_merge(['email' => null, 'username' => null], $request->request->all()), false);
76+
$form->submit(array_merge(['email' => null, 'username' => null], $request->getPayload()->all()), false);

form/without_class.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ an array.
5959
You can also access POST values (in this case "name") directly through
6060
the request object, like so::
6161

62-
$request->request->get('name');
62+
$request->getPayload()->get('name');
6363

6464
Be advised, however, that in most cases using the ``getData()`` method is
6565
a better choice, since it returns the data (usually an object) after

html_sanitizer.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ automatically when type-hinting for
5252
{
5353
public function createAction(HtmlSanitizerInterface $htmlSanitizer, Request $request): Response
5454
{
55-
$unsafeContents = $request->request->get('post_contents');
55+
$unsafeContents = $request->getPayload()->get('post_contents');
5656
5757
$safeContents = $htmlSanitizer->sanitize($unsafeContents);
5858
// ... proceed using the safe HTML

introduction/http_fundamentals.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ have all the request information at your fingertips::
216216

217217
// retrieves $_GET and $_POST variables respectively
218218
$request->query->get('id');
219-
$request->request->get('category', 'default category');
219+
$request->getPayload()->get('category', 'default category');
220220

221221
// retrieves $_SERVER variables
222222
$request->server->get('HTTP_HOST');

security/csrf.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ method to check its validity::
156156

157157
public function delete(Request $request): Response
158158
{
159-
$submittedToken = $request->request->get('token');
159+
$submittedToken = $request->getPayload()->get('token');
160160

161161
// 'delete-item' is the same value used in the template to generate the token
162162
if ($this->isCsrfTokenValid('delete-item', $submittedToken)) {

security/custom_authenticator.rst

+3-3
Original file line numberDiff line numberDiff line change
@@ -339,9 +339,9 @@ would initialize the passport like this::
339339
{
340340
public function authenticate(Request $request): Passport
341341
{
342-
$password = $request->request->get('password');
343-
$username = $request->request->get('username');
344-
$csrfToken = $request->request->get('csrf_token');
342+
$password = $request->getPayload()->get('password');
343+
$username = $request->getPayload()->get('username');
344+
$csrfToken = $request->getPayload()->get('csrf_token');
345345

346346
// ... validate no parameter is empty
347347

security/login_link.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ this interface::
159159
// check if form is submitted
160160
if ($request->isMethod('POST')) {
161161
// load the user in some way (e.g. using the form input)
162-
$email = $request->request->get('email');
162+
$email = $request->getPayload()->get('email');
163163
$user = $userRepository->findOneBy(['email' => $email]);
164164

165165
// create a login link for $user this returns an instance
@@ -228,7 +228,7 @@ number::
228228
public function requestLoginLink(NotifierInterface $notifier, LoginLinkHandlerInterface $loginLinkHandler, UserRepository $userRepository, Request $request): Response
229229
{
230230
if ($request->isMethod('POST')) {
231-
$email = $request->request->get('email');
231+
$email = $request->getPayload()->get('email');
232232
$user = $userRepository->findOneBy(['email' => $email]);
233233

234234
$loginLinkDetails = $loginLinkHandler->createLoginLink($user);

0 commit comments

Comments
 (0)