Merge branch '0.13'

mcg-web · mcg-web · commit 00f2a75b103d · 2020-08-17T14:47:42.000+02:00
diff --git a/src/Annotation/Access.php b/src/Annotation/Access.php
@@ -15,7 +15,7 @@ final class Access implements Annotation
     /**
      * Field access.
      *
-     * @required
+     * @Required
      *
      * @var string
      */
diff --git a/src/Annotation/Arg.php b/src/Annotation/Arg.php
@@ -15,7 +15,7 @@ final class Arg implements Annotation
     /**
      * Argument name.
      *
-     * @required
+     * @Required
      *
      * @var string
      */
@@ -31,7 +31,7 @@ final class Arg implements Annotation
     /**
      * Argument type.
      *
-     * @required
+     * @Required
      *
      * @var string
      */
diff --git a/src/Annotation/Deprecated.php b/src/Annotation/Deprecated.php
@@ -15,7 +15,7 @@ final class Deprecated implements Annotation
     /**
      * The deprecation reason.
      *
-     * @required
+     * @Required
      *
      * @var string
      */
diff --git a/src/Annotation/Description.php b/src/Annotation/Description.php
@@ -15,7 +15,7 @@ final class Description implements Annotation
     /**
      * The object description.
      *
-     * @required
+     * @Required
      *
      * @var string
      */
diff --git a/src/Annotation/Field.php b/src/Annotation/Field.php
@@ -22,8 +22,6 @@ class Field implements Annotation
     /**
      * Field Type.
      *
-     * @required
-     *
      * @var string
      */
     public string $type;
diff --git a/src/Annotation/FieldsBuilder.php b/src/Annotation/FieldsBuilder.php
@@ -15,7 +15,7 @@ final class FieldsBuilder implements Annotation
     /**
      * Builder name.
      *
-     * @required
+     * @Required
      *
      * @var string
      */
diff --git a/src/Annotation/IsPublic.php b/src/Annotation/IsPublic.php
@@ -15,7 +15,7 @@ final class IsPublic implements Annotation
     /**
      * Field publicity.
      *
-     * @required
+     * @Required
      *
      * @var string
      */
diff --git a/src/Annotation/Relay/Edge.php b/src/Annotation/Relay/Edge.php
@@ -17,7 +17,7 @@ final class Edge extends Type
     /**
      * Edge Node type.
      *
-     * @required
+     * @Required
      *
      * @var string
      */
diff --git a/src/Annotation/TypeInterface.php b/src/Annotation/TypeInterface.php
@@ -22,7 +22,7 @@ final class TypeInterface implements Annotation
     /**
      * Resolver type for interface.
      *
-     * @required
+     * @Required
      *
      * @var string
      */
diff --git a/src/Annotation/Union.php b/src/Annotation/Union.php
@@ -22,6 +22,8 @@ final class Union implements Annotation
     /**
      * Union types.
      *
+     * @Required
+     *
      * @var array<string>
      */
     public array $types;
diff --git a/src/Config/Parser/AnnotationParser.php b/src/Config/Parser/AnnotationParser.php
@@ -729,7 +729,7 @@ private static function getGraphQLFieldsFromProviders(GraphClass $graphClass, st
             $currentValue = sprintf("service('%s')", self::formatNamespaceForExpression($providerMetadata->getName()));
             $providerFields = self::getGraphQLTypeFieldsFromAnnotations($graphClass, $methods, $expectedAnnotation, $currentValue);
             foreach ($providerFields as $fieldName => $fieldConfig) {
-                if ($providerAnnotation->prefix) {
+                if (isset($providerAnnotation->prefix)) {
                     $fieldName = sprintf('%s%s', $providerAnnotation->prefix, $fieldName);
                 }
 
diff --git a/tests/Config/Parser/fixtures/annotations/Invalid/InvalidAccess.php b/tests/Config/Parser/fixtures/annotations/Invalid/InvalidAccess.php
@@ -12,7 +12,7 @@
 class InvalidAccess
 {
     /**
-     * @GQL\Access()
+     * @GQL\Access("access")
      */
     protected string $field;
 }

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ final class Access implements Annotation`
`15`	`15`	`/**`
`16`	`16`	`* Field access.`
`17`	`17`	`*`
`18`		`- * @required`
	`18`	`+ * @Required`
`19`	`19`	`*`
`20`	`20`	`* @var string`
`21`	`21`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ final class Arg implements Annotation`
`15`	`15`	`/**`
`16`	`16`	`* Argument name.`
`17`	`17`	`*`
`18`		`- * @required`
	`18`	`+ * @Required`
`19`	`19`	`*`
`20`	`20`	`* @var string`
`21`	`21`	`*/`
`@@ -31,7 +31,7 @@ final class Arg implements Annotation`
`31`	`31`	`/**`
`32`	`32`	`* Argument type.`
`33`	`33`	`*`
`34`		`- * @required`
	`34`	`+ * @Required`
`35`	`35`	`*`
`36`	`36`	`* @var string`
`37`	`37`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ final class Deprecated implements Annotation`
`15`	`15`	`/**`
`16`	`16`	`* The deprecation reason.`
`17`	`17`	`*`
`18`		`- * @required`
	`18`	`+ * @Required`
`19`	`19`	`*`
`20`	`20`	`* @var string`
`21`	`21`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ final class Description implements Annotation`
`15`	`15`	`/**`
`16`	`16`	`* The object description.`
`17`	`17`	`*`
`18`		`- * @required`
	`18`	`+ * @Required`
`19`	`19`	`*`
`20`	`20`	`* @var string`
`21`	`21`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -22,8 +22,6 @@ class Field implements Annotation`
`22`	`22`	`/**`
`23`	`23`	`* Field Type.`
`24`	`24`	`*`
`25`		`- * @required`
`26`		`- *`
`27`	`25`	`* @var string`
`28`	`26`	`*/`
`29`	`27`	`public string $type;`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ final class FieldsBuilder implements Annotation`
`15`	`15`	`/**`
`16`	`16`	`* Builder name.`
`17`	`17`	`*`
`18`		`- * @required`
	`18`	`+ * @Required`
`19`	`19`	`*`
`20`	`20`	`* @var string`
`21`	`21`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ final class IsPublic implements Annotation`
`15`	`15`	`/**`
`16`	`16`	`* Field publicity.`
`17`	`17`	`*`
`18`		`- * @required`
	`18`	`+ * @Required`
`19`	`19`	`*`
`20`	`20`	`* @var string`
`21`	`21`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ final class Edge extends Type`
`17`	`17`	`/**`
`18`	`18`	`* Edge Node type.`
`19`	`19`	`*`
`20`		`- * @required`
	`20`	`+ * @Required`
`21`	`21`	`*`
`22`	`22`	`* @var string`
`23`	`23`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ final class TypeInterface implements Annotation`
`22`	`22`	`/**`
`23`	`23`	`* Resolver type for interface.`
`24`	`24`	`*`
`25`		`- * @required`
	`25`	`+ * @Required`
`26`	`26`	`*`
`27`	`27`	`* @var string`
`28`	`28`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,8 @@ final class Union implements Annotation`
`22`	`22`	`/**`
`23`	`23`	`* Union types.`
`24`	`24`	`*`
	`25`	`+ * @Required`
	`26`	`+ *`
`25`	`27`	`* @var array<string>`
`26`	`28`	`*/`
`27`	`29`	`public array $types;`