Tighten up typing

Author: PowerKiKi

README.md

@@ -171,13 +171,11 @@ And to exclude a property from being exposed as a filter:
 use GraphQL\Doctrine\Annotation as API;
 
 /**
- * @var string
- *
  * @API\Exclude
  *
  * @ORM\Column(type="string", length=255)
  */
-private $password = '';
+private string $password = '';
 ```
 
 ### Override output types
@@ -278,12 +276,10 @@ So usage would be like:
 use GraphQL\Doctrine\Annotation as API;
 
 /**
- * @var string
- *
  * @API\FilterGroupCondition(type="?GraphQLTests\Doctrine\Blog\Types\PostStatusType")
  * @ORM\Column(type="string", options={"default" = Post::STATUS_PRIVATE})
  */
-private $status = self::STATUS_PRIVATE;
+private string $status = self::STATUS_PRIVATE;
 ```
 
 An important thing to note is that the value of the type specified will be directly used in DQL. That means

src/Annotation/AbstractAnnotation.php

@@ -30,10 +30,7 @@ abstract class AbstractAnnotation
 
     private ?string $description = null;
 
-    /**
-     * @var mixed
-     */
-    private $defaultValue;
+    private mixed $defaultValue;
 
     private bool $hasDefaultValue = false;
 
@@ -95,18 +92,12 @@ public function hasDefaultValue(): bool
         return $this->hasDefaultValue;
     }
 
-    /**
-     * @return mixed
-     */
-    public function getDefaultValue()
+    public function getDefaultValue(): mixed
     {
         return $this->defaultValue;
     }
 
