job use caller

chevere · Jan 22, 2025 · b8faec1 · b8faec1
1 parent a9b5876
commit b8faec1
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/src/Interfaces/JobInterface.php b/src/Interfaces/JobInterface.php
@@ -56,7 +56,7 @@ public function isSync(): bool;
      */
     public function runIf(): VectorInterface;
 
-    public function caller(): string;
+    public function caller(): CallerInterface;
 
     public function shift(): int;
 }
diff --git a/src/Job.php b/src/Job.php
@@ -19,6 +19,7 @@
 use Chevere\DataStructure\Vector;
 use Chevere\Parameter\Interfaces\ParameterInterface;
 use Chevere\Parameter\Interfaces\ParametersInterface;
+use Chevere\Workflow\Interfaces\CallerInterface;
 use Chevere\Workflow\Interfaces\JobInterface;
 use Chevere\Workflow\Interfaces\ResponseReferenceInterface;
 use Chevere\Workflow\Interfaces\VariableInterface;
@@ -49,7 +50,7 @@ final class Job implements JobInterface
 
     private bool $isSync;
 
-    private string $caller;
+    private CallerInterface $caller;
 
     private int $shift;
 
@@ -84,7 +85,7 @@ public function shift(): int
         return $this->shift;
     }
 
-    public function caller(): string
+    public function caller(): CallerInterface
     {
         return $this->caller;
     }
@@ -170,8 +171,8 @@ private function setCaller(): void
             array_shift($debugBacktrace);
         }
         $file = $debugBacktrace[0]['file'] ?? 'unknown';
-        $line = $debugBacktrace[0]['line'] ?? '0';
-        $this->caller = "{$file}:{$line}";
+        $line = $debugBacktrace[0]['line'] ?? 0;
+        $this->caller = new Caller($file, (int) $line);
     }
 
     private function setArguments(mixed ...$argument): void

diff --git a/tests/FunctionsTest.php b/tests/FunctionsTest.php
@@ -35,7 +35,7 @@ public function testFunctionSync(): void
         $action = new TestActionNoParamsIntResponse();
         $job = sync($action);
         $fileLine = __FILE__ . ':' . (__LINE__ - 1);
-        $this->assertSame($fileLine, $job->caller());
+        $this->assertSame($fileLine, $job->caller()->__toString());
         $alt = (new Job($action))
             ->withShift(1)
             ->withIsSync(true);
@@ -47,7 +47,7 @@ public function testFunctionAsync(): void
         $action = new TestActionNoParamsIntResponse();
         $job = async($action);
         $fileLine = __FILE__ . ':' . (__LINE__ - 1);
-        $this->assertSame($fileLine, $job->caller());
+        $this->assertSame($fileLine, $job->caller()->__toString());
         $alt = (new Job($action))->withShift(1);
         $this->assertSame($alt->shift(), $job->shift());
     }

diff --git a/tests/JobTest.php b/tests/JobTest.php
@@ -94,7 +94,7 @@ public function testRawArguments(): void
         ];
         $job = new Job($action, ...$success);
         $fileLine = __FILE__ . ':' . (__LINE__ - 1);
-        $this->assertSame($fileLine, $job->caller());
+        $this->assertSame($fileLine, $job->caller()->__toString());
         $this->assertSame($action, $job->action());
         $this->assertSame($success, $job->arguments());
         $success = [