Skip to content

Fix test suite compatibility with webonyx/graphql-php v0.13.1 #2594

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alanpoulain merged 1 commit into from
Mar 10, 2019
Merged

Fix test suite compatibility with webonyx/graphql-php v0.13.1 #2594

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion phpstan.neon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ parameters:
- '#Parameter \#1 \$function of function call_user_func expects callable, .+ given\.#'
- '#Parameter \#1 \$classes of class ApiPlatform\\Core\\Metadata\\Resource\\ResourceNameCollection constructor expects array<string>, array<int, int\|string> given\.#'
- '#Method ApiPlatform\\Core\\Util\\RequestParser::parseRequestParams\(\) should return array but returns array\|false\.#'
- '#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\.#'
- '#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\.#'
- '#Parameter \#1 \$defaultContext of class Symfony\\Component\\Serializer\\Encoder\\Json(De|En)code constructor expects array, (int|true) given\.#'
- '#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\.#'
# Temporary fix while the PHPStan extension for Prophecy isn't compatible with 0.10
Expand Down
10 changes: 5 additions & 5 deletions tests/GraphQl/Resolver/Factory/CollectionResolverFactoryTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public function testCreateCollectionResolverNoCollection(bool $paginationEnabled
$factory = $this->createCollectionResolverFactory([], [], ['id' => 1], $paginationEnabled);
$resolver = $factory(RelatedDummy::class, Dummy::class, 'operationName');

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

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

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

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

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

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

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

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

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

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

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

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

$this->assertEquals(
['edges' => [['node' => 'normalizedObject1', 'cursor' => 'Mg==']], 'pageInfo' => ['endCursor' => 'OQ==', 'hasNextPage' => true], 'totalCount' => 17.],
Expand Down
4 changes: 2 additions & 2 deletions tests/GraphQl/Resolver/Factory/ItemMutationResolverFactoryTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public function testCreateItemMutationResolverNoItem()
$resolverFactory = $this->createItemMutationResolverFactory(null, $dataPersisterProphecy);
$resolver = $resolverFactory(Dummy::class, Dummy::class, 'delete');

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

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

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

$this->assertEquals(['id' => '/dummies/3', 'clientMutationId' => '1936'], $resolver(null, ['input' => ['id' => '/dummies/3', 'clientMutationId' => '1936']], null, $resolveInfo));
}
Expand Down
6 changes: 3 additions & 3 deletions tests/GraphQl/Resolver/ItemResolverTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public function testCreateItemResolverNoItem()
{
$resolver = $this->createItemResolver(null);

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

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

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

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

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

$this->assertEquals($normalizedSubresource, $resolver(['relatedDummy' => $normalizedSubresource], [], null, $resolveInfo));
}
Expand Down
6 changes: 3 additions & 3 deletions tests/GraphQl/Resolver/ResourceFieldResolverTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public function testId()
$iriConverterProphecy = $this->prophesize(IriConverterInterface::class);
$iriConverterProphecy->getIriFromItem($dummy)->willReturn('/dummies/1')->shouldBeCalled();

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

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

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

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

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

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