Apply rector and php-cs-fixer

nuwave · Sep 6, 2023 · 9ac69a3 · 9ac69a3
1 parent 43ecad3
commit 9ac69a3
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 9 deletions.
diff --git a/rector.php b/rector.php
@@ -9,6 +9,7 @@
 use Rector\CodeQuality\Rector\Isset_\IssetOnPropertyObjectToPropertyExistsRector;
 use Rector\CodingStyle\Rector\Class_\AddArrayDefaultToArrayPropertyRector;
 use Rector\CodingStyle\Rector\ClassConst\VarConstantCommentRector;
+use Rector\CodingStyle\Rector\ClassMethod\MakeInheritedMethodVisibilitySameAsParentRector;
 use Rector\CodingStyle\Rector\ClassMethod\UnSpreadOperatorRector;
 use Rector\CodingStyle\Rector\Closure\StaticClosureRector;
 use Rector\CodingStyle\Rector\Encapsed\EncapsedStringsToSprintfRector;
@@ -39,6 +40,7 @@
     ]);
     $rectorConfig->skip([
         __DIR__ . '/tests/database/migrations', // Does not fit autoloading standards
+        __DIR__ . '/tests/LaravelPhpdocAlignmentFixer.php', // Copied from Laravel
         CallableThisArrayToAnonymousFunctionRector::class, // Callable in array form is shorter and more efficient
         IssetOnPropertyObjectToPropertyExistsRector::class, // isset() is nice when moving towards typed properties
         FlipTypeControlToUseExclusiveTypeRector::class, // Unnecessarily complex with PHPStan
@@ -54,6 +56,9 @@
         GetClassToInstanceOfRector::class => [
             __DIR__ . '/src/Schema/Types/Scalars/DateScalar.php', // We need to compare exact classes, not subclasses
         ],
+        MakeInheritedMethodVisibilitySameAsParentRector::class => [
+            __DIR__ . '/tests/Unit/Execution/ResolveInfoTest.php', // Makes method public on purpose
+        ],
         ExplicitBoolCompareRector::class, // if($truthy) is fine and very readable
         EncapsedStringsToSprintfRector::class, // unreadable, slow, error prone
         VarConstantCommentRector::class, // Noisy

diff --git a/src/Console/FieldGeneratorCommand.php b/src/Console/FieldGeneratorCommand.php
@@ -13,7 +13,7 @@ abstract class FieldGeneratorCommand extends LighthouseGeneratorCommand
 
     protected function getStub(): string
     {
-        if (version_compare(PHP_VERSION, '8.2.0', '>=')) {
+        if (PHP_VERSION_ID >= 80200) {
             return $this->option('full')
                 ? __DIR__ . '/stubs/field_full.php82.stub'
                 : __DIR__ . '/stubs/field_simple.php82.stub';

diff --git a/src/Http/Responses/ResponseStream.php b/src/Http/Responses/ResponseStream.php
@@ -9,7 +9,9 @@
 class ResponseStream extends Stream implements CanStreamResponse
 {
     protected const EOL = "\r\n";
+
     protected const BOUNDARY = self::EOL . '---' . self::EOL;
+
     protected const TERMINATING_BOUNDARY = self::EOL . '-----' . self::EOL;
 
     public function stream(array $data, array $paths, bool $isFinalChunk): void

diff --git a/tests/Integration/Pennant/FeatureDirectiveTest.php b/tests/Integration/Pennant/FeatureDirectiveTest.php
@@ -82,7 +82,7 @@ public function testUnavailableWhenFeatureIsInactiveWithDefaultFeatureState(): v
 
     public function testUnavailableWhenFeatureIsActive(): void
     {
-        Feature::define('new-api', fn (): bool => true);
+        Feature::define('new-api', static fn (): bool => true);
         $this->schema = /* @lang GraphQL */ <<<'GRAPHQL'
             type Query {
                 fieldWhenInactive: String!
@@ -103,9 +103,9 @@ public function testUnavailableWhenFeatureIsActive(): void
 
     public function testAvailableWhenFeatureIsActive(): void
     {
-        Feature::define('new-api', fn (): bool => true);
+        Feature::define('new-api', static fn (): bool => true);
         $fieldValue = 'active';
-        $this->mockResolver(fn (): string => $fieldValue);
+        $this->mockResolver(static fn (): string => $fieldValue);
         $this->schema = /* @lang GraphQL */ <<<'GRAPHQL'
             type Query {
                 fieldWhenActive: String!
@@ -131,9 +131,9 @@ public function testAvailableWhenFeatureIsActive(): void
 
     public function testAvailableWhenFeatureIsActiveWithDefaultFeatureState(): void
     {
-        Feature::define('new-api', fn (): bool => true);
+        Feature::define('new-api', static fn (): bool => true);
         $fieldValue = 'active';
-        $this->mockResolver(fn (): string => $fieldValue);
+        $this->mockResolver(static fn (): string => $fieldValue);
         $this->schema = /* @lang GraphQL */ <<<'GRAPHQL'
             type Query {
                 fieldWhenActive: String!
@@ -160,7 +160,7 @@ public function testAvailableWhenFeatureIsActiveWithDefaultFeatureState(): void
     public function testAvailableWhenFeatureIsInactive(): void
     {
         $fieldValue = 'inactive';
-        $this->mockResolver(fn (): string => $fieldValue);
+        $this->mockResolver(static fn (): string => $fieldValue);
         $this->schema = /* @lang GraphQL */ <<<'GRAPHQL'
             type Query {
                 fieldWhenInactive: String!

diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -18,7 +18,6 @@
 use Nuwave\Lighthouse\LighthouseServiceProvider;
 use Nuwave\Lighthouse\OrderBy\OrderByServiceProvider;
 use Nuwave\Lighthouse\Pagination\PaginationServiceProvider;
-use Nuwave\Lighthouse\Pennant\PennantServiceProvider as LighthousePennantServiceProvider;
 use Nuwave\Lighthouse\Schema\SchemaBuilder;
 use Nuwave\Lighthouse\Scout\ScoutServiceProvider as LighthouseScoutServiceProvider;
 use Nuwave\Lighthouse\SoftDeletes\SoftDeletesServiceProvider;

diff --git a/tests/Utils/Models/User/UserBuilder.php b/tests/Utils/Models/User/UserBuilder.php
@@ -11,7 +11,7 @@ final class UserBuilder extends Builder
     /** @param  array{company: string}  $args */
     public function companyName(array $args): self
     {
-        return $this->where(fn (self $builder) => $builder
+        return $this->where(static fn (self $builder): \Tests\Utils\Models\User\UserBuilder => $builder
             ->whereHas('company', static fn (EloquentBuilder $q): EloquentBuilder => $q
             ->where('name', $args['company'])));
     }