Skip to content

Commit 79cfff1

Browse files
authored
Merge branch '0.14' into improve-graphql-services
2 parents a51dc91 + 50c58f0 commit 79cfff1

File tree

2 files changed

+11
-9
lines changed

2 files changed

+11
-9
lines changed

README.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
OverblogGraphQLBundle
22
======================
33

4-
![CI](https://github.com/overblog/GraphQLBundle/workflows/CI/badge.svg?branch=master)
5-
[![Build status](https://ci.appveyor.com/api/projects/status/7ksxlcgwt40q74hv/branch/master?svg=true)](https://ci.appveyor.com/project/overblog/graphqlbundle/branch/master)
6-
[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/overblog/GraphQLBundle/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/overblog/GraphQLBundle/?branch=master)
7-
[![Coverage Status](https://coveralls.io/repos/github/overblog/GraphQLBundle/badge.svg?branch=master)](https://coveralls.io/github/overblog/GraphQLBundle?branch=master)
4+
![CI](https://github.com/overblog/GraphQLBundle/workflows/CI/badge.svg?branch=0.14)
5+
[![Build status](https://ci.appveyor.com/api/projects/status/7ksxlcgwt40q74hv/branch/0.14?svg=true)](https://ci.appveyor.com/project/overblog/graphqlbundle/branch/0.14)
6+
[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/overblog/GraphQLBundle/badges/quality-score.png?b=0.14)](https://scrutinizer-ci.com/g/overblog/GraphQLBundle/?branch=0.14)
7+
[![Coverage Status](https://coveralls.io/repos/github/overblog/GraphQLBundle/badge.svg?branch=0.14)](https://coveralls.io/github/overblog/GraphQLBundle?branch=0.14)
88
[![Latest Stable Version](https://poser.pugx.org/overblog/graphql-bundle/version)](https://packagist.org/packages/overblog/graphql-bundle)
99
[![Latest Unstable Version](https://poser.pugx.org/overblog/graphql-bundle/v/unstable)](https://packagist.org/packages/overblog/graphql-bundle)
1010
[![Total Downloads](https://poser.pugx.org/overblog/graphql-bundle/downloads)](https://packagist.org/packages/overblog/graphql-bundle)
@@ -19,6 +19,7 @@ It also supports:
1919
Browse your version documentation:
2020

2121
* [1.0 (DEV)](https://github.com/overblog/GraphQLBundle/blob/master/README.md)
22+
* [0.14 (DEV)](https://github.com/overblog/GraphQLBundle/blob/0.14/README.md)
2223
* [0.13 (STABLE)](https://github.com/overblog/GraphQLBundle/blob/0.13/README.md)
2324
* [0.12 (STABLE)](https://github.com/overblog/GraphQLBundle/blob/0.12/README.md)
2425
* [0.11 (STABLE)](https://github.com/overblog/GraphQLBundle/blob/0.11/README.md)

src/Request/Parser.php

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

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

9293
// Override request using query-string parameters
93-
$query = $qs->has(static::PARAM_QUERY) ? $qs->get(static::PARAM_QUERY) : $data[static::PARAM_QUERY];
94-
$variables = $qs->has(static::PARAM_VARIABLES) ? $qs->get(static::PARAM_VARIABLES) : $data[static::PARAM_VARIABLES];
95-
$operationName = $qs->has(static::PARAM_OPERATION_NAME) ? $qs->get(static::PARAM_OPERATION_NAME) : $data[static::PARAM_OPERATION_NAME];
94+
$query = $queryParameters[static::PARAM_QUERY] ?? $data[static::PARAM_QUERY];
95+
$variables = $queryParameters[static::PARAM_VARIABLES] ?? $data[static::PARAM_VARIABLES];
96+
$operationName = $queryParameters[static::PARAM_OPERATION_NAME] ?? $data[static::PARAM_OPERATION_NAME];
9697

9798
// `query` parameter is mandatory.
9899
if (empty($query)) {

0 commit comments

Comments
 (0)