fixes

peterfox · peterfox · commit 6ca2aec6619f · 2025-01-21T21:01:21.000Z
diff --git a/rector.php b/rector.php
@@ -11,7 +11,7 @@
         __DIR__ . '/tests',
     ])
     // uncomment to reach your current PHP version
-    // ->withPhpSets()
-    ->withTypeCoverageLevel(0)
-    ->withDeadCodeLevel(0)
-    ->withCodeQualityLevel(0);
+     ->withPhpSets(php82: true)
+    ->withTypeCoverageLevel(1024)
+    ->withDeadCodeLevel(1024)
+    ->withCodeQualityLevel(1024);
diff --git a/src/ActionableFlag.php b/src/ActionableFlag.php
@@ -36,7 +36,7 @@ public function isDebuggable(): bool
         return (bool) $this->debug;
     }
 
-    public function storeInspectionInformation(string $pipe, string $reason, ?bool $result = null)
+    public function storeInspectionInformation(string $pipe, string $reason, ?bool $result = null): void
     {
         $this->debug->addDecision($pipe, $reason, $result);
     }
diff --git a/src/FeatureFlagsServiceProvider.php b/src/FeatureFlagsServiceProvider.php
@@ -28,7 +28,7 @@ class FeatureFlagsServiceProvider extends ServiceProvider
     /**
      * Bootstrap the application services.
      */
