feat: switch to documentation accurate API

Author: mychidarko

src/Batch.php

@@ -27,14 +27,35 @@ class Batch implements Dispatchable
      */
     protected $queue = null;
 
+    /**
+     * Configured queue connection
+     */
+    protected string $connection = 'default';
+
+    /**
+     * Return configured connection
+     */
+    public function connection()
+    {
+        return $this->connection;
+    }
+
     /**
      * Load a job for running
      */
-    public function __construct($job, $config, $queue)
+    public function fromQueue($job, $config, $queue)
     {
         $this->job = $job;
-        $this->config = $config;
         $this->queue = $queue;
+
+        if (isset($config['data'])) {
+            $this->data = $config['data'];
+            unset($config['data']);
+        }
+
+        $this->config = $config;
+
+        return $this;
     }
 
     /**
@@ -125,11 +146,11 @@ public function release($delay = 0)
     /**
      * Pass data to the job
      */
-    public function with($data)
+    public static function with($data)
     {
-        $this->data = $data;
+        static::$data = $data;
 
-        return $this;
+        return new static;
     }
 
     /**

src/Queue/Dispatchable.php

@@ -15,7 +15,7 @@ public function connection();
     /**
      * Add data to the job
      */
-    public function with($data);
+    public static function with($data);
 
     /**
      * Return job stack if available

src/functions.php

@@ -19,30 +19,28 @@ function queue()
 /**
  * Dispatch a job, batch or a group of jobs
  *
- * @param array|mixed $dispatchable The job, batch or group of jobs to dispatch
+ * @param array|\Leaf\Queue\Dispatchable|string $dispatchable The job, batch or group of jobs to dispatch
  * @param array $data The data to pass to the job
  */
-function dispatch($dispatchable, $data = [])
+function dispatch($dispatchable)
 {
     if (is_array($dispatchable)) {
         foreach ($dispatchable as $item) {
-            dispatch($item, $data);
+            dispatch($item);
         }
 
         return;
     }
 
-    /** @var \Leaf\Queue\Dispatchable */
-    $jobOrBatch = new $dispatchable();
+    if (is_string($dispatchable)) {
+        $dispatchable = new $dispatchable();
+    }
+
     $queueModuleConfig = MvcConfig('queue') ?? [];
-    $jobConnection = $jobOrBatch->connection();
+    $jobConnection = $dispatchable->connection();
 
     $defaultConnection = $queueModuleConfig['connections'][$queueModuleConfig['default'] ?? 'database'];
 
-    if (!empty($data)) {
-        $jobOrBatch->with($data);
-    }
-
     // if (\Leaf\Config::getStatic('queue')) {
     //     return queue()->push([
     //         'class' => $jobOrBatch,
@@ -56,8 +54,8 @@ function dispatch($dispatchable, $data = [])
     queue()->connect($queueModuleConfig['connections'][$jobConnection] ?? $defaultConnection);
 
     return queue()->push([
-        'class' => $jobOrBatch::class,
-        'config' => json_encode($jobOrBatch->getConfig()),
+        'class' => $dispatchable::class,
+        'config' => json_encode($dispatchable->getConfig()),
         'status' => 'pending',
         'retry_count' => 0,
     ]);