Invalidate leaky bucket settings with tokenlimit == threshold (caus…

…es division by 0)
MyOnlineStore · Sep 5, 2016 · 5acc059 · 5acc059
1 parent d045a36
commit 5acc059
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/src/Throttle/Settings/LeakyBucketSettings.php b/src/Throttle/Settings/LeakyBucketSettings.php
@@ -85,7 +85,11 @@ public function merge(ThrottleSettingsInterface $settings)
      */
     public function isValid()
     {
-        return null !== $this->tokenLimit && null !== $this->timeLimit && 0 !== $this->timeLimit;
+        return
+            null !== $this->tokenLimit &&
+            null !== $this->timeLimit &&
+            0 !== $this->timeLimit &&
+            $this->tokenLimit !== $this->threshold;
     }
 
     /**

diff --git a/tests/Throttle/Settings/LeakyBucketSettingsTest.php b/tests/Throttle/Settings/LeakyBucketSettingsTest.php
@@ -39,9 +39,9 @@ public function testInvalidMerge()
     /**
      * @dataProvider inputProvider
      */
-    public function testIsValid($tokenLimit, $timeLimit, $result)
+    public function testIsValid($tokenLimit, $timeLimit, $threshold, $result)
     {
-        self::assertEquals($result, (new LeakyBucketSettings($tokenLimit, $timeLimit))->isValid());
+        self::assertEquals($result, (new LeakyBucketSettings($tokenLimit, $timeLimit, $threshold))->isValid());
     }
 
     /**
@@ -50,11 +50,12 @@ public function testIsValid($tokenLimit, $timeLimit, $result)
     public function inputProvider()
     {
         return [
-            [null, null, false],
-            [null, 600, false],
-            [3, null, false],
-            [3, 0, false],
-            [3, 600, true],
+            [null, null, null, false],
+            [null, 600, null, false],
+            [3, null, null, false],
+            [3, 0, null, false],
+            [3, 600, 3, false],
+            [30, 600, 15, true],
         ];
     }
 }