-    public function boot()
+    public function boot(): void
     {
         if ($this->app->runningInConsole()) {
             $this->publishes([
@@ -96,7 +96,7 @@ public function register(): void
             $this->app->singleton(FeaturesContract::class, Manager::class);
         }
 
-        $this->app->scoped(MaintenanceRepository::class, fn (Container $app) => new MaintenanceRepository($app->make(FeaturesContract::class), $app));
+        $this->app->scoped(MaintenanceRepository::class, fn (Container $app): \YlsIdeas\FeatureFlags\Support\MaintenanceRepository => new MaintenanceRepository($app->make(FeaturesContract::class), $app));
 
         $this->app->extend(MaintenanceModeManager::class, fn (MaintenanceModeManager $manager) => $manager->extend('features', fn (): MaintenanceMode => new MaintenanceDriver(
             $this->app->make(MaintenanceRepository::class)
@@ -109,7 +109,7 @@ protected function schedulingMacros()
             /** @noRector \Rector\Php74\Rector\Closure\ClosureToArrowFunctionRector */
             Event::macro('skipWithoutFeature', fn (string $feature): Event =>
                 /** @var Event $this */
-                $this->skip(fn () => ! Features::accessible($feature)));
+                $this->skip(fn (): bool => ! Features::accessible($feature)));
         }
 
         if (! Event::hasMacro('skipWithFeature')) {
@@ -141,7 +141,7 @@ protected function aboutCommandInfo(): void
     {
         if (class_exists(AboutCommand::class)) {
             AboutCommand::add('Feature Flags', [
-                'Pipeline' => fn () => implode(', ', config('features.pipeline')),
+                'Pipeline' => fn (): string => implode(', ', config('features.pipeline')),
             ]);
         }
     }
diff --git a/src/Manager.php b/src/Manager.php
@@ -66,7 +66,7 @@ public function pipeline(): Pipeline
      */
     public function accessible(string $feature): bool
     {
-        if ($this->expiredFeaturesHandler) {
+        if ($this->expiredFeaturesHandler instanceof \YlsIdeas\FeatureFlags\Contracts\ExpiredFeaturesHandler) {
             $this->expiredFeaturesHandler->isExpired($feature);
         }
 
@@ -289,7 +289,7 @@ protected function pipes(): array
         $pipes = $this->container->make(Repository::class)->get('features.pipeline');
 
         return collect($pipes)
-            ->map(fn (string $pipe) => $this->resolve($pipe))
+            ->map(fn (string $pipe): \YlsIdeas\FeatureFlags\Support\GatewayInspector => $this->resolve($pipe))
             ->all();
     }
 
diff --git a/src/Support/FeatureFake.php b/src/Support/FeatureFake.php
@@ -50,7 +50,7 @@ public function accessible(string $feature): bool
         return $featureValue;
     }
 
-    public function assertAccessed(string $feature, ?int $count = null, string $message = '')
+    public function assertAccessed(string $feature, ?int $count = null, string $message = ''): void
     {
         if ($count === null) {
             Assert::assertGreaterThan(0, $this->getCount($feature), $message);
@@ -59,12 +59,12 @@ public function assertAccessed(string $feature, ?int $count = null, string $mess
         }
     }
 
-    public function assertNotAccessed(string $feature, string $message = '')
+    public function assertNotAccessed(string $feature, string $message = ''): void
     {
         Assert::assertLessThan(1, $this->getCount($feature), $message);
     }
 
-    public function assertAccessedCount(string $feature, int $count = 0, string $message = '')
+    public function assertAccessedCount(string $feature, int $count = 0, string $message = ''): void
     {
         $this->assertAccessed($feature, $count, $message);
     }
diff --git a/src/Support/GatewayCache.php b/src/Support/GatewayCache.php
@@ -36,7 +36,7 @@ public function delete(string $feature): void
         $this->repository->delete($this->generateKey($feature));
     }
 
-    public function generateKey($feature)
+    public function generateKey(string $feature): string
     {
         return $this->namespace . ':' . $this->cacheable->generateKey($feature);
     }
diff --git a/src/Support/MaintenanceRepository.php b/src/Support/MaintenanceRepository.php
@@ -44,14 +44,14 @@ public function callDeactivation(): void
         $this->container->call($this->uponDeactivation, ['features' => $this->features]);
     }
 
-    public function onEnabled($feature): MaintenanceScenario
+    public function onEnabled(string $feature): MaintenanceScenario
     {
         return tap((new MaintenanceScenario())->whenEnabled($feature), function (MaintenanceScenario $scenario): void {
             $this->scenarios[] = $scenario;
         });
     }
 
-    public function onDisabled($feature): MaintenanceScenario
+    public function onDisabled(string $feature): MaintenanceScenario
     {
         return tap((new MaintenanceScenario())->whenDisabled($feature), function (MaintenanceScenario $scenario): void {
             $this->scenarios[] = $scenario;
@@ -75,15 +75,12 @@ public function parameters(): ?array
     protected function findScenario(): ?MaintenanceScenario
     {
         return $this->foundScenario = collect($this->scenarios)
-            ->first(function (MaintenanceScenario $scenario) {
+            ->first(function (MaintenanceScenario $scenario): bool {
                 if ($scenario->onEnabled && $this->features->accessible($scenario->feature)) {
                     return true;
                 }
-                if (! $scenario->onEnabled && ! $this->features->accessible($scenario->feature)) {
-                    return true;
-                }
 
-                return false;
+                return ! $scenario->onEnabled && ! $this->features->accessible($scenario->feature);
             });
     }
 }
diff --git a/tests/GatewayDriverTest.php b/tests/GatewayDriverTest.php
@@ -16,7 +16,7 @@ protected function getPackageProviders($app): array
         ];
     }
 
-    public function test_throws_exception_creating_a_gateway_driver()
+    public function test_throws_exception_creating_a_gateway_driver(): void
     {
         config()->set('features.pipeline', ['gate']);
         config()->set('features.gateways', [
@@ -30,7 +30,7 @@ public function test_throws_exception_creating_a_gateway_driver()
         $this->app->make(Manager::class)->pipeline();
     }
 
-    public function test_create_a_gateway_driver()
+    public function test_create_a_gateway_driver(): void
     {
         config()->set('features.pipeline', ['gate']);
         config()->set('features.gateways', [
diff --git a/tests/Gateways/DatabaseGatewayTest.php b/tests/Gateways/DatabaseGatewayTest.php
@@ -111,7 +111,7 @@ public function test_it_can_store_the_state_of_features_switched_on(): void
             ->andReturn($query);
 
         $query->shouldReceive('updateOrInsert')
-            ->withArgs(function ($find, $data) {
+            ->withArgs(function (array $find, array $data): true {
                 $this->assertArrayHasKey('feature', $find);
                 $this->assertArrayHasKey('active_at', $data);
 
diff --git a/tests/MaintenanceModeTest.php b/tests/MaintenanceModeTest.php
@@ -14,35 +14,35 @@
 
 class MaintenanceModeTest extends TestCase
 {
-    public function test_maintenance_mode_enabled()
+    public function test_maintenance_mode_enabled(): void
     {
         Features::fake(['system.down' => true]);
         Features::maintenanceMode()
             ->onEnabled('system.down');
 
-        Route::get('/', fn () => 'Foo Bar');
+        Route::get('/', fn (): string => 'Foo Bar');
 
         $this->get('/')
             ->assertServiceUnavailable();
 
         Features::assertAccessed('system.down');
     }
 
-    public function test_maintenance_mode_disabled()
+    public function test_maintenance_mode_disabled(): void
     {
         Features::fake(['system.down' => false]);
         Features::maintenanceMode()
             ->onEnabled('system.down');
 
-        Route::get('/', fn () => 'Foo Bar');
+        Route::get('/', fn (): string => 'Foo Bar');
 
         $this->get('/')
             ->assertOk();
 
         Features::assertAccessed('system.down');
     }
 
-    public function test_it_handles_the_first_match()
+    public function test_it_handles_the_first_match(): void
     {
         Features::fake(['system.api' => true,]);
         Features::maintenanceMode()
@@ -52,7 +52,7 @@ public function test_it_handles_the_first_match()
             ->onEnabled('system.api')
             ->statusCode(500);
 
-        Route::get('/', fn () => 'Foo Bar');
+        Route::get('/', fn (): string => 'Foo Bar');
 
         $this->get('/')
             ->assertStatus(500);
@@ -61,7 +61,7 @@ public function test_it_handles_the_first_match()
         Features::assertAccessed('system.api');
     }
 
-    public function test_upon_activation()
+    public function test_upon_activation(): void
     {
         $called = false;
         Features::maintenanceMode()
@@ -75,15 +75,15 @@ public function test_upon_activation()
     }
 
     #[\PHPUnit\Framework\Attributes\DataProvider('exceptsValues')]
-    public function test_maintenance_mode_respects_excepts_values(string $path, int $status)
+    public function test_maintenance_mode_respects_excepts_values(string $path, int $status): void
     {
         Features::fake(['system.down' => true]);
         Features::maintenanceMode()
             ->onEnabled('system.down')
             ->exceptPaths(['/test']);
 
-        Route::get('/', fn () => 'Foo Bar');
-        Route::get('/test', fn () => 'Foo Bar Foo');
+        Route::get('/', fn (): string => 'Foo Bar');
+        Route::get('/test', fn (): string => 'Foo Bar Foo');
 
         $this
             ->withoutExceptionHandling([\Symfony\Component\HttpKernel\Exception\HttpException::class])
@@ -103,7 +103,7 @@ public static function exceptsValues(): \Generator
         ];
     }
 
-    public function test_upon_deactivation()
+    public function test_upon_deactivation(): void
     {
         $called = false;
         Features::fake(['system.down' => true]);
diff --git a/tests/ManagerTest.php b/tests/ManagerTest.php
@@ -140,7 +140,7 @@ public function test_it_can_turn_off_features(): void
     }
 
     #[\PHPUnit\Framework\Attributes\DataProvider('services')]
-    public function test_it_can_flag_parts_of_the_package_to_be_turned_off($item): void
+    public function test_it_can_flag_parts_of_the_package_to_be_turned_off(string $item): void
     {
         $manager = new Manager($this->container, \Mockery::mock(Dispatcher::class));
 
diff --git a/tests/Middlewares/GuardFeatureTest.php b/tests/Middlewares/GuardFeatureTest.php
@@ -105,7 +105,7 @@ public function test_it_continues_the_chain_if_features_are_accessible(): void
 
         $this->assertTrue($middleware->handle(
             $expectedRequest,
-            function ($request) use ($expectedRequest) {
+            function ($request) use ($expectedRequest): true {
                 $this->assertSame($expectedRequest, $request);
 
                 return true;
diff --git a/tests/QueryBuilderMixinTest.php b/tests/QueryBuilderMixinTest.php
@@ -21,7 +21,7 @@ protected function getPackageProviders($app): array
     }
 
     #[\PHPUnit\Framework\Attributes\DataProvider('positiveSqlStatements')]
-    public function test_modifying_queries_when_the_feature_is_enabled(bool $flag, string $expectedSql)
+    public function test_modifying_queries_when_the_feature_is_enabled(bool $flag, string $expectedSql): void
     {
         // Laravel 11 for some reason changed how SQL is generated
         if (! InstalledVersions::satisfies(new VersionParser(), 'illuminate/contracts', '^11.0')) {
@@ -49,7 +49,7 @@ public static function positiveSqlStatements(): \Generator
     }
 
     #[\PHPUnit\Framework\Attributes\DataProvider('negativeSqlStatements')]
-    public function test_modifying_queries_when_the_feature_is_not_enabled(bool $flag, string $expectedSql)
+    public function test_modifying_queries_when_the_feature_is_not_enabled(bool $flag, string $expectedSql): void
     {
         // Laravel 11 for some reason changed how SQL is generated
         if (! InstalledVersions::satisfies(new VersionParser(), 'illuminate/contracts', '^11.0')) {
diff --git a/tests/Support/ActionDebugLogTest.php b/tests/Support/ActionDebugLogTest.php
@@ -7,15 +7,15 @@
 
 class ActionDebugLogTest extends TestCase
 {
-    public function test_it_stores_the_file_and_line_location()
+    public function test_it_stores_the_file_and_line_location(): void
     {
         $log = new ActionDebugLog('test.php', 10);
 
         $this->assertSame(10, $log->line);
         $this->assertSame('test.php', $log->file);
     }
 
-    public function test_it_stores_the_log_entries()
+    public function test_it_stores_the_log_entries(): void
     {
         $log = new ActionDebugLog('test.php', 10);
 
diff --git a/tests/Support/FeatureFakeTest.php b/tests/Support/FeatureFakeTest.php
diff --git a/tests/Support/FileLoaderTest.php b/tests/Support/FileLoaderTest.php
diff --git a/tests/Support/GatewayInspectorTest.php b/tests/Support/GatewayInspectorTest.php
diff --git a/tests/Support/MaintenanceScenarioTest.php b/tests/Support/MaintenanceScenarioTest.php
diff --git a/tests/fixtures/features.php b/tests/fixtures/features.php

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public function isDebuggable(): bool`
`36`	`36`	`return (bool) $this->debug;`
`37`	`37`	`}`
`38`	`38`
`39`		`- public function storeInspectionInformation(string $pipe, string $reason, ?bool $result = null)`
	`39`	`+ public function storeInspectionInformation(string $pipe, string $reason, ?bool $result = null): void`
`40`	`40`	`{`
`41`	`41`	`$this->debug->addDecision($pipe, $reason, $result);`
`42`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ class FeatureFlagsServiceProvider extends ServiceProvider`
`28`	`28`	`/**`
`29`	`29`	`* Bootstrap the application services.`
`30`	`30`	`*/`
`31`		`- public function boot()`
	`31`	`+ public function boot(): void`
`32`	`32`	`{`
`33`	`33`	`if ($this->app->runningInConsole()) {`
`34`	`34`	`$this->publishes([`
`@@ -96,7 +96,7 @@ public function register(): void`
`96`	`96`	`$this->app->singleton(FeaturesContract::class, Manager::class);`
`97`	`97`	`}`
`98`	`98`
`99`		`- $this->app->scoped(MaintenanceRepository::class, fn (Container $app) => new MaintenanceRepository($app->make(FeaturesContract::class), $app));`
	`99`	`+ $this->app->scoped(MaintenanceRepository::class, fn (Container $app): \YlsIdeas\FeatureFlags\Support\MaintenanceRepository => new MaintenanceRepository($app->make(FeaturesContract::class), $app));`
`100`	`100`
`101`	`101`	`$this->app->extend(MaintenanceModeManager::class, fn (MaintenanceModeManager $manager) => $manager->extend('features', fn (): MaintenanceMode => new MaintenanceDriver(`
`102`	`102`	`$this->app->make(MaintenanceRepository::class)`
`@@ -109,7 +109,7 @@ protected function schedulingMacros()`
`109`	`109`	`/** @noRector \Rector\Php74\Rector\Closure\ClosureToArrowFunctionRector */`
`110`	`110`	`Event::macro('skipWithoutFeature', fn (string $feature): Event =>`
`111`	`111`	`/** @var Event $this */`
`112`		`- $this->skip(fn () => ! Features::accessible($feature)));`
	`112`	`+ $this->skip(fn (): bool => ! Features::accessible($feature)));`
`113`	`113`	`}`
`114`	`114`
`115`	`115`	`if (! Event::hasMacro('skipWithFeature')) {`
`@@ -141,7 +141,7 @@ protected function aboutCommandInfo(): void`
`141`	`141`	`{`
`142`	`142`	`if (class_exists(AboutCommand::class)) {`
`143`	`143`	`AboutCommand::add('Feature Flags', [`
`144`		`- 'Pipeline' => fn () => implode(', ', config('features.pipeline')),`
	`144`	`+ 'Pipeline' => fn (): string => implode(', ', config('features.pipeline')),`
`145`	`145`	`]);`
`146`	`146`	`}`
`147`	`147`	`}`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ public function pipeline(): Pipeline`
`66`	`66`	`*/`
`67`	`67`	`public function accessible(string $feature): bool`
`68`	`68`	`{`
`69`		`- if ($this->expiredFeaturesHandler) {`
	`69`	`+ if ($this->expiredFeaturesHandler instanceof \YlsIdeas\FeatureFlags\Contracts\ExpiredFeaturesHandler) {`
`70`	`70`	`$this->expiredFeaturesHandler->isExpired($feature);`
`71`	`71`	`}`
`72`	`72`
`@@ -289,7 +289,7 @@ protected function pipes(): array`
`289`	`289`	`$pipes = $this->container->make(Repository::class)->get('features.pipeline');`
`290`	`290`
`291`	`291`	`return collect($pipes)`
`292`		`- ->map(fn (string $pipe) => $this->resolve($pipe))`
	`292`	`+ ->map(fn (string $pipe): \YlsIdeas\FeatureFlags\Support\GatewayInspector => $this->resolve($pipe))`
`293`	`293`	`->all();`
`294`	`294`	`}`
`295`	`295`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ public function accessible(string $feature): bool`
`50`	`50`	`return $featureValue;`
`51`	`51`	`}`
`52`	`52`
`53`		`- public function assertAccessed(string $feature, ?int $count = null, string $message = '')`
	`53`	`+ public function assertAccessed(string $feature, ?int $count = null, string $message = ''): void`
`54`	`54`	`{`
`55`	`55`	`if ($count === null) {`
`56`	`56`	`Assert::assertGreaterThan(0, $this->getCount($feature), $message);`
`@@ -59,12 +59,12 @@ public function assertAccessed(string $feature, ?int $count = null, string $mess`
`59`	`59`	`}`
`60`	`60`	`}`
`61`	`61`
`62`		`- public function assertNotAccessed(string $feature, string $message = '')`
	`62`	`+ public function assertNotAccessed(string $feature, string $message = ''): void`
`63`	`63`	`{`
`64`	`64`	`Assert::assertLessThan(1, $this->getCount($feature), $message);`
`65`	`65`	`}`
`66`	`66`
`67`		`- public function assertAccessedCount(string $feature, int $count = 0, string $message = '')`
	`67`	`+ public function assertAccessedCount(string $feature, int $count = 0, string $message = ''): void`
`68`	`68`	`{`
`69`	`69`	`$this->assertAccessed($feature, $count, $message);`
`70`	`70`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public function delete(string $feature): void`
`36`	`36`	`$this->repository->delete($this->generateKey($feature));`
`37`	`37`	`}`
`38`	`38`
`39`		`- public function generateKey($feature)`
	`39`	`+ public function generateKey(string $feature): string`
`40`	`40`	`{`
`41`	`41`	`return $this->namespace . ':' . $this->cacheable->generateKey($feature);`
`42`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,14 +44,14 @@ public function callDeactivation(): void`
`44`	`44`	`$this->container->call($this->uponDeactivation, ['features' => $this->features]);`
`45`	`45`	`}`
`46`	`46`
`47`		`- public function onEnabled($feature): MaintenanceScenario`
	`47`	`+ public function onEnabled(string $feature): MaintenanceScenario`
`48`	`48`	`{`
`49`	`49`	`return tap((new MaintenanceScenario())->whenEnabled($feature), function (MaintenanceScenario $scenario): void {`
`50`	`50`	`$this->scenarios[] = $scenario;`
`51`	`51`	`});`
`52`	`52`	`}`
`53`	`53`
`54`		`- public function onDisabled($feature): MaintenanceScenario`
	`54`	`+ public function onDisabled(string $feature): MaintenanceScenario`
`55`	`55`	`{`
`56`	`56`	`return tap((new MaintenanceScenario())->whenDisabled($feature), function (MaintenanceScenario $scenario): void {`
`57`	`57`	`$this->scenarios[] = $scenario;`
`@@ -75,15 +75,12 @@ public function parameters(): ?array`
`75`	`75`	`protected function findScenario(): ?MaintenanceScenario`
`76`	`76`	`{`
`77`	`77`	`return $this->foundScenario = collect($this->scenarios)`
`78`		`- ->first(function (MaintenanceScenario $scenario) {`
	`78`	`+ ->first(function (MaintenanceScenario $scenario): bool {`
`79`	`79`	`if ($scenario->onEnabled && $this->features->accessible($scenario->feature)) {`
`80`	`80`	`return true;`
`81`	`81`	`}`
`82`		`- if (! $scenario->onEnabled && ! $this->features->accessible($scenario->feature)) {`
`83`		`- return true;`
`84`		`- }`
`85`	`82`
`86`		`- return false;`
	`83`	`+ return ! $scenario->onEnabled && ! $this->features->accessible($scenario->feature);`
`87`	`84`	`});`
`88`	`85`	`}`
`89`	`86`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ protected function getPackageProviders($app): array`
`16`	`16`	`];`
`17`	`17`	`}`
`18`	`18`
`19`		`- public function test_throws_exception_creating_a_gateway_driver()`
	`19`	`+ public function test_throws_exception_creating_a_gateway_driver(): void`
`20`	`20`	`{`
`21`	`21`	`config()->set('features.pipeline', ['gate']);`
`22`	`22`	`config()->set('features.gateways', [`
`@@ -30,7 +30,7 @@ public function test_throws_exception_creating_a_gateway_driver()`
`30`	`30`	`$this->app->make(Manager::class)->pipeline();`
`31`	`31`	`}`
`32`	`32`
`33`		`- public function test_create_a_gateway_driver()`
	`33`	`+ public function test_create_a_gateway_driver(): void`
`34`	`34`	`{`
`35`	`35`	`config()->set('features.pipeline', ['gate']);`
`36`	`36`	`config()->set('features.gateways', [`