Add type-hints in annotation classes

murtukov · murtukov · commit aa8609a7ba2a · 2020-08-16T03:20:02.000+02:00
diff --git a/.php_cs.dist b/.php_cs.dist
@@ -1,7 +1,7 @@
 <?php
 
 $finder = PhpCsFixer\Finder::create()
-    ->exclude('vendor')
+    ->exclude('Annotation')
     ->name('*.php')
     ->in([__DIR__.'/src', __DIR__.'/tests'])
 ;
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -45,16 +45,6 @@ parameters:
 			count: 1
 			path: src/Config/Parser/AnnotationParser.php
 
-		-
-			message: "#^Access to an undefined property object\\:\\:\\$name\\.$#"
-			count: 1
-			path: src/Config/Parser/AnnotationParser.php
-
-		-
-			message: "#^Offset 'type' does not exist on array\\|string\\.$#"
-			count: 2
-			path: src/Config/Parser/AnnotationParser.php
-
 		-
 			message: "#^Access to an undefined property GraphQL\\\\Language\\\\AST\\\\Node\\:\\:\\$description\\.$#"
 			count: 1
@@ -175,11 +165,6 @@ parameters:
 			count: 1
 			path: src/Relay/Connection/Output/Connection.php
 
-		-
-			message: "#^Cannot call method then\\(\\) on array\\|object\\.$#"
-			count: 1
-			path: src/Relay/Connection/Paginator.php
-
 		-
 			message: "#^Possibly invalid array key type \\(array\\|string\\|null\\)\\.$#"
 			count: 1
@@ -195,11 +180,6 @@ parameters:
 			count: 1
 			path: src/Relay/Mutation/PayloadDefinition.php
 
-		-
-			message: "#^Parameter \\#1 \\$schema of static method Overblog\\\\GraphQLBundle\\\\Event\\\\ExecutorArgumentsEvent\\:\\:create\\(\\) expects Overblog\\\\GraphQLBundle\\\\Definition\\\\Type\\\\ExtensibleSchema, GraphQL\\\\Type\\\\Schema given\\.$#"
-			count: 1
-			path: src/Request/Executor.php
-
 		-
 			message: "#^Parameter \\#1 \\$function of function call_user_func_array expects callable\\(\\)\\: mixed, array\\(mixed, mixed\\) given\\.$#"
 			count: 1
@@ -210,11 +190,6 @@ parameters:
 			count: 1
 			path: src/Resolver/TypeResolver.php
 
-		-
-			message: "#^If condition is always true\\.$#"
-			count: 1
-			path: src/Transformer/ArgumentsTransformer.php
-
 		-
 			message: "#^Array \\(array\\<Symfony\\\\Component\\\\Validator\\\\Mapping\\\\PropertyMetadata\\>\\) does not accept Overblog\\\\GraphQLBundle\\\\Validator\\\\Mapping\\\\PropertyMetadata\\.$#"
 			count: 1
diff --git a/src/Annotation/Access.php b/src/Annotation/Access.php
@@ -19,5 +19,5 @@ final class Access implements Annotation
      *
      * @var string
      */
-    public $value;
+    public string $value;
 }
diff --git a/src/Annotation/Arg.php b/src/Annotation/Arg.php
@@ -19,14 +19,14 @@ final class Arg implements Annotation
      *
      * @var string
      */
-    public $name;
+    public string $name;
 
     /**
      * Argument description.
      *
      * @var string
      */
-    public $description;
+    public string $description;
 
     /**
      * Argument type.
@@ -35,7 +35,7 @@ final class Arg implements Annotation
      *
      * @var string
      */
-    public $type;
+    public string $type;
 
     /**
      * Default argument value.
diff --git a/src/Annotation/Deprecated.php b/src/Annotation/Deprecated.php
@@ -19,5 +19,5 @@ final class Deprecated implements Annotation
      *
      * @var string
      */
-    public $value;
+    public string $value;
 }
diff --git a/src/Annotation/Description.php b/src/Annotation/Description.php
@@ -19,5 +19,5 @@ final class Description implements Annotation
      *
      * @var string
      */
-    public $value;
+    public string $value;
 }
