Update all PHP deps #10257

Ecodev · Jul 10, 2024 · 6e06fb4 · 6e06fb4
1 parent 993d185
commit 6e06fb4
Show file tree

Hide file tree

Showing 28 changed files with 1,309 additions and 606 deletions.
diff --git a/composer.json b/composer.json
@@ -39,7 +39,7 @@
         "php": "^8.2",
         "doctrine/orm": "^3.2",
         "psr/container": "^1.1 || ^2.0",
-        "webonyx/graphql-php": "^15.7"
+        "webonyx/graphql-php": "^15.12"
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "@stable",

diff --git a/composer.lock b/composer.lock
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -6,8 +6,6 @@ parameters:
     excludePaths:
         - tests/Blog/Model/*
         - tests/AttributeBlog/Model/*
-    checkMissingIterableValueType: false
-    checkGenericClassInNonGenericObjectType: false
     ignoreErrors:
         - '~^Parameter #2 \$type of static method GraphQL\\Doctrine\\Utils::getOperatorTypeName~'
         - '~^Parameter #1 \$method of method GraphQL\\Doctrine\\Factory\\AbstractFieldsConfigurationFactory\:\:getMethodFullName\(\) expects ReflectionMethod, ReflectionFunctionAbstract given\.$~'
@@ -17,6 +15,10 @@ parameters:
         - '~^Parameter \#1 \$type of static method GraphQL\\Type\\Definition\\Type\:\:nonNull\(\) expects~'
         - '~^Parameter \#1 \$config of class GraphQL\\Type\\Definition\\InputObjectType constructor expects~'
         - '~^Parameter \#1 \$config of method GraphQL\\Type\\Definition\\InputObjectType\:\:__construct~'
+        -
+            identifier: missingType.iterableValue
+        -
+            identifier: missingType.generics
 
 includes:
     - phpstan-baseline.neon
diff --git a/src/TypesInterface.php b/src/TypesInterface.php
@@ -135,7 +135,7 @@ public function createFilteredQueryBuilder(string $className, array $filter, arr
      * `loadType` with the `typeLoader`. Because dedicated `get*()` methods are easier to use, and provide
      * stronger typing.
      *
-     * @return null|(Type&NamedType)
+     * @return null|(NamedType&Type)
      */
     public function loadType(string $typeName, string $namespace): ?Type;
 }
