Skip to content

Commit 420c13e

Browse files
spawniaspawnia
authored
Apply latest rector fixes and update its configuration
1 parent 8c549d9 commit 420c13e

File tree

13 files changed

+73
-81
lines changed

13 files changed

+73
-81
lines changed

‎rector.php‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@
2626
Rector\PHPUnit\CodeQuality\Rector\Class_\NarrowUnusedSetUpDefinedPropertyRector::class, // Sometimes nicer for symmetry
2727
Rector\PHPUnit\CodeQuality\Rector\Class_\PreferPHPUnitThisCallRector::class, // Prefer self::
2828
Rector\PHPUnit\CodeQuality\Rector\Class_\RemoveDataProviderParamKeysRector::class, // Less clear
29+
Rector\PHPUnit\CodeQuality\Rector\FuncCall\AssertFuncCallToPHPUnitAssertRector::class => [
30+
__DIR__ . '/src',
31+
],
2932
Rector\PHPUnit\CodeQuality\Rector\MethodCall\AssertPropertyExistsRector::class, // Uses deprecated PHPUnit methods
3033
Rector\PHPUnit\CodeQuality\Rector\MethodCall\AssertIssetToSpecificMethodRector::class => [
3134
__DIR__ . '/tests/Utils/MixedStoreTest.php', // Uses keys that are not string or int

‎src/Executor/ReferenceExecutor.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@ public function onError($error): ?Promise
328328
if ($error instanceof Error) {
329329
$this->exeContext->addError($error);
330330

331-
return $this->exeContext->promiseAdapter->createFulfilled(null);
331+
return $this->exeContext->promiseAdapter->createFulfilled();
332332
}
333333

334334
return null;

‎src/Language/Lexer.php‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ class Lexer
6060
/** @phpstan-param ParserOptions $options */
6161
public function __construct(Source $source, array $options = [])
6262
{
63-
$startOfFileToken = new Token(Token::SOF, 0, 0, 0, 0, null);
63+
$startOfFileToken = new Token(Token::SOF, 0, 0, 0, 0);
6464

6565
$this->source = $source;
6666
$this->options = $options;
@@ -408,10 +408,7 @@ private function readString(int $line, int $col, Token $prev): Token
408408
$chunk = '';
409409
$value = '';
410410

411-
while (
412-
$code !== null
413-
&& $code !== 10 && $code !== 13 // not LineTerminator
414-
) {
411+
while (! in_array($code, [null, 10, 13], true)) { // not LineTerminator
415412
if ($code === 34) { // Closing Quote (")
416413
$value .= $chunk;
417414

‎tests/Executor/ExecutorLazySchemaTest.php‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ public function testHintsOnConflictingTypeInstancesInDefinitions(): void
192192
public function testSimpleQuery(): void
193193
{
194194
$Query = $this->loadType('Query');
195-
assert($Query instanceof ObjectType);
195+
self::assertInstanceOf(ObjectType::class, $Query);
196196

197197
$schema = new Schema([
198198
'query' => $Query,
@@ -260,7 +260,7 @@ public function loadType(string $name, bool $isExecutorCall = false): ?Type
260260
$this->calls[] = 'SomeObject.interfaces';
261261

262262
$someInterface = $this->loadType('SomeInterface');
263-
assert($someInterface instanceof InterfaceType);
263+
self::assertInstanceOf(InterfaceType::class, $someInterface);
264264

265265
return [
266266
$someInterface,
@@ -275,10 +275,10 @@ public function loadType(string $name, bool $isExecutorCall = false): ?Type
275275
$this->calls[] = 'OtherObject.fields';
276276

277277
$someUnion = $this->loadType('SomeUnion');
278-
assert($someUnion instanceof UnionType);
278+
self::assertInstanceOf(UnionType::class, $someUnion);
279279

280280
$someInterface = $this->loadType('SomeInterface');
281-
assert($someInterface instanceof InterfaceType);
281+
self::assertInstanceOf(InterfaceType::class, $someInterface);
282282

283283
return [
284284
'union' => ['type' => $someUnion],
@@ -310,15 +310,15 @@ public function loadType(string $name, bool $isExecutorCall = false): ?Type
310310
$this->calls[] = 'SomeUnion.resolveType';
311311

312312
$deeperObject = $this->loadType('DeeperObject');
313-
assert($deeperObject instanceof ObjectType);
313+
self::assertInstanceOf(ObjectType::class, $deeperObject);
314314

315315
return $deeperObject;
316316
},
317317
'types' => function (): array {
318318
$this->calls[] = 'SomeUnion.types';
319319

320320
$deeperObject = $this->loadType('DeeperObject');
321-
assert($deeperObject instanceof ObjectType);
321+
self::assertInstanceOf(ObjectType::class, $deeperObject);
322322

323323
return [$deeperObject];
324324
},
@@ -331,7 +331,7 @@ public function loadType(string $name, bool $isExecutorCall = false): ?Type
331331
$this->calls[] = 'SomeInterface.resolveType';
332332

333333
$someObject = $this->loadType('SomeObject');
334-
assert($someObject instanceof ObjectType);
334+
self::assertInstanceOf(ObjectType::class, $someObject);
335335

336336
return $someObject;
337337
},
@@ -354,7 +354,7 @@ public function loadType(string $name, bool $isExecutorCall = false): ?Type
354354
public function testDeepQuery(): void
355355
{
356356
$Query = $this->loadType('Query');
357-
assert($Query instanceof ObjectType);
357+
self::assertInstanceOf(ObjectType::class, $Query);
358358

359359
$schema = new Schema([
360360
'query' => $Query,
@@ -395,7 +395,7 @@ public function testDeepQuery(): void
395395
public function testResolveUnion(): void
396396
{
397397
$Query = $this->loadType('Query');
398-
assert($Query instanceof ObjectType);
398+
self::assertInstanceOf(ObjectType::class, $Query);
399399

400400
$schema = new Schema([
401401
'query' => $Query,

‎tests/Executor/ExecutorTest.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ final class ExecutorTest extends TestCase
2929

3030
public function tearDown(): void
3131
{
32-
Executor::setDefaultPromiseAdapter(null);
32+
Executor::setDefaultPromiseAdapter();
3333
}
3434

3535
// Execute: Handles basic execution tasks
@@ -1159,7 +1159,7 @@ public function testSerializesToEmptyObjectVsEmptyArray(): void
11591159
}
11601160
');
11611161

1162-
$result = Executor::execute($schema, $query, $data, null);
1162+
$result = Executor::execute($schema, $query, $data);
11631163

11641164
self::assertEquals(
11651165
[

‎tests/Executor/Promise/SyncPromiseTest.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -266,8 +266,7 @@ public function testRejectedPromise(
266266
}
267267

268268
$nextPromise = $promise->then(
269-
static function (): void {},
270-
null
269+
static function (): void {}
271270
);
272271
self::assertSame($promise, $nextPromise);
273272

‎tests/Executor/ScopedContextTest.php‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -209,9 +209,7 @@ public function testQueryContextShouldBeScopedBeforePassingToChildren(): void
209209
Parser::parse($doc),
210210
'rootValue',
211211
$context,
212-
[],
213-
null,
214-
null
212+
[]
215213
);
216214

217215
$result = $this->promiseAdapter->wait($result);
@@ -275,9 +273,7 @@ public function testMutationContextShouldBeScopedBeforePassingToChildren(): void
275273
Parser::parse($doc),
276274
'rootValue',
277275
$context,
278-
[],
279-
null,
280-
null
276+
[]
281277
);
282278

283279
$result = $this->promiseAdapter->wait($result);
@@ -341,9 +337,7 @@ public function testContextShouldNotBeScoped(): void
341337
Parser::parse($doc),
342338
'rootValue',
343339
$context,
344-
[],
345-
null,
346-
null
340+
[]
347341
);
348342

349343
$result = $this->promiseAdapter->wait($result);

‎tests/Language/VisitorTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ public function testAllowsEditingANodeBothOnEnterAndOnLeave(): void
215215

216216
$expected = $ast->cloneDeep();
217217
$operationNode = $expected->definitions[0];
218-
assert($operationNode instanceof OperationDefinitionNode);
218+
self::assertInstanceOf(OperationDefinitionNode::class, $operationNode);
219219
$operationNode->directives = new NodeList([$directive1, $directive2]);
220220

221221
self::assertEquals($expected, $editedAst);

‎tests/Type/ValidationTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2728,7 +2728,7 @@ public function testRejectsDifferentInstancesOfTheSameType(): void
27282728
};
27292729

27302730
$query = $typeLoader('Query');
2731-
assert($query instanceof ObjectType);
2731+
self::assertInstanceOf(ObjectType::class, $query);
27322732

27332733
$schema = new Schema([
27342734
'query' => $query,

‎tests/Utils/AstFromArrayTest.php‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@ public function testFromArray(): void
2020
'kind' => 'VariableDefinition',
2121
'directives' => [],
2222
]);
23-
assert($res instanceof VariableDefinitionNode);
23+
self::assertInstanceOf(VariableDefinitionNode::class, $res);
2424
self::assertEquals($res->directives, new NodeList([]));
2525

2626
$res = AST::fromArray([
2727
'kind' => 'OperationDefinition',
2828
'directives' => [],
2929
]);
30-
assert($res instanceof OperationDefinitionNode);
30+
self::assertInstanceOf(OperationDefinitionNode::class, $res);
3131
self::assertEquals($res->directives, new NodeList([]));
3232
self::assertEquals($res->variableDefinitions, new NodeList([]));
3333

@@ -36,29 +36,29 @@ public function testFromArray(): void
3636
'directives' => [],
3737
'arguments' => [],
3838
]);
39-
assert($res instanceof FieldNode);
39+
self::assertInstanceOf(FieldNode::class, $res);
4040
self::assertEquals($res->directives, new NodeList([]));
4141
self::assertEquals($res->arguments, new NodeList([]));
4242

4343
$res = AST::fromArray([
4444
'kind' => 'FragmentSpread',
4545
'directives' => [],
4646
]);
47-
assert($res instanceof FragmentSpreadNode);
47+
self::assertInstanceOf(FragmentSpreadNode::class, $res);
4848
self::assertEquals($res->directives, new NodeList([]));
4949

5050
$res = AST::fromArray([
5151
'kind' => 'FragmentDefinition',
5252
'directives' => [],
5353
]);
54-
assert($res instanceof FragmentDefinitionNode);
54+
self::assertInstanceOf(FragmentDefinitionNode::class, $res);
5555
self::assertEquals($res->directives, new NodeList([]));
5656

5757
$res = AST::fromArray([
5858
'kind' => 'InlineFragment',
5959
'directives' => [],
6060
]);
61-
assert($res instanceof InlineFragmentNode);
61+
self::assertInstanceOf(InlineFragmentNode::class, $res);
6262
self::assertEquals($res->directives, new NodeList([]));
6363
}
6464

@@ -67,39 +67,39 @@ public function testFromOptimizedArray(): void
6767
$res = AST::fromArray([
6868
'kind' => 'VariableDefinition',
6969
]);
70-
assert($res instanceof VariableDefinitionNode);
70+
self::assertInstanceOf(VariableDefinitionNode::class, $res);
7171
self::assertEquals($res->directives, new NodeList([]));
7272

7373
$res = AST::fromArray([
7474
'kind' => 'OperationDefinition',
7575
]);
76-
assert($res instanceof OperationDefinitionNode);
76+
self::assertInstanceOf(OperationDefinitionNode::class, $res);
7777
self::assertEquals($res->directives, new NodeList([]));
7878
self::assertEquals($res->variableDefinitions, new NodeList([]));
7979

8080
$res = AST::fromArray([
8181
'kind' => 'Field',
8282
]);
83-
assert($res instanceof FieldNode);
83+
self::assertInstanceOf(FieldNode::class, $res);
8484
self::assertEquals($res->directives, new NodeList([]));
8585
self::assertEquals($res->arguments, new NodeList([]));
8686

8787
$res = AST::fromArray([
8888
'kind' => 'FragmentSpread',
8989
]);
90-
assert($res instanceof FragmentSpreadNode);
90+
self::assertInstanceOf(FragmentSpreadNode::class, $res);
9191
self::assertEquals($res->directives, new NodeList([]));
9292

9393
$res = AST::fromArray([
9494
'kind' => 'FragmentDefinition',
9595
]);
96-
assert($res instanceof FragmentDefinitionNode);
96+
self::assertInstanceOf(FragmentDefinitionNode::class, $res);
9797
self::assertEquals($res->directives, new NodeList([]));
9898

9999
$res = AST::fromArray([
100100
'kind' => 'InlineFragment',
101101
]);
102-
assert($res instanceof InlineFragmentNode);
102+
self::assertInstanceOf(InlineFragmentNode::class, $res);
103103
self::assertEquals($res->directives, new NodeList([]));
104104
}
105105
}

0 commit comments

Comments
 (0)