Skip to content

Make type hint for InputValueDefinitionNode#defaultValue nullable #654

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

Merged
simPod merged 2 commits into from
Apr 27, 2020
Merged

Make type hint for InputValueDefinitionNode#defaultValue nullable #654

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8258069
Make type hint for InputValueDefinitionNode#defaultValue nullable
spawnia Apr 26, 2020
e4dd1ed
Fix PHPStan
spawnia Apr 26, 2020
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
13 changes: 4 additions & 9 deletions phpstan-baseline.neon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -815,11 +815,6 @@ parameters:
count: 1
path: src/Utils/ASTDefinitionBuilder.php

-
message: "#^Only booleans are allowed in an if condition, GraphQL\\\\Language\\\\AST\\\\BooleanValueNode\\|GraphQL\\\\Language\\\\AST\\\\EnumValueNode\\|GraphQL\\\\Language\\\\AST\\\\FloatValueNode\\|GraphQL\\\\Language\\\\AST\\\\IntValueNode\\|GraphQL\\\\Language\\\\AST\\\\ListValueNode\\|GraphQL\\\\Language\\\\AST\\\\NullValueNode\\|GraphQL\\\\Language\\\\AST\\\\ObjectValueNode\\|GraphQL\\\\Language\\\\AST\\\\StringValueNode\\|GraphQL\\\\Language\\\\AST\\\\VariableNode given\\.$#"
count: 1
path: src/Utils/ASTDefinitionBuilder.php

-
message: "#^Anonymous function should have native return typehint \"bool\"\\.$#"
count: 2
Expand Down Expand Up @@ -1496,22 +1491,22 @@ parameters:
path: src/Validator/Rules/ValuesOfCorrectType.php

-
message: "#^Only booleans are allowed in \\|\\|, GraphQL\\\\Type\\\\Definition\\\\EnumType\\|GraphQL\\\\Type\\\\Definition\\\\InputObjectType\\|GraphQL\\\\Type\\\\Definition\\\\ListOfType\\|GraphQL\\\\Type\\\\Definition\\\\NonNull\\|GraphQL\\\\Type\\\\Definition\\\\ScalarType given on the left side\\.$#"
message: "#^Anonymous function should have native return typehint \"string\"\\.$#"
count: 1
path: src/Validator/Rules/ValuesOfCorrectType.php

-
message: "#^Only booleans are allowed in a negated boolean, GraphQL\\\\Type\\\\Definition\\\\EnumValueDefinition\\|null given\\.$#"
message: "#^Only booleans are allowed in \\|\\|, GraphQL\\\\Type\\\\Definition\\\\EnumType\\|GraphQL\\\\Type\\\\Definition\\\\InputObjectType\\|GraphQL\\\\Type\\\\Definition\\\\ListOfType\\|GraphQL\\\\Type\\\\Definition\\\\NonNull\\|GraphQL\\\\Type\\\\Definition\\\\ScalarType given on the left side\\.$#"
count: 1
path: src/Validator/Rules/ValuesOfCorrectType.php

-
message: "#^Only booleans are allowed in a negated boolean, GraphQL\\\\Type\\\\Definition\\\\EnumType\\|GraphQL\\\\Type\\\\Definition\\\\InputObjectType\\|GraphQL\\\\Type\\\\Definition\\\\ListOfType\\|GraphQL\\\\Type\\\\Definition\\\\NonNull\\|GraphQL\\\\Type\\\\Definition\\\\ScalarType given\\.$#"
message: "#^Only booleans are allowed in a negated boolean, GraphQL\\\\Type\\\\Definition\\\\EnumValueDefinition\\|null given\\.$#"
count: 1
path: src/Validator/Rules/ValuesOfCorrectType.php

-
message: "#^Anonymous function should have native return typehint \"string\"\\.$#"
message: "#^Only booleans are allowed in a negated boolean, GraphQL\\\\Type\\\\Definition\\\\EnumType\\|GraphQL\\\\Type\\\\Definition\\\\InputObjectType\\|GraphQL\\\\Type\\\\Definition\\\\ListOfType\\|GraphQL\\\\Type\\\\Definition\\\\NonNull\\|GraphQL\\\\Type\\\\Definition\\\\ScalarType given\\.$#"
count: 1
path: src/Validator/Rules/ValuesOfCorrectType.php

Expand Down
2 changes: 1 addition & 1 deletion src/Language/AST/InputValueDefinitionNode.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ class InputValueDefinitionNode extends Node
/** @var NamedTypeNode|ListTypeNode|NonNullTypeNode */
public $type;

/** @var VariableNode|NullValueNode|IntValueNode|FloatValueNode|StringValueNode|BooleanValueNode|EnumValueNode|ListValueNode|ObjectValueNode */
/** @var VariableNode|NullValueNode|IntValueNode|FloatValueNode|StringValueNode|BooleanValueNode|EnumValueNode|ListValueNode|ObjectValueNode|null */
public $defaultValue;

/** @var DirectiveNode[] */
Expand Down
2 changes: 1 addition & 1 deletion src/Utils/ASTDefinitionBuilder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -472,7 +472,7 @@ public function buildInputField(InputValueDefinitionNode $value) : array
'astNode' => $value,
];

if ($value->defaultValue) {
if ($value->defaultValue !== null) {
$config['defaultValue'] = $value->defaultValue;
}

Expand Down