Improve message box config

Author: SerafimArts

src/Internal/Poller/SaucerPoller.php

@@ -6,10 +6,8 @@
 
 use Boson\ApplicationId;
 use Boson\Component\Saucer\SaucerInterface;
-use Boson\Poller\CancellableTask;
 use Boson\Poller\PollerInterface;
 use Boson\Poller\Suspension;
-use Boson\Poller\TaskInterface;
 use Boson\Shared\IdValueGenerator\IdValueGeneratorInterface;
 use Boson\Shared\IdValueGenerator\PlatformDependentIntValueGenerator;
 use FFI\CData;
@@ -109,35 +107,35 @@ private function executeQueuedTask(): void
         }
     }
 
-    public function defer(callable $task): CancellableTask
+    public function defer(callable $task): int|string
     {
         $this->queueTasks[$id = $this->ids->nextId()] = $task(...);
 
-        return new CancellableTask($this, $id);
+        return $id;
     }
 
-    public function repeat(callable $task): CancellableTask
+    public function repeat(callable $task): int|string
     {
         $this->periodicTasks[$id = $this->ids->nextId()] = $task(...);
 
-        return new CancellableTask($this, $id);
+        return $id;
     }
 
-    public function delay(float $delay, callable $task): CancellableTask
+    public function delay(float $delay, callable $task): int|string
     {
         $stopsAfter = \microtime(true) + $delay;
 
-        return $this->repeat(function (TaskInterface $id) use ($stopsAfter, $task): void {
+        return $this->repeat(function (string|int $taskId) use ($stopsAfter, $task): void {
             if (\microtime(true) > $stopsAfter) {
-                $task($id);
+                $task($taskId);
 
-                $this->cancel($id);
+                $this->cancel($taskId);
             }
         });
     }
 
-    public function cancel(TaskInterface $task): void
+    public function cancel(int|string $taskId): void
     {
-        unset($this->periodicTasks[$task->id], $this->queueTasks[$task->id]);
+        unset($this->periodicTasks[$taskId], $this->queueTasks[$taskId]);
     }
 }

src/Poller/CancellableTask.php

@@ -5,7 +5,7 @@
 namespace Boson\Poller;
 
 /**
- * @template TTaskId of array-key = array-key
+ * @phpstan-type TaskIdType array-key
  */
 interface PollerInterface
 {
@@ -23,39 +23,43 @@ public function createSuspension(): SuspensionInterface;
     /**
      * Defer the execution of a callback.
      *
-     * @param callable(TaskInterface<TTaskId>):void $task the callback to defer
+     * @param callable(TaskIdType):void $task the callback to defer
      *
-     * @return TaskInterface<TTaskId>
+     * @return TaskIdType a unique identifier that can be used to cancel
+     *         the callback
      */
-    public function defer(callable $task): TaskInterface;
+    public function defer(callable $task): int|string;
 
     /**
      * Repeatedly execute a callback.
      *
-     * @param callable(TaskInterface<TTaskId>):void $task the callback to execute
+     * @param callable(TaskIdType):void $task the callback to execute
      *
-     * @return TaskInterface<TTaskId>
+     * @return TaskIdType a unique identifier that can be used to cancel
+     *         the callback
      */
-    public function repeat(callable $task): TaskInterface;
+    public function repeat(callable $task): int|string;
 
     /**
      * Delay the execution of a callback.
      *
      * @param float $delay the amount of time, in seconds, to delay the execution for
-     * @param callable(TaskInterface<TTaskId>):void $task the callback to delay
+     * @param callable(TaskIdType):void $task the callback to delay
      *
-     * @return TaskInterface<TTaskId>
+     * @return TaskIdType a unique identifier that can be used to
+     *         cancel the callback
      */
-    public function delay(float $delay, callable $task): TaskInterface;
+    public function delay(float $delay, callable $task): int|string;
 
     /**
      * Cancel a task.
      *
      * This will detach the event loop from all resources that are associated
      * to the callback. After this operation the callback is permanently
-     * invalid.
+     * invalid. Calling this function MUST NOT fail, even if passed an invalid
+     * identifier.
      *
-     * @param TaskInterface<TTaskId> $task
+     * @param TaskIdType $taskId the callback identifier
      */
-    public function cancel(TaskInterface $task): void;
+    public function cancel(int|string $taskId): void;
 }