-    /**
-     * @param mixed $defaultValue
-     */
-    public function setDefaultValue($defaultValue): void
+    public function setDefaultValue(mixed $defaultValue): void
     {
         $this->defaultValue = $defaultValue;
         $this->hasDefaultValue = true;

src/DefaultFieldResolver.php

@@ -17,15 +17,10 @@
 final class DefaultFieldResolver
 {
     /**
-     * @param mixed $source
      * @param mixed[] $args
-     * @param mixed $context
-     *
-     * @return null|mixed
      */
-    public function __invoke($source, array $args, $context, ResolveInfo $info)
+    public function __invoke(mixed $source, array $args, mixed $context, ResolveInfo $info): mixed
     {
-        /** @var string $fieldName */
         $fieldName = $info->fieldName;
         $property = null;
 
@@ -40,10 +35,8 @@ public function __invoke($source, array $args, $context, ResolveInfo $info)
 
     /**
      * Resolve for an object.
-     *
-     * @return mixed
      */
-    private function resolveObject(object $source, array $args, string $fieldName)
+    private function resolveObject(object $source, array $args, string $fieldName): mixed
     {
         $getter = $this->getGetter($source, $fieldName);
         if ($getter) {
@@ -61,10 +54,8 @@ private function resolveObject(object $source, array $args, string $fieldName)
 
     /**
      * Resolve for an array.
-     *
-     * @return mixed
      */
-    private function resolveArray(array $source, string $fieldName)
+    private function resolveArray(array $source, string $fieldName): mixed
     {
         return $source[$fieldName] ?? null;
     }

src/Definition/EntityID.php

@@ -45,7 +45,6 @@ public function getId(): ?string
      */
     public function getEntity(): object
     {
-        /** @var null|T $entity */
         $entity = $this->entityManager->getRepository($this->className)->find($this->id);
         if (!$entity) {
             throw new Error('Entity not found for class `' . $this->className . '` and ID `' . $this->id . '`.');

src/Definition/EntityIDType.php

@@ -46,10 +46,8 @@ public function serialize($value): string
 
     /**
      * Parses an externally provided value (query variable) to use as an input.
-     *
-     * @param mixed $value
      */
-    public function parseValue($value, ?array $variables = null): EntityID
+    public function parseValue(mixed $value, ?array $variables = null): EntityID
     {
         if (!is_string($value) && !is_int($value)) {
             throw new Error('EntityID cannot represent value: ' . \GraphQL\Utils\Utils::printSafe($value));

src/Definition/Operator/HaveOperatorType.php

@@ -51,10 +51,8 @@ protected function getCollectionValuedDqlCondition(UniqueNameFactory $uniqueName
         if ($association['type'] === ClassMetadataInfo::ONE_TO_MANY) {
             $id = $metadata->identifier[0];
 
-            /** @var class-string $otherClassName */
             $otherClassName = $association['targetEntity'];
             $otherAlias = $uniqueNameFactory->createAliasName($otherClassName);
-            /** @var string $otherField */
             $otherField = $association['mappedBy'];
             $otherMetadata = $queryBuilder->getEntityManager()->getClassMetadata($otherClassName);
             $otherId = $otherMetadata->identifier[0];

src/Factory/AbstractFieldsConfigurationFactory.php

@@ -17,7 +17,6 @@
 use ReflectionMethod;
 use ReflectionNamedType;
 use ReflectionParameter;
-use ReflectionProperty;
 
 /**
  * A factory to create a configuration for all fields of an entity.
@@ -146,7 +145,6 @@ final protected function reflectionTypeToType(ReflectionNamedType $reflectionTyp
     private function findIdentityField(string $className): void
     {
         $this->metadata = $this->entityManager->getClassMetadata($className);
-        /** @var array $meta */
         foreach ($this->metadata->fieldMappings as $meta) {
             if ($meta['id'] ?? false) {
                 $this->identityField = $meta['fieldName'];
@@ -193,12 +191,9 @@ private function getTargetEntity(string $fieldName): ?string
      *
      * It does take into account that the property might be defined on a parent class
      * of entity. And it will find it if that is the case.
-     *
-     * @return mixed
      */
-    final protected function getPropertyDefaultValue(string $fieldName)
+    final protected function getPropertyDefaultValue(string $fieldName): mixed
     {
-        /** @var null|ReflectionProperty $property */
         $property = $this->metadata->getReflectionProperties()[$fieldName] ?? null;
         if (!$property) {
             return null;

src/Factory/FilteredQueryBuilderFactory.php

@@ -5,7 +5,6 @@
 namespace GraphQL\Doctrine\Factory;
 
 use Doctrine\ORM\EntityManager;
-use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\Mapping\ClassMetadata;
 use Doctrine\ORM\QueryBuilder;
 use GraphQL\Doctrine\Definition\Operator\AbstractOperator;
@@ -48,7 +47,6 @@ public function create(string $className, array $filter, array $sorting): QueryB
         $this->dqlConditions = [];
         $this->uniqueJoins = [];
 
-        /** @var EntityRepository $repository */
         $repository = $this->entityManager->getRepository($className);
         $this->queryBuilder = $repository->createQueryBuilder($alias);
         $metadata = $this->entityManager->getClassMetadata($className);
@@ -129,7 +127,6 @@ private function applyJoins(ClassMetadata $metadata, array $joins, string $alias
             $joinedAlias = $this->createJoin($alias, $field, $join['type']);
 
             if (isset($join['joins']) || isset($join['conditions'])) {
-                /** @var class-string $targetClassName */
                 $targetClassName = $metadata->getAssociationMapping($field)['targetEntity'];
                 $targetMetadata = $this->entityManager->getClassMetadata($targetClassName);
                 $type = $this->types->getFilterGroupCondition($targetClassName);

src/Factory/InputFieldsConfigurationFactory.php

@@ -33,7 +33,6 @@ protected function methodToConfiguration(ReflectionMethod $method): ?array
         $param = reset($params);
 
         // Get a field from annotation, or an empty one
-        /** @var Input $field */
         $field = $this->getAnnotationReader()->getMethodAnnotation($method, Input::class) ?? new Input();
 
         if (!$field->getTypeInstance()) {

src/Factory/OutputFieldsConfigurationFactory.php

@@ -29,7 +29,6 @@ protected function getMethodPattern(): string
     protected function methodToConfiguration(ReflectionMethod $method): ?array
     {
         // Get a field from annotation, or an empty one
-        /** @var Field $field */
         $field = $this->getAnnotationReader()->getMethodAnnotation($method, Field::class) ?? new Field();
 
         if (!$field->type instanceof Type) {
@@ -48,7 +47,6 @@ private function convertTypeDeclarationsToInstances(ReflectionMethod $method, Fi
         $field->type = $this->getTypeFromPhpDeclaration($method->getDeclaringClass(), $field->type);
         $args = [];
 
-        /** @var Argument $arg */
         foreach ($field->args as $arg) {
             $arg->setTypeInstance($this->getTypeFromPhpDeclaration($method->getDeclaringClass(), $arg->getType()));
             $args[$arg->getName()] = $arg;