Fix isFeatureEnabled returns false when multiple strategies are configured (#33)

Author: DanTheDJ

src/Unleash.php

@@ -74,11 +74,15 @@ public function isFeatureEnabled(string $name, ...$args): bool
         $strategies = Arr::get($feature, 'strategies', []);
         $allStrategies = $this->config->get('unleash.strategies', []);
 
+        if (count($strategies) === 0) {
+            return $isEnabled;
+        }
+
         foreach ($strategies as $strategyData) {
             $className = $strategyData['name'];
 
             if (!array_key_exists($className, $allStrategies)) {
-                return false;
+                continue;
             }
 
             if (is_callable($allStrategies[$className])) {
@@ -93,12 +97,12 @@ public function isFeatureEnabled(string $name, ...$args): bool
 
             $params = Arr::get($strategyData, 'parameters', []);
 
-            if (!$strategy->isEnabled($params, $this->request, ...$args)) {
-                return false;
+            if ($strategy->isEnabled($params, $this->request, ...$args)) {
+                return true;
             }
         }
 
-        return $isEnabled;
+        return false;
     }
 
     public function isFeatureDisabled(string $name, ...$args): bool

tests/Stubs/ImplementedStrategyThatIsDisabled.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace MikeFrancis\LaravelUnleash\Tests\Stubs;
+
+use Illuminate\Http\Request;
+use MikeFrancis\LaravelUnleash\Strategies\Contracts\Strategy;
+
+class ImplementedStrategyThatIsDisabled implements Strategy
+{
+    public function isEnabled(array $params, Request $request): bool
+    {
+        return false;
+    }
+}

tests/UnleashTest.php

@@ -10,6 +10,7 @@
 use Illuminate\Contracts\Config\Repository as Config;
 use Illuminate\Http\Request;
 use MikeFrancis\LaravelUnleash\Tests\Stubs\ImplementedStrategy;
+use MikeFrancis\LaravelUnleash\Tests\Stubs\ImplementedStrategyThatIsDisabled;
 use MikeFrancis\LaravelUnleash\Tests\Stubs\NonImplementedStrategy;
 use MikeFrancis\LaravelUnleash\Unleash;
 use PHPUnit\Framework\TestCase;
@@ -565,6 +566,69 @@ public function testIsFeatureEnabledWithValidStrategy()
         $this->assertTrue($unleash->isFeatureEnabled($featureName));
     }
 
+    public function testIsFeatureEnabledWithMultipleStrategies()
+    {
+        $featureName = 'someFeature';
+
+        $this->mockHandler->append(
+            new Response(
+                200,
+                [],
+                json_encode(
+                    [
+                        'features' => [
+                            [
+                                'name' => $featureName,
+                                'enabled' => true,
+                                'strategies' => [
+                                    [
+                                        'name' => 'testStrategyThatIsDisabled',
+                                    ],
+                                    [
+                                        'name' => 'testStrategy',
+                                    ]
+                                ],
+                            ],
+                        ],
+                    ]
+                )
+            )
+        );
+
+        $cache = $this->createMock(Cache::class);
+
+        $config = $this->createMock(Config::class);
+        $config->expects($this->at(0))
+            ->method('get')
+            ->with('unleash.isEnabled')
+            ->willReturn(true);
+        $config->expects($this->at(1))
+            ->method('get')
+            ->with('unleash.cache.isEnabled')
+            ->willReturn(false);
+        $config->expects($this->at(2))
+            ->method('get')
+            ->with('unleash.featuresEndpoint')
+            ->willReturn('/api/client/features');
+        $config->expects($this->at(3))
+            ->method('get')
+            ->with('unleash.strategies')
+            ->willReturn(
+                [
+                    'testStrategy' => ImplementedStrategy::class,
+                ],
+                [
+                    'testStrategyThatIsDisabled' => ImplementedStrategyThatIsDisabled::class,
+                ]
+            );
+
+        $request = $this->createMock(Request::class);
+
+        $unleash = new Unleash($this->client, $cache, $config, $request);
+
+        $this->assertTrue($unleash->isFeatureEnabled($featureName));
+    }
+
     public function testIsFeatureDisabledWithInvalidStrategy()
     {
         $featureName = 'someFeature';