Merge branch 'master' into feature/schema-compiled-event

Author: Vincz

.dockerignore

@@ -5,6 +5,6 @@
 !/benchmarks/
 !/composer.json
 !/phpunit.xml.*
-!/phpstan.neon.*
+!/phpstan*.neon
 !/.php_cs.*
 !/phpbench.json

.php_cs.dist

@@ -1,7 +1,7 @@
 <?php
 
 $finder = PhpCsFixer\Finder::create()
-    ->exclude('vendor')
+    ->exclude('Annotation')
     ->name('*.php')
     ->in([__DIR__.'/src', __DIR__.'/tests'])
 ;

Dockerfile

@@ -7,7 +7,7 @@ FROM scratch AS test_source
 COPY benchmarks/ benchmarks/
 COPY src/ /src/
 COPY tests/ /tests/
-COPY phpunit.xml.* phpstan.neon.* .php_cs.* phpbench.json /
+COPY phpunit.xml.* phpstan*.neon .php_cs.* phpbench.json /
 
 FROM alpine:3.9
 
@@ -28,9 +28,13 @@ RUN set -eu; \
         php-xml \
         php-dom \
         php-pdo \
+        php-curl \
     ; ln -s /usr/bin/php7 /usr/bin/php
 
 COPY --from=composer:latest /usr/bin/composer /usr/bin/composer
+# install Symfony Flex globally to speed up download of Composer packages (parallelized prefetching)
+RUN set -eux; \
+	composer global require "symfony/flex" --prefer-dist --no-progress --no-suggest --classmap-authoritative;
 
 WORKDIR /opt/test
 

docs/annotations/index.md

@@ -116,6 +116,27 @@ In the previous example, the generated `resolve` config of the `something` field
 
 ## Type & Args auto-guessing
 
+### @Field type auto-guessing when defined on a property with a type hint
+
+The type of the `@Field` annotation can be auto-guessed if it's defined on a property with a type hint.
+If the property has a usable type hint this is used and no futher guessing is done.
+
+For example:
+
+```php
+/**
+ * @GQL\Type
+ */
+class MyType {
+    /**
+     * @GQL\Field
+     */
+    protected string $property;
+}
+```
+
+In this example, the type `String!` will be auto-guessed from the type hint of the property.  
+
 ### @Field type auto-guessing from Doctrine ORM Annotations
 
 Based on other Doctrine annotations on your fields, the corresponding GraphQL type can sometimes be guessed automatically.  

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

src/Annotation/Access.php

@@ -15,9 +15,9 @@ final class Access implements Annotation
     /**
      * Field access.
      *
-     * @required
+     * @Required
      *
      * @var string
      */
-    public $value;
+    public string $value;
 }

src/Annotation/Arg.php

@@ -15,27 +15,27 @@ final class Arg implements Annotation
     /**
      * Argument name.
      *
-     * @required
+     * @Required
      *
      * @var string
      */
-    public $name;
+    public string $name;
 
     /**
      * Argument description.
      *
      * @var string
      */
-    public $description;
+    public string $description;
 
     /**
      * Argument type.
      *
-     * @required
+     * @Required
      *
      * @var string
      */
-    public $type;
+    public string $type;
 
     /**
      * Default argument value.

src/Annotation/Deprecated.php

@@ -15,9 +15,9 @@ final class Deprecated implements Annotation
     /**
      * The deprecation reason.
      *
-     * @required
+     * @Required
      *
      * @var string
      */
-    public $value;
+    public string $value;
 }

src/Annotation/Description.php

@@ -15,9 +15,9 @@ final class Description implements Annotation
     /**
      * The object description.
      *
-     * @required
+     * @Required
      *
      * @var string
      */
-    public $value;
+    public string $value;
 }

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;
 }