Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge guessed argument properties and args described with GQL\Arg #1151

Merged
merged 10 commits into from
Mar 5, 2024
Merged

Merge guessed argument properties and args described with GQL\Arg #1151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
f78a5d5
Merge guessed argument properties and args described with GQL\Arg
mathroc Jan 12, 2024
11f0f13
Update src/Config/Parser/MetadataParser/MetadataParser.php
mathroc Jan 12, 2024
d6d4c02
Update src/Config/Parser/MetadataParser/MetadataParser.php
mathroc Jan 12, 2024
941c5fc
Only guess arguments that don't have a GQL\Arg describing them
mathroc Jan 12, 2024
3a50fa8
Add test
mathroc Jan 12, 2024
9144e2c
fix expected order of argument in tests
mathroc Jan 15, 2024
a3bd4cc
up
mathroc Jan 15, 2024
162e7f7
fix Coding Standard
mathroc Feb 8, 2024
5fd75d5
Merge branch 'master' into patch-2
Vincz Feb 8, 2024
b878a27
Merge branch 'master' into patch-2
Vincz Mar 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions src/Config/Parser/MetadataParser/MetadataParser.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -570,8 +570,8 @@ private static function getTypeFieldConfigurationFromReflector(ReflectionClass $
}
}

if (empty($argAnnotations) && $reflector instanceof ReflectionMethod) {
$args = self::guessArgs($reflectionClass, $reflector);
if ($reflector instanceof ReflectionMethod) {
$args = self::guessArgs($reflectionClass, $reflector, $args);
}

if (!empty($args)) {
Expand Down Expand Up @@ -924,10 +924,16 @@ private static function guessType(ReflectionClass $reflectionClass, Reflector $r
/**
* Transform a method arguments from reflection to a list of GraphQL argument.
*/
private static function guessArgs(ReflectionClass $reflectionClass, ReflectionMethod $method): array
{
$arguments = [];
private static function guessArgs(
ReflectionClass $reflectionClass,
ReflectionMethod $method,
array $arguments,
): array {
foreach ($method->getParameters() as $index => $parameter) {
if (array_key_exists($parameter->getName(), $arguments)) {
continue;
}

try {
$gqlType = self::guessType($reflectionClass, $parameter, self::VALID_INPUT_TYPES);
} catch (TypeGuessingException $exception) {
Expand Down
4 changes: 2 additions & 2 deletions tests/Config/Parser/MetadataParserTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -452,15 +452,15 @@ public function testArgsAndReturnGuessing(): void
'type' => 'Int',
'args' => [
'areaId' => ['type' => 'Int!'],
'raceId' => ['type' => 'String!'],
'raceId' => ['type' => 'String!', 'description' => 'A race ID'],
'dayStart' => ['type' => 'Int', 'defaultValue' => null],
'dayEnd' => ['type' => 'Int', 'defaultValue' => null],
'nameStartingWith' => ['type' => 'String', 'defaultValue' => ''],
'planet' => ['type' => 'PlanetInput', 'defaultValue' => null],
'away' => ['type' => 'Boolean', 'defaultValue' => false],
'maxDistance' => ['type' => 'Float', 'defaultValue' => null],
],
'resolve' => '@=call(value.getCasualties, arguments({areaId: "Int!", raceId: "String!", dayStart: "Int", dayEnd: "Int", nameStartingWith: "String", planet: "PlanetInput", away: "Boolean", maxDistance: "Float"}, args))',
'resolve' => '@=call(value.getCasualties, arguments({raceId: "String!", areaId: "Int!", dayStart: "Int", dayEnd: "Int", nameStartingWith: "String", planet: "PlanetInput", away: "Boolean", maxDistance: "Float"}, args))',
'complexity' => '@=childrenComplexity * 5',
],
],
Expand Down
5 changes: 4 additions & 1 deletion tests/Config/Parser/fixtures/annotations/Type/Battle.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,14 @@ final class Battle

/**
* @GQL\Field(name="casualties", complexity="childrenComplexity * 5")
*
* @GQL\Arg(name="raceId", type="String!", description="A race ID")
*/
#[GQL\Field(name: 'casualties', complexity: 'childrenComplexity * 5')]
#[GQL\Arg(name: 'raceId', type: 'String!', description: 'A race ID')]
public function getCasualties(
int $areaId,
string $raceId,
?string $raceId,
int $dayStart = null,
int $dayEnd = null,
string $nameStartingWith = '',
Expand Down
Loading