Merge branch '0.12' into 0.13

overblog · Aug 17, 2020 · cab464d · cab464d
2 parents ff62876 + 66afe4b
commit cab464d
Show file tree

Hide file tree

Showing 12 changed files with 12 additions and 14 deletions.
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
@@ -20,8 +20,6 @@ class Field implements Annotation
     /**
      * Field Type.
      *
-     * @required
-     *
      * @var string
      */
     public $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,7 +22,7 @@ final class Union implements Annotation
     /**
      * Union types.
      *
-     * @required
+     * @Required
      *
      * @var array<string>
      */

diff --git a/src/Config/Parser/AnnotationParser.php b/src/Config/Parser/AnnotationParser.php
@@ -694,7 +694,7 @@ private static function getGraphQLFieldsFromProviders(string $namespace, string
             $currentValue = \sprintf("service('%s')", self::formatNamespaceForExpression($className));
             $providerFields = self::getGraphQLFieldsFromAnnotations($namespace, $filteredMethods, false, true, $currentValue, $annotationName);
             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 $field;
 }