Fix PhpStorm inspections

Author: PowerKiKi

src/Attribute/Filter.php

@@ -5,6 +5,7 @@
 namespace GraphQL\Doctrine\Attribute;
 
 use Attribute;
+use GraphQL\Doctrine\Definition\Operator\AbstractOperator;
 
 /**
  * Attribute used to define custom filter.
@@ -17,7 +18,7 @@ final class Filter implements ApiAttribute
      *
      * The field may or may not actually exist in the entity. It is merely used
      * to organize the filter correctly in the API.
-     * @param string $operator key referring to the type instance of PHP class implementing the GraphQL type
+     * @param class-string<AbstractOperator> $operator FQCN to the PHP class implementing the GraphQL operator
      * @param string $type GraphQL leaf type name of the type of the field
      */
     public function __construct(

src/Definition/EntityIDType.php

@@ -47,7 +47,7 @@ public function serialize($value): string
     /**
      * Parses an externally provided value (query variable) to use as an input.
      */
-    public function parseValue(mixed $value, ?array $variables = null): EntityID
+    public function parseValue(mixed $value): EntityID
     {
         if (!is_string($value) && !is_int($value)) {
             throw new Error('EntityID cannot represent value: ' . \GraphQL\Utils\Utils::printSafe($value));
@@ -58,10 +58,8 @@ public function parseValue(mixed $value, ?array $variables = null): EntityID
 
     /**
      * Parses an externally provided literal value (hardcoded in GraphQL query) to use as an input.
-     *
-     * @param Node $valueNode
      */
-    public function parseLiteral($valueNode, ?array $variables = null): EntityID
+    public function parseLiteral(Node $valueNode, ?array $variables = null): EntityID
     {
         if ($valueNode instanceof StringValueNode || $valueNode instanceof IntValueNode) {
             return $this->createEntityID((string) $valueNode->value);

src/Factory/Type/FilterGroupConditionTypeFactory.php

@@ -90,7 +90,6 @@ public function create(string $className, string $typeName): Type
                     foreach ($customOperators as $customOperator) {
                         /** @var LeafType $leafType */
                         $leafType = $this->types->get($customOperator->type);
-                        /** @var class-string $operator */
                         $operator = $customOperator->operator;
                         $operators[$operator] = $leafType;
                     }
@@ -176,7 +175,7 @@ private function readCustomOperatorsFromAttribute(ReflectionClass $class): void
     /**
      * Get configuration for field.
      *
-     * @param array<class-string, LeafType> $operators
+     * @param array<class-string<AbstractOperator>, LeafType> $operators
      */
     private function getFieldConfiguration(string $typeName, string $fieldName, array $operators): array
     {
@@ -189,7 +188,7 @@ private function getFieldConfiguration(string $typeName, string $fieldName, arra
     /**
      * Return a map of operator class name and their leaf type, including custom operator for the given fieldName.
      *
-     * @return array<class-string, LeafType> indexed by operator class name
+     * @return array<class-string<AbstractOperator>, LeafType> indexed by operator class name
      */
     private function getOperators(string $fieldName, LeafType $leafType, bool $isAssociation, bool $isCollection): array
     {
@@ -231,7 +230,6 @@ private function getOperators(string $fieldName, LeafType $leafType, bool $isAss
             foreach ($this->customOperators[$fieldName] as $filter) {
                 /** @var LeafType $leafType */
                 $leafType = $this->types->get($filter->type);
-                /** @var class-string $operator */
                 $operator = $filter->operator;
                 $operators[$operator] = $leafType;
             }
@@ -245,7 +243,7 @@ private function getOperators(string $fieldName, LeafType $leafType, bool $isAss
     /**
      * Get the type for a specific field.
      *
-     * @param array<class-string, LeafType> $operators
+     * @param array<class-string<AbstractOperator>, LeafType> $operators
      */
     private function getFieldType(string $typeName, string $fieldName, array $operators): InputObjectType
     {
@@ -263,7 +261,7 @@ private function getFieldType(string $typeName, string $fieldName, array $operat
     /**
      * Get operators configuration for a specific leaf type.
      *
-     * @param array<class-string, LeafType> $operators
+     * @param array<class-string<AbstractOperator>, LeafType> $operators
      */
     private function getOperatorConfiguration(array $operators): array
     {

src/Types.php

@@ -215,7 +215,7 @@ public function getId(string $className): EntityIDType
      *
      * This is for internal use only.
      *
-     * @param class-string $className the class name of an operator (`EqualOperatorType::class`)
+     * @param class-string<AbstractOperator> $className the class name of an operator (`EqualOperatorType::class`)
      */
     public function getOperator(string $className, LeafType $type): AbstractOperator
     {

tests/Blog/Model/Special/InvalidFilter.php

@@ -9,6 +9,7 @@
 use GraphQLTests\Doctrine\Blog\Model\AbstractModel;
 
 #[ORM\Entity]
+/** @phpstan-ignore-next-line */
 #[API\Filter(field: 'custom', operator: 'invalid_class_name', type: 'string')]
 final class InvalidFilter extends AbstractModel
 {

tests/Blog/Types/DateTimeType.php

@@ -24,7 +24,7 @@ public function parseLiteral($valueNode, ?array $variables = null)
         return $valueNode->value;
     }
 
-    public function parseValue($value, ?array $variables = null)
+    public function parseValue(mixed $value): DateTimeImmutable
     {
         if (!is_string($value)) {
             throw new UnexpectedValueException('Cannot represent value as DateTime date: ' . Utils::printSafe($value));
@@ -33,7 +33,7 @@ public function parseValue($value, ?array $variables = null)
         return new DateTimeImmutable($value);
     }
 
-    public function serialize($value)
+    public function serialize(mixed $value): mixed
     {
         if ($value instanceof DateTimeImmutable) {
             return $value->format('c');

tests/EntityManagerTrait.php

@@ -4,8 +4,9 @@
 
 namespace GraphQLTests\Doctrine;
 
+use Doctrine\DBAL\DriverManager;
 use Doctrine\ORM\EntityManager;
-use Doctrine\ORM\Tools\Setup;
+use Doctrine\ORM\ORMSetup;
 
 /**
  * Trait to easily set up a dummy entity manager.
@@ -16,8 +17,9 @@ trait EntityManagerTrait
 
     private function setUpEntityManager(): void
     {
-        $config = Setup::createAttributeMetadataConfiguration([__DIR__ . '/Blog/Model'], true);
-        $conn = ['url' => 'sqlite:///:memory:'];
-        $this->entityManager = EntityManager::create($conn, $config);
+        $config = ORMSetup::createAttributeMetadataConfiguration([__DIR__ . '/Blog/Model'], true);
+        $connection = DriverManager::getConnection(['url' => 'sqlite:///:memory:']);
+
+        $this->entityManager = new EntityManager($connection, $config);
     }
 }