fix: tokenTime calcuration

When check() returns false, tokenTime is 0.

Author: kenjis

system/Throttle/Throttler.php

@@ -107,7 +107,7 @@ public function check(string $key, int $capacity, int $seconds, int $cost = 1):
             $this->cache->save($tokenName, $tokens, $seconds);
             $this->cache->save($tokenName . 'Time', $this->time(), $seconds);
 
-            $this->tokenTime = max(1, (int) $refresh);
+            $this->tokenTime = 0;
 
             return true;
         }
@@ -130,7 +130,7 @@ public function check(string $key, int $capacity, int $seconds, int $cost = 1):
             $this->cache->save($tokenName, $tokens, $seconds);
             $this->cache->save($tokenName . 'Time', $this->time(), $seconds);
 
-            $this->tokenTime = max(1, (int) ($refresh - $elapsed));
+            $this->tokenTime = 0;
 
             return true;
         }

tests/system/Throttle/ThrottleTest.php

@@ -36,11 +36,11 @@ public function testTokenTime()
         // set $rate
         $rate = 1;    // allow 1 request per minute
 
-        // first check just creates a bucket, so tokenTime should be 0
+        // When the first check you have a token, so tokenTime should be 0
         $throttler->check('127.0.0.1', $rate, MINUTE);
         $this->assertSame(0, $throttler->getTokenTime());
 
-        // additional check affects tokenTime, so tokenTime should be 1 or greater
+        // When additional check you don't have one token, so tokenTime should be 1 or greater
         $throttler->check('127.0.0.1', $rate, MINUTE);
         $this->assertGreaterThanOrEqual(1, $throttler->getTokenTime());
     }
@@ -64,15 +64,15 @@ public function testTokenTimeCalculation()
         // token should be 2
         $this->assertTrue($throttler->check('test', $capacity, $seconds));
         // token should be 2 - 1 = 1
-        $this->assertSame(100, $throttler->getTokenTime(), 'Wrong token time');
+        $this->assertSame(0, $throttler->getTokenTime(), 'Wrong token time');
 
         // do nothing for 3 seconds
         $throttler = $throttler->setTestTime($time + 3);
 
         // token should be 1 + 3 * 0.01 = 1.03
         $this->assertTrue($throttler->check('test', $capacity, $seconds));
         // token should be 1.03 - 1 = 0.03
-        $this->assertSame(97, $throttler->getTokenTime(), 'Wrong token time');
+        $this->assertSame(0, $throttler->getTokenTime(), 'Wrong token time');
 
         $this->assertFalse($throttler->check('test', $capacity, $seconds));
         // token should still be 0.03 because check failed