Skip to content

Commit 377a3bc

Browse files
Update doctrine/coding-standard requirement from ^13.0 to ^13.0 || ^14.0 (#803)
* Update doctrine/coding-standard requirement from ^13.0 to ^13.0 || ^14.0 Updates the requirements on [doctrine/coding-standard](https://github.com/doctrine/coding-standard) to permit the latest version. - [Release notes](https://github.com/doctrine/coding-standard/releases) - [Commits](doctrine/coding-standard@13.0.0...14.0.0) --- updated-dependencies: - dependency-name: doctrine/coding-standard dependency-version: 14.0.0 dependency-type: direct:development ... Signed-off-by: dependabot[bot] <support@github.com> * Fix 2 CS issues in MutableInputObjectType: inline doc comment placement and format * Fix CS issue: replace @var inline doc with direct variable use in MutableInputObjectType * Fix PHPStan and PHPCS issues in MutableInputObjectType: use @phpstan-var to satisfy both tools * Fix PHPStan type error: assert InputType before passing to InputObjectField --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
1 parent 560339d commit 377a3bc

2 files changed

Lines changed: 9 additions & 14 deletions

File tree

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
},
2929
"require-dev": {
3030
"beberlei/porpaginas": "^2.0",
31-
"doctrine/coding-standard": "^13.0",
31+
"doctrine/coding-standard": "^13.0 || ^14.0",
3232
"ecodev/graphql-upload": "^7.0",
3333
"laminas/laminas-diactoros": "^3.5",
3434
"php-coveralls/php-coveralls": "^2.7",

src/Types/MutableInputObjectType.php

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
use GraphQL\Error\InvariantViolation;
88
use GraphQL\Type\Definition\InputObjectField;
99
use GraphQL\Type\Definition\InputObjectType;
10+
use GraphQL\Type\Definition\InputType;
1011
use GraphQL\Type\Definition\Type;
1112
use RuntimeException;
1213

@@ -18,7 +19,6 @@
1819
* It can be later extended with the "Decorate" annotation
1920
*
2021
* @phpstan-import-type InputObjectConfig from InputObjectType
21-
* @phpstan-import-type ArgumentType from InputObjectField
2222
* @phpstan-import-type InputObjectFieldConfig from InputObjectField
2323
*/
2424
class MutableInputObjectType extends InputObjectType implements MutableInputInterface
@@ -90,21 +90,16 @@ public function getFields(): array
9090
$this->finalFields = parent::getFields();
9191
foreach ($this->fieldsCallables as $fieldsCallable) {
9292
$fieldDefinitions = $fieldsCallable();
93-
/** @var (ArgumentType)[] $fieldDefinitions */
9493
foreach ($fieldDefinitions as $name => $fieldDefinition) {
94+
assert(is_string($name));
9595
if ($fieldDefinition instanceof Type) {
96-
$fieldDefinition = ['type' => $fieldDefinition];
96+
assert($fieldDefinition instanceof InputType);
97+
$this->finalFields[$name] = new InputObjectField(['name' => $name, 'type' => $fieldDefinition]);
98+
} else {
99+
/** @phpstan-var InputObjectFieldConfig $fieldDefinition */
100+
$fieldDefinition['name'] = $name;
101+
$this->finalFields[$name] = new InputObjectField($fieldDefinition);
97102
}
98-
assert(is_string($name));
99-
// @codingStandardsIgnoreStart
100-
/**
101-
* @var InputObjectFieldConfig $config
102-
*/
103-
// @codingStandardsIgnoreEnd
104-
105-
$config = $fieldDefinition;
106-
$config['name'] = $name;
107-
$this->finalFields[$name] = new InputObjectField($config);
108103
}
109104
}
110105
if (empty($this->finalFields)) {

0 commit comments

Comments
 (0)