diff --git a/tests/Blog/Model/User.php b/tests/Blog/Model/User.php
@@ -129,7 +129,8 @@ public function isAdministrator(): bool
      * @param null|string $status the status of posts as defined in \GraphQLTests\Doctrine\Blog\Model\Post
      */
     public function getPosts(
-        #[API\Argument(type: '?GraphQLTests\Doctrine\Blog\Types\PostStatusType')] ?string $status = Post::STATUS_PUBLIC
+        #[API\Argument(type: '?GraphQLTests\Doctrine\Blog\Types\PostStatusType')]
+        ?string $status = Post::STATUS_PUBLIC
     ): Collection {
         // Return unfiltered collection
         if ($status === null) {

diff --git a/tests/TypesTest.php b/tests/TypesTest.php
@@ -15,6 +15,7 @@
 use GraphQLTests\Doctrine\Blog\Types\CustomType;
 use GraphQLTests\Doctrine\Blog\Types\DateTimeType;
 use GraphQLTests\Doctrine\Blog\Types\PostStatusType;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use stdClass;
 
@@ -157,9 +158,7 @@ public function testHas(): void
         self::assertTrue($this->types->has('customName'), 'should have custom registered type by its name, even if custom key was different, once type is created');
     }
 
-    /**
-     * @dataProvider provideLoadType
-     */
+    #[DataProvider('provideLoadType')]
     public function testLoadType(string $typeName): void
     {
         $type = $this->types->loadType($typeName, 'GraphQLTests\Doctrine\Blog\Model');

diff --git a/tests/data/query-builder/alternative-groups-with-multiple-joins.php b/tests/data/query-builder/alternative-groups-with-multiple-joins.php
@@ -5,7 +5,7 @@
 // posts whose author contains John and Jane, OR posts whose author contains Jake and post title contains foo
 return [
     'SELECT post1, user1 FROM GraphQLTests\Doctrine\Blog\Model\Post post1 INNER JOIN post1.user user1 WHERE (user1.name LIKE :filter1 AND user1.name LIKE :filter2) OR (user1.name LIKE :filter3 AND post1.title LIKE :filter4)',
-    \GraphQLTests\Doctrine\Blog\Model\Post::class,
+    GraphQLTests\Doctrine\Blog\Model\Post::class,
     [
         'groups' => [
             [

diff --git a/tests/data/query-builder/custom-filter-empty.php b/tests/data/query-builder/custom-filter-empty.php
@@ -5,7 +5,7 @@
 // all posts whose title contains "foo"
 return [
     'SELECT post1 FROM GraphQLTests\Doctrine\Blog\Model\Post post1',
-    \GraphQLTests\Doctrine\Blog\Model\Post::class,
+    GraphQLTests\Doctrine\Blog\Model\Post::class,
     [
         'groups' => [
             [

diff --git a/tests/data/query-builder/custom-filter-inherited.php b/tests/data/query-builder/custom-filter-inherited.php
@@ -5,7 +5,7 @@
 // all posts whose title contains "foo"
 return [
     'SELECT post1 FROM GraphQLTests\Doctrine\Blog\Model\Post post1 WHERE MOD(post1.id, :filter1) = 0',
-    \GraphQLTests\Doctrine\Blog\Model\Post::class,
+    GraphQLTests\Doctrine\Blog\Model\Post::class,
     [
         'groups' => [
             [

diff --git a/tests/data/query-builder/custom-filter.php b/tests/data/query-builder/custom-filter.php
@@ -5,7 +5,7 @@
 // all posts whose title contains "foo"
 return [
     'SELECT post1 FROM GraphQLTests\Doctrine\Blog\Model\Post post1 WHERE ((post1.title LIKE :filter1 OR post1.body LIKE :filter1 OR post1.status LIKE :filter1) AND (post1.title LIKE :filter2 OR post1.body LIKE :filter2 OR post1.status LIKE :filter2))',
-    \GraphQLTests\Doctrine\Blog\Model\Post::class,
+    GraphQLTests\Doctrine\Blog\Model\Post::class,
     [
         'groups' => [
             [

diff --git a/tests/data/query-builder/custom-sort-inherited.php b/tests/data/query-builder/custom-sort-inherited.php
@@ -5,7 +5,7 @@
 // computed sorting inherited from parent class
 return [
     'SELECT post1, MOD(post1.id, 5) AS HIDDEN score FROM GraphQLTests\Doctrine\Blog\Model\Post post1 ORDER BY score ASC',
-    \GraphQLTests\Doctrine\Blog\Model\Post::class,
+    GraphQLTests\Doctrine\Blog\Model\Post::class,
     [],
     [
         [

diff --git a/tests/data/query-builder/custom-sort-via-join.php b/tests/data/query-builder/custom-sort-via-join.php
@@ -5,7 +5,7 @@
 // custom sorting that adds a JOIN
 return [
     'SELECT post1 FROM GraphQLTests\Doctrine\Blog\Model\Post post1 INNER JOIN post1.user sortingUser ORDER BY sortingUser.name DESC',
-    \GraphQLTests\Doctrine\Blog\Model\Post::class,
+    GraphQLTests\Doctrine\Blog\Model\Post::class,
     [],
     [
         [

diff --git a/tests/data/query-builder/empty.php b/tests/data/query-builder/empty.php
@@ -5,7 +5,7 @@
 // all posts
 return [
     'SELECT post1 FROM GraphQLTests\Doctrine\Blog\Model\Post post1',
-    \GraphQLTests\Doctrine\Blog\Model\Post::class,
+    GraphQLTests\Doctrine\Blog\Model\Post::class,
     [],
     [],
 ];
diff --git a/tests/data/query-builder/filter-with-null-value.php b/tests/data/query-builder/filter-with-null-value.php
@@ -5,7 +5,7 @@
 // all posts whose title contains "foo"
 return [
     'SELECT post1 FROM GraphQLTests\Doctrine\Blog\Model\Post post1',
-    \GraphQLTests\Doctrine\Blog\Model\Post::class,
+    GraphQLTests\Doctrine\Blog\Model\Post::class,
     [
         'groups' => [
             [

diff --git a/tests/data/query-builder/join-deep-with-same-table.php b/tests/data/query-builder/join-deep-with-same-table.php
@@ -5,7 +5,7 @@
 // this is nonsensical, but shows that we can build a query with the same table appearing more than once
 return [
     'SELECT user1, posts1, user2 FROM GraphQLTests\Doctrine\Blog\Model\User user1 INNER JOIN user1.posts posts1 INNER JOIN posts1.user user2',
-    \GraphQLTests\Doctrine\Blog\Model\User::class,
+    GraphQLTests\Doctrine\Blog\Model\User::class,
     [
         'groups' => [
             [

diff --git a/tests/data/query-builder/join-deep.php b/tests/data/query-builder/join-deep.php
@@ -5,7 +5,7 @@
 // all posts whose author has written at least one post whose title contains "foo"
 return [
     'SELECT post1, user1, posts1 FROM GraphQLTests\Doctrine\Blog\Model\Post post1 INNER JOIN post1.user user1 INNER JOIN user1.posts posts1 WHERE posts1.title LIKE :filter1',
-    \GraphQLTests\Doctrine\Blog\Model\Post::class,
+    GraphQLTests\Doctrine\Blog\Model\Post::class,
     [
         'groups' => [
             [

diff --git a/tests/data/query-builder/join-to-fetch.php b/tests/data/query-builder/join-to-fetch.php
@@ -5,7 +5,7 @@
 // all posts, but also fetch their author, if any, in a single SQL query
 return [
     'SELECT post1, user1 FROM GraphQLTests\Doctrine\Blog\Model\Post post1 LEFT JOIN post1.user user1',
-    \GraphQLTests\Doctrine\Blog\Model\Post::class,
+    GraphQLTests\Doctrine\Blog\Model\Post::class,
     [
         'groups' => [
             [

diff --git a/tests/data/query-builder/join-to-filter.php b/tests/data/query-builder/join-to-filter.php
@@ -5,7 +5,7 @@
 // all posts whose author is somebody called "john"
 return [
     'SELECT post1, user1 FROM GraphQLTests\Doctrine\Blog\Model\Post post1 INNER JOIN post1.user user1 WHERE user1.name LIKE :filter1',
-    \GraphQLTests\Doctrine\Blog\Model\Post::class,
+    GraphQLTests\Doctrine\Blog\Model\Post::class,
     [
         'groups' => [
             [

diff --git a/tests/data/query-builder/multiple-filter-on-different-fields.php b/tests/data/query-builder/multiple-filter-on-different-fields.php
@@ -5,7 +5,7 @@
 // all posts whose title contains "foo" or body contains "bar"
 return [
     'SELECT post1 FROM GraphQLTests\Doctrine\Blog\Model\Post post1 WHERE post1.title LIKE :filter1 OR post1.body LIKE :filter2',
-    \GraphQLTests\Doctrine\Blog\Model\Post::class,
+    GraphQLTests\Doctrine\Blog\Model\Post::class,
     [
         'groups' => [
             [

diff --git a/tests/data/query-builder/multiple-filter-on-same-field-with-alternative.php b/tests/data/query-builder/multiple-filter-on-same-field-with-alternative.php
@@ -5,7 +5,7 @@
 // all posts whose title contains "foo" and "bar", or whose title contains "baz"
 return [
     'SELECT post1 FROM GraphQLTests\Doctrine\Blog\Model\Post post1 WHERE (post1.title LIKE :filter1 AND post1.title LIKE :filter2) OR post1.title LIKE :filter3',
-    \GraphQLTests\Doctrine\Blog\Model\Post::class,
+    GraphQLTests\Doctrine\Blog\Model\Post::class,
     [
         'groups' => [
             [

diff --git a/tests/data/query-builder/multiple-filter-on-same-field.php b/tests/data/query-builder/multiple-filter-on-same-field.php
@@ -5,7 +5,7 @@
 // all posts whose title contains "foo" or "bar"
 return [
     'SELECT post1 FROM GraphQLTests\Doctrine\Blog\Model\Post post1 WHERE post1.title LIKE :filter1 OR post1.title LIKE :filter2',
-    \GraphQLTests\Doctrine\Blog\Model\Post::class,
+    GraphQLTests\Doctrine\Blog\Model\Post::class,
     [
         'groups' => [
             [

diff --git a/tests/data/query-builder/multiple-sort.php b/tests/data/query-builder/multiple-sort.php
@@ -5,7 +5,7 @@
 // all posts sorted by title then by reverse body then by reverse id
 return [
     'SELECT post1 FROM GraphQLTests\Doctrine\Blog\Model\Post post1 ORDER BY post1.title ASC, post1.body DESC, post1.id DESC',
-    \GraphQLTests\Doctrine\Blog\Model\Post::class,
+    GraphQLTests\Doctrine\Blog\Model\Post::class,
     [],
     [
         [

diff --git a/tests/data/query-builder/simple-filter.php b/tests/data/query-builder/simple-filter.php
@@ -5,7 +5,7 @@
 // all posts whose title contains "foo"
 return [
     'SELECT post1 FROM GraphQLTests\Doctrine\Blog\Model\Post post1 WHERE post1.title LIKE :filter1',
-    \GraphQLTests\Doctrine\Blog\Model\Post::class,
+    GraphQLTests\Doctrine\Blog\Model\Post::class,
     [
         'groups' => [
             [

diff --git a/tests/data/query-builder/simple-sort.php b/tests/data/query-builder/simple-sort.php
@@ -5,7 +5,7 @@
 // all posts sorted by title
 return [
     'SELECT post1 FROM GraphQLTests\Doctrine\Blog\Model\Post post1 ORDER BY post1.title ASC',
-    \GraphQLTests\Doctrine\Blog\Model\Post::class,
+    GraphQLTests\Doctrine\Blog\Model\Post::class,
     [],
     [
         [

diff --git a/tests/data/query-builder/sort-with-empty-string-first.php b/tests/data/query-builder/sort-with-empty-string-first.php
@@ -5,7 +5,7 @@
 // all posts sorted by reversed title but with null title first
 return [
     'SELECT post1, CASE WHEN post1.title = \'\' THEN 1 ELSE 0 END AS HIDDEN sorting1 FROM GraphQLTests\Doctrine\Blog\Model\Post post1 ORDER BY sorting1 DESC, post1.title DESC',
-    \GraphQLTests\Doctrine\Blog\Model\Post::class,
+    GraphQLTests\Doctrine\Blog\Model\Post::class,
     [],
     [
         [

diff --git a/tests/data/query-builder/sort-with-empty-string-last.php b/tests/data/query-builder/sort-with-empty-string-last.php
@@ -5,7 +5,7 @@
 // all posts sorted by title but with null title last
 return [
     'SELECT post1, CASE WHEN post1.title = \'\' THEN 1 ELSE 0 END AS HIDDEN sorting1 FROM GraphQLTests\Doctrine\Blog\Model\Post post1 ORDER BY sorting1 ASC, post1.title ASC',
-    \GraphQLTests\Doctrine\Blog\Model\Post::class,
+    GraphQLTests\Doctrine\Blog\Model\Post::class,
     [],
     [
         [

diff --git a/tests/data/query-builder/sort-with-null-first.php b/tests/data/query-builder/sort-with-null-first.php
@@ -5,7 +5,7 @@
 // all posts sorted by reversed title but with null title first
 return [
     'SELECT post1, CASE WHEN post1.title IS NULL THEN 1 ELSE 0 END AS HIDDEN sorting1 FROM GraphQLTests\Doctrine\Blog\Model\Post post1 ORDER BY sorting1 DESC, post1.title DESC',
-    \GraphQLTests\Doctrine\Blog\Model\Post::class,
+    GraphQLTests\Doctrine\Blog\Model\Post::class,
     [],
     [
         [

diff --git a/tests/data/query-builder/sort-with-null-last.php b/tests/data/query-builder/sort-with-null-last.php
@@ -5,7 +5,7 @@
 // all posts sorted by title but with null title last
 return [
     'SELECT post1, CASE WHEN post1.title IS NULL THEN 1 ELSE 0 END AS HIDDEN sorting1 FROM GraphQLTests\Doctrine\Blog\Model\Post post1 ORDER BY sorting1 ASC, post1.title ASC',
-    \GraphQLTests\Doctrine\Blog\Model\Post::class,
+    GraphQLTests\Doctrine\Blog\Model\Post::class,
     [],
     [
         [