Merge pull request #2 from codinglabsau/steve/wip

Steve/wip

Author: stevethomas

config/feature-flags.php

@@ -1,5 +1,5 @@
 <?php
-// config for Codinglabs/FeatureFlags
+
 return [
 
     /*

resources/views/.gitkeep

@@ -12,10 +12,6 @@
 
 class FeatureFlags
 {
-    const STATE_ON = 'on';
-    const STATE_OFF = 'off';
-    const STATE_DYNAMIC = 'dynamic';
-
     private static ?Closure $defaultDynamicHandler = null;
     private static ?Closure $handleMissingFeatureClosure = null;
     public static array $dynamicHandlers = [];
@@ -75,26 +71,22 @@ public static function handleMissingFeatureWith(Closure $closure): void
 
     public static function isEnabled(string $feature): bool
     {
-        $state = self::getState($feature);
-
-        switch ($state) {
-            case FeatureState::on():
-                return true;
-            case FeatureState::off():
-                return false;
-            case FeatureState::dynamic():
-            {
-                if (array_key_exists($feature, self::$dynamicHandlers)) {
-                    return self::$dynamicHandlers[$feature]($feature, request()) === true;
-                } elseif (is_callable(self::$defaultDynamicHandler)) {
-                    return call_user_func(self::$defaultDynamicHandler, $feature, request()) === true;
+        return match (self::getState($feature)) {
+            FeatureState::on() => true,
+            FeatureState::off() => false,
+            FeatureState::dynamic() => call_user_func(
+                function () use ($feature) {
+                    if (array_key_exists($feature, self::$dynamicHandlers)) {
+                        return call_user_func(self::$dynamicHandlers[$feature], $feature, request()) === true;
+                    } elseif (is_callable(self::$defaultDynamicHandler)) {
+                        return call_user_func(self::$defaultDynamicHandler, $feature, request()) === true;
+                    }
+
+                    return false;
                 }
-
-                return false;
-            }
-        }
-
-        return false;
+            ),
+            default => false
+        };
     }
 
     public static function reset(): void

src/Commands/FeaturesCommand.php

@@ -11,11 +11,6 @@ class FeatureFlagsServiceProvider extends PackageServiceProvider
 {
     public function configurePackage(Package $package): void
     {
-        /*
-         * This class is a Package Service Provider
-         *
-         * More info: https://github.com/spatie/laravel-package-tools
-         */
         $package
             ->name('laravel-feature-flags')
             ->hasConfigFile()