Skip to content

Commit 5f1eda3

Browse files
committed
Update rector config and apply rector
1 parent fa01712 commit 5f1eda3

File tree

5 files changed

+21
-20
lines changed

5 files changed

+21
-20
lines changed

rector.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,27 +11,28 @@
1111
Rector\PHPUnit\Set\PHPUnitSetList::PHPUNIT_CODE_QUALITY,
1212
]);
1313
$rectorConfig->skip([
14-
Rector\PHPUnit\CodeQuality\Rector\Class_\PreferPHPUnitThisCallRector::class, // Prefer self::
15-
Rector\PHPUnit\PHPUnit60\Rector\ClassMethod\AddDoesNotPerformAssertionToNonAssertingTestRector::class, // False-positive
1614
Rector\CodeQuality\Rector\Isset_\IssetOnPropertyObjectToPropertyExistsRector::class, // isset() is nice when moving towards typed properties
1715
Rector\CodeQuality\Rector\Identical\FlipTypeControlToUseExclusiveTypeRector::class, // Unnecessarily complex with PHPStan
1816
Rector\CodeQuality\Rector\Concat\JoinStringConcatRector::class => [
1917
__DIR__ . '/tests', // Sometimes more readable for long strings
2018
],
2119
Rector\CodeQuality\Rector\ClassMethod\LocallyCalledStaticMethodToNonStaticRector::class, // static methods are fine
2220
Rector\CodeQuality\Rector\Foreach_\UnusedForeachValueToArrayKeysRector::class, // Less efficient
21+
Rector\CodeQuality\Rector\Switch_\SwitchTrueToIfRector::class, // More expressive in some cases
2322
Rector\DeadCode\Rector\If_\RemoveAlwaysTrueIfConditionRector::class, // Sometimes necessary to prove runtime behaviour matches defined types
2423
Rector\DeadCode\Rector\If_\RemoveDeadInstanceOfRector::class, // Sometimes necessary to prove runtime behaviour matches defined types
2524
Rector\DeadCode\Rector\Node\RemoveNonExistingVarAnnotationRector::class, // Sometimes false-positive
2625
Rector\DeadCode\Rector\Property\RemoveUnusedPrivatePropertyRector::class, // TODO reintroduce when https://github.com/rectorphp/rector-src/pull/4491 is released
26+
Rector\PHPUnit\CodeQuality\Rector\Class_\NarrowUnusedSetUpDefinedPropertyRector::class, // Sometimes nicer for symmetry
27+
Rector\PHPUnit\CodeQuality\Rector\Class_\PreferPHPUnitThisCallRector::class, // Prefer self::
2728
Rector\PHPUnit\CodeQuality\Rector\MethodCall\AssertPropertyExistsRector::class, // Uses deprecated PHPUnit methods
2829
Rector\PHPUnit\CodeQuality\Rector\MethodCall\AssertIssetToSpecificMethodRector::class => [
2930
__DIR__ . '/tests/Utils/MixedStoreTest.php', // Uses keys that are not string or int
3031
],
3132
Rector\PHPUnit\CodeQuality\Rector\MethodCall\AssertEqualsToSameRector::class => [
3233
__DIR__ . '/tests/TestCaseBase.php', // Array output may differ between tested PHP versions, assertEquals smooths over this
3334
],
34-
Rector\CodeQuality\Rector\Switch_\SwitchTrueToIfRector::class, // More expressive in some cases
35+
Rector\PHPUnit\PHPUnit60\Rector\ClassMethod\AddDoesNotPerformAssertionToNonAssertingTestRector::class, // False-positive
3536
]);
3637
$rectorConfig->paths([
3738
__DIR__ . '/benchmarks',

tests/Executor/Promise/SyncPromiseTest.php

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -389,23 +389,23 @@ public function testPendingPromiseThen(): void
389389
$nextPromise3 = $promise->then($onFulfilled, $onRejected);
390390
$nextPromise4 = $promise->then($onFulfilled, $onRejected);
391391

392-
self::assertSame(SyncPromise::getQueue()->count(), 0);
393-
self::assertSame($onFulfilledCount, 0);
394-
self::assertSame($onRejectedCount, 0);
392+
self::assertCount(0, SyncPromise::getQueue());
393+
self::assertSame(0, $onFulfilledCount);
394+
self::assertSame(0, $onRejectedCount);
395395
$promise->resolve(1);
396396

397-
self::assertSame(SyncPromise::getQueue()->count(), 4);
398-
self::assertSame($onFulfilledCount, 0); // @phpstan-ignore-line side-effects
399-
self::assertSame($onRejectedCount, 0); // @phpstan-ignore-line side-effects
397+
self::assertCount(4, SyncPromise::getQueue());
398+
self::assertSame(0, $onFulfilledCount); // @phpstan-ignore-line side-effects
399+
self::assertSame(0, $onRejectedCount); // @phpstan-ignore-line side-effects
400400
self::assertSame(SyncPromise::PENDING, $nextPromise->state);
401401
self::assertSame(SyncPromise::PENDING, $nextPromise2->state);
402402
self::assertSame(SyncPromise::PENDING, $nextPromise3->state);
403403
self::assertSame(SyncPromise::PENDING, $nextPromise4->state);
404404

405405
SyncPromise::runQueue();
406-
self::assertSame(SyncPromise::getQueue()->count(), 0);
407-
self::assertSame($onFulfilledCount, 3); // @phpstan-ignore-line side-effects
408-
self::assertSame($onRejectedCount, 0); // @phpstan-ignore-line side-effects
406+
self::assertCount(0, SyncPromise::getQueue());
407+
self::assertSame(3, $onFulfilledCount); // @phpstan-ignore-line side-effects
408+
self::assertSame(0, $onRejectedCount); // @phpstan-ignore-line side-effects
409409
self::assertValidPromise($nextPromise, 1, null, SyncPromise::FULFILLED);
410410
self::assertValidPromise($nextPromise2, 1, null, SyncPromise::FULFILLED);
411411
self::assertValidPromise($nextPromise3, 2, null, SyncPromise::FULFILLED);

tests/Language/PrinterTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -209,13 +209,13 @@ public function testExperimentalCorrectlyPrintsFragmentDefinedVariables(): void
209209
);
210210

211211
self::assertSame(
212-
Printer::doPrint($fragmentWithVariable),
213212
<<<'GRAPHQL'
214213
fragment Foo($a: ComplexType, $b: Boolean = false) on TestType {
215214
id
216215
}
217216

218-
GRAPHQL
217+
GRAPHQL,
218+
Printer::doPrint($fragmentWithVariable)
219219
);
220220
}
221221

