Skip to content

Commit 76d9443

Browse files
authored
Merge pull request #823 from edefimov/fix-symfony-5.2-deprecation
Forward compatibility with symfony 6 at Parser
2 parents 04b0f56 + ca56914 commit 76d9443

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

src/Request/Parser.php

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -95,13 +95,14 @@ private function getParams(Request $request, array $data = []): array
9595
static::PARAM_OPERATION_NAME => null,
9696
];
9797

98-
// Keep a reference to the query-string
99-
$qs = $request->query;
98+
// Use all query parameters, since starting from Symfony 6 there will be an exception accessing array parameters
99+
// via request->query->get(key), and another exception accessing non-array parameter via request->query->all(key)
100+
$queryParameters = $request->query->all();
100101

101102
// Override request using query-string parameters
102-
$query = $qs->has(static::PARAM_QUERY) ? $qs->get(static::PARAM_QUERY) : $data[static::PARAM_QUERY];
103-
$variables = $qs->has(static::PARAM_VARIABLES) ? $qs->get(static::PARAM_VARIABLES) : $data[static::PARAM_VARIABLES];
104-
$operationName = $qs->has(static::PARAM_OPERATION_NAME) ? $qs->get(static::PARAM_OPERATION_NAME) : $data[static::PARAM_OPERATION_NAME];
103+
$query = $queryParameters[static::PARAM_QUERY] ?? $data[static::PARAM_QUERY];
104+
$variables = $queryParameters[static::PARAM_VARIABLES] ?? $data[static::PARAM_VARIABLES];
105+
$operationName = $queryParameters[static::PARAM_OPERATION_NAME] ?? $data[static::PARAM_OPERATION_NAME];
105106

106107
// `query` parameter is mandatory.
107108
if (empty($query)) {

0 commit comments

Comments
 (0)