Remove trailing comma from array shapes since psalm cannot read it

simPod · spawnia · commit 58fea65dfdbf · 2022-01-30T14:36:32.000+01:00
Causes huge amount of type errors with code bases using psalm
diff --git a/src/Executor/ExecutionResult.php b/src/Executor/ExecutionResult.php
@@ -23,13 +23,13 @@
  *   message: string,
  *   locations?: array<int, array{line: int, column: int}>,
  *   path?: array<int, int|string>,
- *   extensions?: array<string, mixed>,
+ *   extensions?: array<string, mixed>
  * }
  * @phpstan-type SerializableErrors array<int, SerializableError>
  * @phpstan-type SerializableResult array{
  *     data?: array<string, mixed>,
  *     errors?: SerializableErrors,
- *     extensions?: array<string, mixed>,
+ *     extensions?: array<string, mixed>
  * }
  * @phpstan-type ErrorFormatter callable(Throwable): SerializableError
  * @phpstan-type ErrorsHandler callable(array<Error> $errors, ErrorFormatter $formatter): SerializableErrors
diff --git a/src/Language/Parser.php b/src/Language/Parser.php
@@ -66,7 +66,7 @@
  *   noLocation?: bool,
  *   allowLegacySDLEmptyFields?: bool,
  *   allowLegacySDLImplementsInterfaces?: bool,
- *   experimentalFragmentVariables?: bool,
+ *   experimentalFragmentVariables?: bool
  * }
  *
  * noLocation:
diff --git a/src/Type/Definition/Argument.php b/src/Type/Definition/Argument.php
@@ -16,14 +16,14 @@
  *     type: ArgumentType,
  *     defaultValue?: mixed,
  *     description?: string|null,
- *     astNode?: InputValueDefinitionNode|null,
+ *     astNode?: InputValueDefinitionNode|null
  * }
  * @phpstan-type ArgumentConfig array{
  *     name: string,
  *     type: ArgumentType,
  *     defaultValue?: mixed,
  *     description?: string|null,
- *     astNode?: InputValueDefinitionNode|null,
+ *     astNode?: InputValueDefinitionNode|null
  * }
  * @phpstan-type ArgumentListConfig iterable<ArgumentConfig|ArgumentType>|iterable<UnnamedArgumentConfig>
  */
diff --git a/src/Type/Definition/CustomScalarType.php b/src/Type/Definition/CustomScalarType.php
@@ -18,7 +18,7 @@
  *   parseValue: callable(mixed): mixed,
  *   parseLiteral: callable(ValueNode&Node, array<string, mixed>|null): mixed,
  *   astNode?: ScalarTypeDefinitionNode|null,
- *   extensionASTNodes?: array<ScalarTypeExtensionNode>|null,
+ *   extensionASTNodes?: array<ScalarTypeExtensionNode>|null
  * }
  * @phpstan-type OutputCustomScalarConfig array{
  *   name?: string|null,
@@ -27,7 +27,7 @@
  *   parseValue?: callable(mixed): mixed,
  *   parseLiteral?: callable(ValueNode&Node, array<string, mixed>|null): mixed,
  *   astNode?: ScalarTypeDefinitionNode|null,
- *   extensionASTNodes?: array<ScalarTypeExtensionNode>|null,
+ *   extensionASTNodes?: array<ScalarTypeExtensionNode>|null
  * }
  * @phpstan-type CustomScalarConfig InputCustomScalarConfig|OutputCustomScalarConfig
  */
diff --git a/src/Type/Definition/Directive.php b/src/Type/Definition/Directive.php
@@ -14,7 +14,7 @@
  *   args?: ArgumentListConfig|null,
  *   locations: array<string>,
  *   isRepeatable?: bool|null,
- *   astNode?: DirectiveDefinitionNode|null,
+ *   astNode?: DirectiveDefinitionNode|null
  * }
  */
 class Directive
diff --git a/src/Type/Definition/EnumType.php b/src/Type/Definition/EnumType.php
@@ -23,15 +23,15 @@
  *   value?: mixed,
  *   deprecationReason?: string|null,
  *   description?: string|null,
