Fixed timer implementation

This commit is contained in:
Chris 2017-01-22 23:22:13 +01:00
parent 0e5a25567c
commit b6727bed80
3 changed files with 31 additions and 3 deletions

19
examples/errors.php Normal file
View File

@ -0,0 +1,19 @@
<?php
require_once __DIR__."/../vendor/autoload.php";
use NoccyLabs\Shell\Shell;
use NoccyLabs\Shell\Context;
class CatchAllContext extends Context
{
public function execute($cmd, ...$arg)
{
throw new \Exception("Uh-oh! Error!");
}
}
$myShell = new Shell();
$myShell->setPrompt("test>");
$myShell->pushContext(new CatchAllContext());
$myShell->run();

View File

@ -30,9 +30,15 @@ class MyShell extends Shell
$this->pushContext($context); $this->pushContext($context);
$this->updatePrompt(); $this->updatePrompt();
$this->addTimer(5000, function () { $t1 = $this->addTimer(5000, function () {
echo "5 seconds\n"; echo "5 seconds\n";
}); });
$app = $this;
$t2 = $this->addTimer(15000, function () use ($t1, $app) {
echo "Removing timers...\n";
$app->removeTimer($t1);
});
} }
protected function updatePrompt() protected function updatePrompt()

View File

@ -137,6 +137,7 @@ class Shell
private $userdata; private $userdata;
public function __construct($interval, callable $handler, array $userdata) { public function __construct($interval, callable $handler, array $userdata) {
$this->interval = $interval / 1000; $this->interval = $interval / 1000;
$this->next = microtime(true) + $this->interval;
$this->handler = $handler; $this->handler = $handler;
$this->userdata = $userdata; $this->userdata = $userdata;
} }
@ -157,9 +158,11 @@ class Shell
* *
* @param Timer $timer * @param Timer $timer
*/ */
public function removeTimer(Timer $timer) public function removeTimer($timer)
{ {
$this->timers = array_filter($this->timers, function ($v) use ($timer) {
return ($v !== $timer);
});
} }
public function setPrompt($text) public function setPrompt($text)