Update all PHP deps

PowerKiKi · PowerKiKi · commit 10f5e31e3039 · 2022-11-10T18:56:30.000+01:00
Except:

- doctrine/persistence because we cannot support both 2.0 and 3.0
diff --git a/composer.json b/composer.json
@@ -37,9 +37,9 @@
     },
     "require": {
         "php": "^8.1",
-        "doctrine/orm": "^2.11",
-        "doctrine/persistence": "^1.3 || ^2.0",
-        "psr/container": "^1.1",
+        "doctrine/orm": "^2.13",
+        "doctrine/persistence": "^2.0",
+        "psr/container": "^1.1 || ^2.0",
         "webonyx/graphql-php": "^14.11"
     },
     "require-dev": {
diff --git a/composer.lock b/composer.lock
diff --git a/src/Annotation/Argument.php b/src/Annotation/Argument.php
@@ -13,6 +13,7 @@
  * what is declared by the original argument of the method.
  *
  * @Annotation
+ *
  * @Target({"ANNOTATION"})
  * @Attributes({
  *     @Attribute("name", required=true, type="string"),
diff --git a/src/Annotation/Exclude.php b/src/Annotation/Exclude.php
@@ -10,6 +10,7 @@
  * This should be used to hide sensitive data such as passwords.
  *
  * @Annotation
+ *
  * @Target({"METHOD", "PROPERTY"})
  */
 final class Exclude
diff --git a/src/Annotation/Field.php b/src/Annotation/Field.php
@@ -11,6 +11,7 @@
  * what is declared by the original method.
  *
  * @Annotation
+ *
  * @Target({"METHOD"})
  */
 final class Field
diff --git a/src/Annotation/Filter.php b/src/Annotation/Filter.php
@@ -13,6 +13,7 @@
  * what is declared by the original argument of the method.
  *
  * @Annotation
+ *
  * @Target({"ANNOTATION"})
  */
 final class Filter
@@ -24,6 +25,7 @@ final class Filter
      * to organize the filter correctly in the API.
      *
      * @var string
+     *
      * @Required
      */
     public $field;
@@ -32,6 +34,7 @@ final class Filter
      * Key referring to the type instance of PHP class implementing the GraphQL type.
      *
      * @var string
+     *
      * @Required
      */
     public $operator;
@@ -40,6 +43,7 @@ final class Filter
      * GraphQL leaf type name of the type of the field.
      *
      * @var string
+     *
      * @Required
      */
     public $type;
diff --git a/src/Annotation/FilterGroupCondition.php b/src/Annotation/FilterGroupCondition.php
@@ -11,6 +11,7 @@
  * a custom GraphQL type.
  *
  * @Annotation
+ *
  * @Target({"PROPERTY"})
  */
 final class FilterGroupCondition
@@ -19,6 +20,7 @@ final class FilterGroupCondition
      * FQCN of PHP class implementing the GraphQL type.
      *
      * @var string
+     *
      * @Required
      */
     public $type;
diff --git a/src/Annotation/Filters.php b/src/Annotation/Filters.php
@@ -8,6 +8,7 @@
  * Annotation used to define custom filters.
  *
  * @Annotation
+ *
  * @Target({"CLASS"})
  */
 final class Filters
@@ -16,6 +17,7 @@ final class Filters
      * List of all custom filters.
      *
      * @var array<\GraphQL\Doctrine\Annotation\Filter>
+     *
      * @Required
      */
     public $filters = [];
diff --git a/src/Annotation/Input.php b/src/Annotation/Input.php
@@ -14,6 +14,7 @@
  * what is declared by the original method.
  *
  * @Annotation
+ *
  * @Target({"METHOD"})
  * @Attributes({
  *     @Attribute("name", required=false, type="string"),
diff --git a/src/Annotation/Sorting.php b/src/Annotation/Sorting.php
@@ -8,6 +8,7 @@
  * Annotation used to define custom sorting.
  *
  * @Annotation
+ *
  * @Target({"CLASS"})
  */
 final class Sorting
diff --git a/src/Definition/EntityID.php b/src/Definition/EntityID.php
@@ -10,7 +10,7 @@
 /**
  * A object used to fetch the entity from DB on demand.
  *
- * @template T
+ * @template T of object
  */
 class EntityID
 {
@@ -43,7 +43,7 @@ public function getId(): ?string
      *
      * @return T entity
      */
-    public function getEntity()
+    public function getEntity(): object
     {
         /** @var null|T $entity */
         $entity = $this->entityManager->getRepository($this->className)->find($this->id);
diff --git a/src/Factory/AbstractFieldsConfigurationFactory.php b/src/Factory/AbstractFieldsConfigurationFactory.php
@@ -185,7 +185,6 @@ final protected function isIdentityField(string $fieldName): bool
      */
     private function getTargetEntity(string $fieldName): ?string
     {
-        // @phpstan-ignore-next-line
         return $this->metadata->associationMappings[$fieldName]['targetEntity'] ?? null;
     }
 
diff --git a/src/Factory/Type/FilterGroupConditionTypeFactory.php b/src/Factory/Type/FilterGroupConditionTypeFactory.php
@@ -166,7 +166,6 @@ private function readCustomOperatorsFromAnnotation(ReflectionClass $class): void
         $allFilters = Utils::getRecursiveClassAnnotations($this->getAnnotationReader(), $class, Filters::class);
         $this->customOperators = [];
         foreach ($allFilters as $classWithAnnotation => $filters) {
-
             /** @var Filter $filter */
             foreach ($filters->filters as $filter) {
                 $className = $filter->operator;
diff --git a/src/Factory/Type/FilterGroupJoinTypeFactory.php b/src/Factory/Type/FilterGroupJoinTypeFactory.php
@@ -63,7 +63,6 @@ private function getJoinsFields(string $className): array
         foreach ($associations as $association) {
             $field = [
                 'name' => $association['fieldName'],
-                // @phpstan-ignore-next-line
                 'type' => $this->types->getJoinOn($association['targetEntity']),
             ];
 
diff --git a/tests/Blog/Model/Special/IgnoredGetter.php b/tests/Blog/Model/Special/IgnoredGetter.php
@@ -7,6 +7,7 @@
 use Doctrine\ORM\Mapping as ORM;
 use GraphQL\Doctrine\Annotation as API;
 use GraphQLTests\Doctrine\Blog\Model\AbstractModel;
+use GraphQLTests\Doctrine\Blog\Model\User;
 
 /**
  * @ORM\Entity
@@ -39,7 +40,7 @@ public function getPublic(): string
      *
      * @param string[] $arg3
      */
-    public function getPublicWithArgs(string $arg1, int $arg2, array $arg3 = ['foo']): array
+    public function getPublicWithArgs(User $arg1, int $arg2, array $arg3 = ['foo']): array
     {
         return [$arg1, $arg2, $arg3];
     }
diff --git a/tests/DefaultFieldResolverTest.php b/tests/DefaultFieldResolverTest.php
@@ -13,20 +13,22 @@
 use GraphQL\Type\Schema;
 use GraphQLTests\Doctrine\Blog\Model\Special\DefaultValue;
 use GraphQLTests\Doctrine\Blog\Model\Special\IgnoredGetter;
+use GraphQLTests\Doctrine\Blog\Model\User;
 use PHPUnit\Framework\TestCase;
 
 final class DefaultFieldResolverTest extends TestCase
 {
     public function providerDefaultFieldResolver(): array
     {
-        $entityID = new class() extends EntityID {
-            public function __construct()
+        $fakeEntity = new User();
+        $entityID = new class($fakeEntity) extends EntityID {
+            public function __construct(private readonly User $fakeEntity)
             {
             }
 
-            public function getEntity(): string
+            public function getEntity(): User
             {
-                return 'real entity';
+                return $this->fakeEntity;
             }
         };
 
@@ -37,7 +39,7 @@ public function getEntity(): string
             [null, new IgnoredGetter(), 'private'],
             [null, new IgnoredGetter(), 'protected'],
             ['getPublic', new IgnoredGetter(), 'public'],
-            [['real entity', 2, ['foo']], new IgnoredGetter(), 'publicWithArgs', ['arg2' => 2, 'arg1' => $entityID]],
+            [[$fakeEntity, 2, ['foo']], new IgnoredGetter(), 'publicWithArgs', ['arg2' => 2, 'arg1' => $entityID]],
             [null, new IgnoredGetter(), 'nonExisting'],
             [null, new IgnoredGetter(), '__call'],
             [true, new IgnoredGetter(), 'isValid'],
diff --git a/tests/data/IgnoredGetter.graphqls b/tests/data/IgnoredGetter.graphqls
@@ -1,6 +1,6 @@
 type IgnoredGetter {
   public: String!
-  publicWithArgs(arg1: String!, arg2: Int!, arg3: [String!] = ["foo"]): [String!]!
+  publicWithArgs(arg1: UserID!, arg2: Int!, arg3: [String!] = ["foo"]): [String!]!
   isValid: Boolean!
   hasMoney: Boolean!
   id: ID!

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@`
`13`	`13`	`* what is declared by the original argument of the method.`
`14`	`14`	`*`
`15`	`15`	`* @Annotation`
	`16`	`+ *`
`16`	`17`	`* @Target({"ANNOTATION"})`
`17`	`18`	`* @Attributes({`
`18`	`19`	`* @Attribute("name", required=true, type="string"),`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@`
`10`	`10`	`* This should be used to hide sensitive data such as passwords.`
`11`	`11`	`*`
`12`	`12`	`* @Annotation`
	`13`	`+ *`
`13`	`14`	`* @Target({"METHOD", "PROPERTY"})`
`14`	`15`	`*/`
`15`	`16`	`final class Exclude`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@`
`11`	`11`	`* what is declared by the original method.`
`12`	`12`	`*`
`13`	`13`	`* @Annotation`
	`14`	`+ *`
`14`	`15`	`* @Target({"METHOD"})`
`15`	`16`	`*/`
`16`	`17`	`final class Field`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@`
`14`	`14`	`* what is declared by the original method.`
`15`	`15`	`*`
`16`	`16`	`* @Annotation`
	`17`	`+ *`
`17`	`18`	`* @Target({"METHOD"})`
`18`	`19`	`* @Attributes({`
`19`	`20`	`* @Attribute("name", required=false, type="string"),`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@`
`8`	`8`	`* Annotation used to define custom sorting.`
`9`	`9`	`*`
`10`	`10`	`* @Annotation`
	`11`	`+ *`
`11`	`12`	`* @Target({"CLASS"})`
`12`	`13`	`*/`
`13`	`14`	`final class Sorting`