- *   astNode?: EnumValueDefinitionNode|null,
+ *   astNode?: EnumValueDefinitionNode|null
  * }
  * @phpstan-type EnumValues iterable<string, PartialEnumValueConfig>|iterable<string, mixed>|iterable<int, string>
  * @phpstan-type EnumTypeConfig array{
  *   name?: string|null,
  *   description?: string|null,
  *   values: EnumValues|callable(): EnumValues,
  *   astNode?: EnumTypeDefinitionNode|null,
- *   extensionASTNodes?: array<int, EnumTypeExtensionNode>|null,
+ *   extensionASTNodes?: array<int, EnumTypeExtensionNode>|null
  * }
  */
 class EnumType extends Type implements InputType, OutputType, LeafType, NullableType, NamedType
diff --git a/src/Type/Definition/EnumValueDefinition.php b/src/Type/Definition/EnumValueDefinition.php
@@ -10,7 +10,7 @@
  *   value?: mixed,
  *   deprecationReason?: string|null,
  *   description?: string|null,
- *   astNode?: EnumValueDefinitionNode|null,
+ *   astNode?: EnumValueDefinitionNode|null
  * }
  */
 class EnumValueDefinition
diff --git a/src/Type/Definition/FieldDefinition.php b/src/Type/Definition/FieldDefinition.php
@@ -25,7 +25,7 @@
  *     description?: string|null,
  *     deprecationReason?: string|null,
  *     astNode?: FieldDefinitionNode|null,
- *     complexity?: ComplexityFn|null,
+ *     complexity?: ComplexityFn|null
  * }
  * @phpstan-type UnnamedFieldDefinitionConfig array{
  *     type: FieldType,
@@ -34,7 +34,7 @@
  *     description?: string|null,
  *     deprecationReason?: string|null,
  *     astNode?: FieldDefinitionNode|null,
- *     complexity?: ComplexityFn|null,
+ *     complexity?: ComplexityFn|null
  * }
  * @phpstan-type FieldsConfig iterable<mixed>|(callable(): iterable<mixed>)
  */
diff --git a/src/Type/Definition/InputObjectField.php b/src/Type/Definition/InputObjectField.php
@@ -15,14 +15,14 @@
  *   defaultValue?: mixed,
  *   description?: string|null,
  *   type: ArgumentType,
- *   astNode?: InputValueDefinitionNode|null,
+ *   astNode?: InputValueDefinitionNode|null
  * }
  * @phpstan-type UnnamedInputObjectFieldConfig array{
  *   name?: string,
  *   defaultValue?: mixed,
  *   description?: string|null,
  *   type: ArgumentType,
- *   astNode?: InputValueDefinitionNode|null,
+ *   astNode?: InputValueDefinitionNode|null
  * }
  */
 class InputObjectField
diff --git a/src/Type/Definition/InputObjectType.php b/src/Type/Definition/InputObjectType.php
@@ -21,7 +21,7 @@
  *   description?: string|null,
  *   fields: iterable<FieldConfig>|callable(): iterable<FieldConfig>,
  *   astNode?: InputObjectTypeDefinitionNode|null,
- *   extensionASTNodes?: array<int, InputObjectTypeExtensionNode>|null,
+ *   extensionASTNodes?: array<int, InputObjectTypeExtensionNode>|null
  * }
  */
 class InputObjectType extends Type implements InputType, NullableType, NamedType
diff --git a/src/Type/Definition/InterfaceType.php b/src/Type/Definition/InterfaceType.php
@@ -20,7 +20,7 @@
  *   interfaces?: iterable<InterfaceTypeReference>|callable(): iterable<InterfaceTypeReference>,
  *   resolveType?: ResolveType|null,
  *   astNode?: InterfaceTypeDefinitionNode|null,
- *   extensionASTNodes?: array<int, InterfaceTypeExtensionNode>|null,
+ *   extensionASTNodes?: array<int, InterfaceTypeExtensionNode>|null
  * }
  */
 class InterfaceType extends Type implements AbstractType, OutputType, CompositeType, NullableType, HasFieldsType, NamedType, ImplementingType