diff --git a/src/Annotation/Enum.php b/src/Annotation/Enum.php
@@ -17,10 +17,10 @@ final class Enum implements Annotation
      *
      * @var string
      */
-    public $name;
+    public string $name;
 
     /**
      * @var array<\Overblog\GraphQLBundle\Annotation\EnumValue>
      */
-    public $values;
+    public array $values;
 }
diff --git a/src/Annotation/EnumValue.php b/src/Annotation/EnumValue.php
@@ -15,15 +15,15 @@ final class EnumValue implements Annotation
     /**
      * @var string
      */
-    public $name;
+    public string $name;
 
     /**
      * @var string
      */
-    public $description;
+    public string $description;
 
     /**
      * @var string
      */
-    public $deprecationReason;
+    public string $deprecationReason;
 }
diff --git a/src/Annotation/Field.php b/src/Annotation/Field.php
@@ -17,7 +17,7 @@ class Field implements Annotation
      *
      * @var string
      */
-    public $name;
+    public string $name;
 
     /**
      * Field Type.
@@ -26,21 +26,21 @@ class Field implements Annotation
      *
      * @var string
      */
-    public $type;
+    public string $type;
 
     /**
      * Field arguments.
      *
      * @var array<\Overblog\GraphQLBundle\Annotation\Arg>
      */
-    public $args;
+    public array $args = [];
 
     /**
      * Resolver for this property.
      *
      * @var string
      */
-    public $resolve;
+    public string $resolve;
 
     /**
      * Args builder.
diff --git a/src/Annotation/FieldsBuilder.php b/src/Annotation/FieldsBuilder.php
@@ -19,7 +19,7 @@ final class FieldsBuilder implements Annotation
      *
      * @var string
      */
-    public $builder;
+    public string $builder;
 
     /**
      * The builder config.
diff --git a/src/Annotation/Input.php b/src/Annotation/Input.php
@@ -17,12 +17,12 @@ final class Input implements Annotation
      *
      * @var string
      */
-    public $name;
+    public string $name;
 
     /**
      * Is the type a relay input.
      *
      * @var bool
      */
-    public $isRelay = false;
+    public bool $isRelay = false;
 }
diff --git a/src/Annotation/IsPublic.php b/src/Annotation/IsPublic.php
@@ -19,5 +19,5 @@ final class IsPublic implements Annotation
      *
      * @var string
      */
-    public $value;
+    public string $value;
 }
diff --git a/src/Annotation/Mutation.php b/src/Annotation/Mutation.php
@@ -17,5 +17,5 @@ final class Mutation extends Field
      *
      * @var array<string>
      */
-    public $targetType;
+    public array $targetType;
 }
diff --git a/src/Annotation/Provider.php b/src/Annotation/Provider.php
@@ -17,5 +17,5 @@ final class Provider implements Annotation
      *
      * @var string
      */
-    public $prefix;
+    public string $prefix;
 }
diff --git a/src/Annotation/Query.php b/src/Annotation/Query.php
@@ -17,5 +17,5 @@ final class Query extends Field
      *
      * @var array<string>
      */
-    public $targetType;
+    public array $targetType;
 }
diff --git a/src/Annotation/Relay/Connection.php b/src/Annotation/Relay/Connection.php
@@ -19,12 +19,12 @@ final class Connection extends Type
      *
      * @var string
      */
-    public $edge;
+    public string $edge;
 
     /**
      * Connection Node type.
      *
      * @var string
      */
-    public $node;
+    public string $node;
 }
diff --git a/src/Annotation/Relay/Edge.php b/src/Annotation/Relay/Edge.php
@@ -21,5 +21,5 @@ final class Edge extends Type
      *
      * @var string
      */
-    public $node;
+    public string $node;
 }
diff --git a/src/Annotation/Scalar.php b/src/Annotation/Scalar.php
@@ -13,16 +13,13 @@
 final class Scalar implements Annotation
 {
     /**
-     * Scalar name.
-     *
      * @var string
      */
-    public $name;
+    public string $name;
+
 
     /**
-     * Scalar type.
-     *
      * @var string
      */
-    public $scalarType;
+    public string $scalarType;
 }
