Skip to content

Commit 8aa4a12

Browse files
antograssiotalanpoulain
authored andcommitted
Fix test suite compatibility with webonyx/graphql-php v0.13.1 (#2594)
1 parent 84754e3 commit 8aa4a12

File tree

5 files changed

+14
-14
lines changed

5 files changed

+14
-14
lines changed

phpstan.neon

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ parameters:
2222
- '#Parameter \#1 \$function of function call_user_func expects callable, .+ given\.#'
2323
- '#Parameter \#1 \$classes of class ApiPlatform\\Core\\Metadata\\Resource\\ResourceNameCollection constructor expects array<string>, array<int, int\|string> given\.#'
2424
- '#Method ApiPlatform\\Core\\Util\\RequestParser::parseRequestParams\(\) should return array but returns array\|false\.#'
25-
- '#Parameter \#1 \$vars of class GraphQL\\Language\\AST\\(IntValue|ObjectField|ObjectValue|BooleanValue|ListValue|StringValue)Node constructor expects array<GraphQL\\Language\\AST\\Location\|GraphQL\\Language\\AST\\NameNode\|GraphQL\\Language\\AST\\NodeList\|GraphQL\\Language\\AST\\SelectionSetNode\|string\|null>, array<string, .+> given\.#'
25+
- '#Parameter \#1 \$vars of class GraphQL\\Language\\AST\\(IntValue|ObjectField|ObjectValue|BooleanValue|ListValue|StringValue)Node constructor expects array<bool\|float\|GraphQL\\Language\\AST\\Location\|GraphQL\\Language\\AST\\NameNode\|GraphQL\\Language\\AST\\NodeList\|GraphQL\\Language\\AST\\SelectionSetNode\|int\|string\|null>, array<string, .+> given\.#'
2626
- '#Parameter \#1 \$defaultContext of class Symfony\\Component\\Serializer\\Encoder\\Json(De|En)code constructor expects array, (int|true) given\.#'
2727
- '#Parameter \#(2|3) \$(resourceMetadataFactory|pagination) of class ApiPlatform\\Core\\Bridge\\Doctrine\\Orm\\Extension\\PaginationExtension constructor expects (ApiPlatform\\Core\\Metadata\\Resource\\Factory\\ResourceMetadataFactoryInterface\|Symfony\\Component\\HttpFoundation\\RequestStack|ApiPlatform\\Core\\DataProvider\\Pagination\|ApiPlatform\\Core\\Metadata\\Resource\\Factory\\ResourceMetadataFactoryInterface), stdClass given\.#'
2828
# Temporary fix while the PHPStan extension for Prophecy isn't compatible with 0.10

tests/GraphQl/Resolver/Factory/CollectionResolverFactoryTest.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public function testCreateCollectionResolverNoCollection(bool $paginationEnabled
4747
$factory = $this->createCollectionResolverFactory([], [], ['id' => 1], $paginationEnabled);
4848
$resolver = $factory(RelatedDummy::class, Dummy::class, 'operationName');
4949

50-
$resolveInfo = new ResolveInfo('relatedDummies', [], null, new ObjectType(['name' => '']), '', new Schema([]), null, null, null, null);
50+
$resolveInfo = new ResolveInfo('relatedDummies', [], new ObjectType(['name' => '']), new ObjectType(['name' => '']), [], new Schema([]), [], null, null, []);
5151

5252
$this->assertEquals($expected, $resolver(null, [], null, $resolveInfo));
5353
}
@@ -69,7 +69,7 @@ public function testCreateCollectionResolverNoPagination()
6969

7070
$resolver = $factory(RelatedDummy::class, Dummy::class, 'operationName');
7171

72-
$resolveInfo = new ResolveInfo('rootProperty', [], null, new ObjectType(['name' => '']), '', new Schema([]), null, null, null, null);
72+
$resolveInfo = new ResolveInfo('rootProperty', [], new ObjectType(['name' => '']), new ObjectType(['name' => '']), [], new Schema([]), [], null, null, []);
7373

7474
$this->assertEquals(['normalizedObject1', 'normalizedObject2'], $resolver(null, [], null, $resolveInfo));
7575
}
@@ -86,7 +86,7 @@ public function testCreateSubresourceCollectionResolverNoPagination(array $subco
8686

8787
$resolver = $factory(RelatedDummy::class, Dummy::class, 'operationName');
8888

89-
$resolveInfo = new ResolveInfo('relatedDummies', [], null, new ObjectType(['name' => '']), '', new Schema([]), null, null, null, null);
89+
$resolveInfo = new ResolveInfo('relatedDummies', [], new ObjectType(['name' => '']), new ObjectType(['name' => '']), [], new Schema([]), [], null, null, []);
9090

9191
$dummy = new Dummy();
9292
$dummy->setId(1);
@@ -119,7 +119,7 @@ public function testCreateCollectionResolver(string $cursor, array $expectedCurs
119119

120120
$resolver = $factory(RelatedDummy::class, Dummy::class, 'operationName');
121121

122-
$resolveInfo = new ResolveInfo('relatedDummies', [], null, new ObjectType(['name' => '']), '', new Schema([]), null, null, null, null);
122+
$resolveInfo = new ResolveInfo('relatedDummies', [], new ObjectType(['name' => '']), new ObjectType(['name' => '']), [], new Schema([]), [], null, null, []);
123123

124124
if ('$bad$' === $cursor) {
125125
$this->expectException(\Exception::class);
@@ -162,7 +162,7 @@ public function testCreatePaginatorCollectionResolver()
162162
$resolverFactory = $this->createCollectionResolverFactory($collectionPaginatorProphecy->reveal(), [], [], true, $cursor);
163163
$resolver = $resolverFactory(RelatedDummy::class, Dummy::class, 'operationName');
164164

165-
$resolveInfo = new ResolveInfo('relatedDummies', [], null, new ObjectType(['name' => '']), '', new Schema([]), null, null, null, null);
165+
$resolveInfo = new ResolveInfo('relatedDummies', [], new ObjectType(['name' => '']), new ObjectType(['name' => '']), [], new Schema([]), [], null, null, []);
166166

167167
$this->assertEquals(
168168
['edges' => [['node' => 'normalizedObject1', 'cursor' => 'Mg==']], 'pageInfo' => ['endCursor' => 'OQ==', 'hasNextPage' => true], 'totalCount' => 17.],

tests/GraphQl/Resolver/Factory/ItemMutationResolverFactoryTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public function testCreateItemMutationResolverNoItem()
4747
$resolverFactory = $this->createItemMutationResolverFactory(null, $dataPersisterProphecy);
4848
$resolver = $resolverFactory(Dummy::class, Dummy::class, 'delete');
4949

50-
$resolveInfo = new ResolveInfo('', [], null, new ObjectType(['name' => '']), '', new Schema([]), null, null, null, null);
50+
$resolveInfo = new ResolveInfo('', [], new ObjectType(['name' => '']), new ObjectType(['name' => '']), [], new Schema([]), [], null, null, []);
5151

5252
$resolver(null, ['input' => ['id' => '/dummies/3', 'clientMutationId' => '1936']], null, $resolveInfo);
5353
}
@@ -61,7 +61,7 @@ public function testCreateItemDeleteMutationResolver()
6161
$resolverFactory = $this->createItemMutationResolverFactory($dummy, $dataPersisterProphecy);
6262
$resolver = $resolverFactory(Dummy::class, null, 'delete');
6363

64-
$resolveInfo = new ResolveInfo('', [], null, new ObjectType(['name' => '']), '', new Schema([]), null, null, null, null);
64+
$resolveInfo = new ResolveInfo('', [], new ObjectType(['name' => '']), new ObjectType(['name' => '']), [], new Schema([]), [], null, null, []);
6565

6666
$this->assertEquals(['id' => '/dummies/3', 'clientMutationId' => '1936'], $resolver(null, ['input' => ['id' => '/dummies/3', 'clientMutationId' => '1936']], null, $resolveInfo));
6767
}

tests/GraphQl/Resolver/ItemResolverTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public function testCreateItemResolverNoItem()
3737
{
3838
$resolver = $this->createItemResolver(null);
3939

40-
$resolveInfo = new ResolveInfo('name', [], null, new ObjectType(['name' => '']), '', new Schema([]), null, null, null, null);
40+
$resolveInfo = new ResolveInfo('name', [], new ObjectType(['name' => '']), new ObjectType(['name' => '']), [], new Schema([]), [], null, null, []);
4141

4242
$this->assertNull($resolver(null, ['id' => '/related_dummies/3'], null, $resolveInfo));
4343
}
@@ -46,7 +46,7 @@ public function testCreateItemResolver()
4646
{
4747
$resolver = $this->createItemResolver(new RelatedDummy());
4848

49-
$resolveInfo = new ResolveInfo('name', [], null, new ObjectType(['name' => '']), '', new Schema([]), null, null, null, null);
49+
$resolveInfo = new ResolveInfo('name', [], new ObjectType(['name' => '']), new ObjectType(['name' => '']), [], new Schema([]), [], null, null, []);
5050

5151
$this->assertEquals('normalizedItem', $resolver(null, ['id' => '/related_dummies/3'], null, $resolveInfo));
5252
}
@@ -58,7 +58,7 @@ public function testCreateSubresourceItemResolver($normalizedSubresource)
5858
{
5959
$resolver = $this->createItemResolver(new Dummy());
6060

61-
$resolveInfo = new ResolveInfo('relatedDummy', [], null, new ObjectType(['name' => '']), '', new Schema([]), null, null, null, null);
61+
$resolveInfo = new ResolveInfo('relatedDummy', [], new ObjectType(['name' => '']), new ObjectType(['name' => '']), [], new Schema([]), [], null, null, []);
6262

6363
$this->assertEquals($normalizedSubresource, $resolver(['relatedDummy' => $normalizedSubresource], [], null, $resolveInfo));
6464
}

tests/GraphQl/Resolver/ResourceFieldResolverTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public function testId()
3131
$iriConverterProphecy = $this->prophesize(IriConverterInterface::class);
3232
$iriConverterProphecy->getIriFromItem($dummy)->willReturn('/dummies/1')->shouldBeCalled();
3333

34-
$resolveInfo = new ResolveInfo('id', [], null, new ObjectType(['name' => '']), '', new Schema([]), null, null, null, null);
34+
$resolveInfo = new ResolveInfo('id', [], new ObjectType(['name' => '']), new ObjectType(['name' => '']), [], new Schema([]), [], null, null, []);
3535

3636
$resolver = new ResourceFieldResolver($iriConverterProphecy->reveal());
3737
$this->assertEquals('/dummies/1', $resolver([ItemNormalizer::ITEM_KEY => serialize($dummy)], [], [], $resolveInfo));
@@ -41,7 +41,7 @@ public function testOriginalId()
4141
{
4242
$iriConverterProphecy = $this->prophesize(IriConverterInterface::class);
4343

44-
$resolveInfo = new ResolveInfo('_id', [], null, new ObjectType(['name' => '']), '', new Schema([]), null, null, null, null);
44+
$resolveInfo = new ResolveInfo('_id', [], new ObjectType(['name' => '']), new ObjectType(['name' => '']), [], new Schema([]), [], null, null, []);
4545

4646
$resolver = new ResourceFieldResolver($iriConverterProphecy->reveal());
4747
$this->assertEquals(1, $resolver(['id' => 1], [], [], $resolveInfo));
@@ -51,7 +51,7 @@ public function testDirectAccess()
5151
{
5252
$iriConverterProphecy = $this->prophesize(IriConverterInterface::class);
5353

54-
$resolveInfo = new ResolveInfo('foo', [], null, new ObjectType(['name' => '']), '', new Schema([]), null, null, null, null);
54+
$resolveInfo = new ResolveInfo('foo', [], new ObjectType(['name' => '']), new ObjectType(['name' => '']), [], new Schema([]), [], null, null, []);
5555

5656
$resolver = new ResourceFieldResolver($iriConverterProphecy->reveal());
5757
$this->assertEquals('bar', $resolver(['foo' => 'bar'], [], [], $resolveInfo));

0 commit comments

Comments
 (0)