tests/Type/DefinitionTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -154,12 +154,12 @@ public function testDefinesAQueryOnlySchema(): void
154154
self::assertSame($blogSchema->getQueryType(), $this->blogQuery);
155155

156156
$articleField = $this->blogQuery->getField('article');
157-
self::assertSame($articleField->name, 'article');
157+
self::assertSame('article', $articleField->name);
158158

159159
$articleFieldType = $articleField->getType();
160160
self::assertInstanceOf(ObjectType::class, $articleFieldType);
161161
self::assertSame($articleFieldType, $this->blogArticle);
162-
self::assertSame($articleFieldType->name, 'Article');
162+
self::assertSame('Article', $articleFieldType->name);
163163

164164
$titleField = $articleFieldType->getField('title');
165165
self::assertSame('title', $titleField->name);
@@ -213,8 +213,8 @@ public function testDefinesSubscriptionSchema(): void
213213
$subType = $sub->getType();
214214
self::assertInstanceOf(ObjectType::class, $subType);
215215
self::assertEquals($subType, $this->blogArticle);
216-
self::assertSame($subType->name, 'Article');
217-
self::assertSame($sub->name, 'articleSubscribe');
216+
self::assertSame('Article', $subType->name);
217+
self::assertSame('articleSubscribe', $sub->name);
218218
}
219219

220220
/**

tests/Type/LazyDefinitionTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,11 +175,11 @@ public function testReturningFieldsUsingYield(): void
175175
self::assertSame($blogSchema->getQueryType(), $type);
176176

177177
$field = $type->getField('url');
178-
self::assertSame($field->name, 'url');
178+
self::assertSame('url', $field->name);
179179
self::assertInstanceOf(StringType::class, $field->getType());
180180

181181
$field = $type->getField('width');
182-
self::assertSame($field->name, 'width');
182+
self::assertSame('width', $field->name);
183183
self::assertInstanceOf(IntType::class, $field->getType());
184184
}
185185

0 commit comments

Comments
 (0)