Support for self in type hinting

Author: PowerKiKi

src/Exception.php

@@ -5,7 +5,7 @@
 namespace GraphQL\Doctrine;
 
 /**
- * Exception specific to this GraphQL Doctrine
+ * Exception specific to GraphQL Doctrine
  */
 class Exception extends \Exception
 {

src/Factory/AbstractFieldsConfigurationFactory.php

@@ -241,7 +241,12 @@ protected function getTypeFromReturnTypeHint(ReflectionMethod $method, string $f
      */
     protected function reflectionTypeToType(ReflectionType $reflectionType, bool $isEntityId = false): Type
     {
-        $type = $this->getTypeFromRegistry((string) $reflectionType, $isEntityId);
+        $name = $reflectionType->getName();
+        if ($name === 'self') {
+            $name = $this->metadata->name;
+        }
+
+        $type = $this->getTypeFromRegistry($name, $isEntityId);
         if (!$reflectionType->allowsNull()) {
             $type = Type::nonNull($type);
         }

src/Factory/OutputFieldsConfigurationFactory.php

@@ -138,6 +138,7 @@ private function getArgumentsFromTypeHint(ReflectionMethod $method, array $argsF
      * @param ReflectionMethod $method
      * @param ReflectionParameter $param
      * @param Argument $arg
+     * @param DocBlockReader $docBlock
      */
     private function completeArgumentFromTypeHint(ReflectionMethod $method, ReflectionParameter $param, Argument $arg, DocBlockReader $docBlock): void
     {

tests/Blog/Model/User.php

@@ -4,6 +4,7 @@
 
 namespace GraphQLTests\Doctrine\Blog\Model;
 
+use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
 use GraphQL\Doctrine\Annotation as API;
@@ -50,6 +51,13 @@ class User extends AbstractModel
      */
     private $posts;
 
+    /**
+     * @var User
+     *
+     * @ORM\ManyToOne(targetEntity="GraphQLTests\Doctrine\Blog\Model\User")
+     */
+    private $manager;
+
     /**
      * Constructor
      *
@@ -60,7 +68,7 @@ public function __construct(?int $id = null)
         // This is a bad idea in real world, but we are just testing stuff here
         $this->id = $id;
 
-        $this->posts = new \Doctrine\Common\Collections\ArrayCollection();
+        $this->posts = new ArrayCollection();
     }
 
     /**
@@ -179,4 +187,14 @@ public function getPostsWithIds(array $ids): Collection
             return in_array($post->getId(), $ids, true);
         });
     }
+
+    public function setManager(?self $manager): void
+    {
+        $this->manager = $manager;
+    }
+
+    public function getManager(): ?self
+    {
+        return $this->manager;
+    }
 }

tests/data/UserInput.php

@@ -24,6 +24,12 @@
             'description' => 'Encrypt and change the user password',
             'defaultValue' => null,
         ],
+        [
+            'name' => 'manager',
+            'type' => 'UserID',
+            'description' => null,
+            'defaultValue' => null,
+        ],
         [
             'name' => 'creationDate',
             'type' => 'DateTime!',

tests/data/UserOutput.php

@@ -50,6 +50,12 @@
                 ],
             ],
         ],
+        [
+            'name' => 'manager',
+            'type' => 'User',
+            'description' => null,
+            'args' => [],
+        ],
         [
             'name' => 'id',
             'type' => 'ID!',