diff --git a/src/Annotation/Type.php b/src/Annotation/Type.php
@@ -17,40 +17,40 @@ class Type implements Annotation
      *
      * @var string
      */
-    public $name;
+    public string $name;
 
     /**
      * Type inherited interfaces.
      *
      * @var string[]
      */
-    public $interfaces;
+    public array $interfaces;
 
     /**
      * Is the type a relay payload.
      *
      * @var bool
      */
-    public $isRelay = false;
+    public bool $isRelay = false;
 
     /**
      * Expression to a target fields resolver.
      *
      * @var string
      */
-    public $resolveField;
+    public string $resolveField;
 
     /**
      * List of fields builder.
      *
      * @var array<\Overblog\GraphQLBundle\Annotation\FieldsBuilder>
      */
-    public $builders = [];
+    public array $builders = [];
 
     /**
      * Expression to resolve type for interfaces.
      *
      * @var string
      */
-    public $isTypeOf;
+    public string $isTypeOf;
 }
diff --git a/src/Annotation/TypeInterface.php b/src/Annotation/TypeInterface.php
@@ -17,7 +17,7 @@ final class TypeInterface implements Annotation
      *
      * @var string
      */
-    public $name;
+    public string $name;
 
     /**
      * Resolver type for interface.
@@ -26,5 +26,5 @@ final class TypeInterface implements Annotation
      *
      * @var string
      */
-    public $resolveType;
+    public string $resolveType;
 }
diff --git a/src/Annotation/Union.php b/src/Annotation/Union.php
@@ -17,19 +17,19 @@ final class Union implements Annotation
      *
      * @var string
      */
-    public $name;
+    public string $name;
 
     /**
      * Union types.
      *
      * @var array<string>
      */
-    public $types;
+    public array $types;
 
     /**
      * Resolver type for union.
      *
      * @var string
      */
-    public $resolveType;
+    public string $resolveType;
 }
diff --git a/src/Config/Parser/Annotation/GraphClass.php b/src/Config/Parser/Annotation/GraphClass.php
diff --git a/src/Config/Parser/AnnotationParser.php b/src/Config/Parser/AnnotationParser.php

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`<?php`
`2`	`2`
`3`	`3`	`$finder = PhpCsFixer\Finder::create()`
`4`		`- ->exclude('vendor')`
	`4`	`+ ->exclude('Annotation')`
`5`	`5`	`->name('*.php')`
`6`	`6`	`->in([__DIR__.'/src', __DIR__.'/tests'])`
`7`	`7`	`;`
Original file line number	Diff line number	Diff line change
`@@ -19,5 +19,5 @@ final class Access implements Annotation`
`19`	`19`	`*`
`20`	`20`	`* @var string`
`21`	`21`	`*/`
`22`		`- public $value;`
	`22`	`+ public string $value;`
`23`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,5 +19,5 @@ final class Deprecated implements Annotation`
`19`	`19`	`*`
`20`	`20`	`* @var string`
`21`	`21`	`*/`
`22`		`- public $value;`
	`22`	`+ public string $value;`
`23`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,5 +19,5 @@ final class Description implements Annotation`
`19`	`19`	`*`
`20`	`20`	`* @var string`
`21`	`21`	`*/`
`22`		`- public $value;`
	`22`	`+ public string $value;`
`23`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,10 +17,10 @@ final class Enum implements Annotation`
`17`	`17`	`*`
`18`	`18`	`* @var string`
`19`	`19`	`*/`
`20`		`- public $name;`
	`20`	`+ public string $name;`
`21`	`21`
`22`	`22`	`/**`
`23`	`23`	`* @var array<\Overblog\GraphQLBundle\Annotation\EnumValue>`
`24`	`24`	`*/`
`25`		`- public $values;`
	`25`	`+ public array $values;`
`26`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ final class FieldsBuilder implements Annotation`
`19`	`19`	`*`
`20`	`20`	`* @var string`
`21`	`21`	`*/`
`22`		`- public $builder;`
	`22`	`+ public string $builder;`
`23`	`23`
`24`	`24`	`/**`
`25`	`25`	`* The builder config.`