diff --git a/src/Type/Definition/ObjectType.php b/src/Type/Definition/ObjectType.php
@@ -60,7 +60,7 @@
  *   interfaces?: iterable<InterfaceTypeReference>|callable(): iterable<InterfaceTypeReference>,
  *   isTypeOf?: (callable(mixed $objectValue, mixed $context, ResolveInfo $resolveInfo): (bool|Deferred|null))|null,
  *   astNode?: ObjectTypeDefinitionNode|null,
- *   extensionASTNodes?: array<int, ObjectTypeExtensionNode>|null,
+ *   extensionASTNodes?: array<int, ObjectTypeExtensionNode>|null
  * }
  */
 class ObjectType extends Type implements OutputType, CompositeType, NullableType, HasFieldsType, NamedType, ImplementingType
diff --git a/src/Type/Definition/QueryPlan.php b/src/Type/Definition/QueryPlan.php
@@ -26,7 +26,7 @@
 
 /**
  * @phpstan-type QueryPlanOptions array{
- *   groupImplementorFields?: bool,
+ *   groupImplementorFields?: bool
  * }
  */
 class QueryPlan
diff --git a/src/Type/Definition/ScalarType.php b/src/Type/Definition/ScalarType.php
@@ -29,7 +29,7 @@
  *   name?: string|null,
  *   description?: string|null,
  *   astNode?: ScalarTypeDefinitionNode|null,
- *   extensionASTNodes?: array<ScalarTypeExtensionNode>|null,
+ *   extensionASTNodes?: array<ScalarTypeExtensionNode>|null
  * }
  */
 abstract class ScalarType extends Type implements OutputType, InputType, LeafType, NullableType, NamedType
diff --git a/src/Type/Definition/UnionType.php b/src/Type/Definition/UnionType.php
@@ -20,7 +20,7 @@
  *   types: iterable<ObjectTypeReference>|callable(): iterable<ObjectTypeReference>,
  *   resolveType?: ResolveType|null,
  *   astNode?: UnionTypeDefinitionNode|null,
- *   extensionASTNodes?: array<UnionTypeExtensionNode>|null,
+ *   extensionASTNodes?: array<UnionTypeExtensionNode>|null
  * }
  */
 class UnionType extends Type implements AbstractType, OutputType, CompositeType, NullableType, NamedType
diff --git a/src/Utils/BreakingChangesFinder.php b/src/Utils/BreakingChangesFinder.php
@@ -29,7 +29,7 @@
  * @phpstan-type Change array{type: string, description: string}
  * @phpstan-type Changes array{
  *     breakingChanges: array<int, Change>,
- *     dangerousChanges: array<int, Change>,
+ *     dangerousChanges: array<int, Change>
  * }
  */
 class BreakingChangesFinder
diff --git a/src/Utils/BuildClientSchema.php b/src/Utils/BuildClientSchema.php
@@ -33,7 +33,7 @@
  * @phpstan-import-type UnnamedFieldDefinitionConfig from FieldDefinition
  * @phpstan-import-type UnnamedInputObjectFieldConfig from InputObjectField
  * @phpstan-type Options array{
- *   assumeValid?: bool,
+ *   assumeValid?: bool
  * }
  *
  *    - assumeValid:
diff --git a/src/Utils/BuildSchema.php b/src/Utils/BuildSchema.php
@@ -23,7 +23,7 @@
  * @phpstan-import-type TypeConfigDecorator from ASTDefinitionBuilder
  * @phpstan-type BuildSchemaOptions array{
  *   assumeValid?: bool,
- *   assumeValidSDL?: bool,
+ *   assumeValidSDL?: bool
  * }
  *
  * - assumeValid:

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@`
`66`	`66`	`* noLocation?: bool,`
`67`	`67`	`* allowLegacySDLEmptyFields?: bool,`
`68`	`68`	`* allowLegacySDLImplementsInterfaces?: bool,`
`69`		`- * experimentalFragmentVariables?: bool,`
	`69`	`+ * experimentalFragmentVariables?: bool`
`70`	`70`	`* }`
`71`	`71`	`*`
`72`	`72`	`* noLocation:`