Switch processor argument order

shadowhand · shadowhand · commit 965b5d78081c · 2018-06-04T08:37:55.000-05:00
Allows variadic type checking.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,7 @@
 
 * Now requires PHP 7.1 or newer.
 * Pipeline requires processor as first argument.
+* Processor requires payload as first argument.
 
 ## 0.3.0 - 2016-10-13
 
diff --git a/spec/FingersCrossedProcessorSpec.php b/spec/FingersCrossedProcessorSpec.php
@@ -15,8 +15,9 @@ function it_is_initializable()
 
     function it_should_process_stages()
     {
-        $this->process([
+        $this->process(
+            2,
             function ($payload) { return $payload * 2; }
-        ], 2)->shouldBe(4);
+        )->shouldBe(4);
     }
 }
diff --git a/spec/InterruptibleProcessorSpec.php b/spec/InterruptibleProcessorSpec.php
@@ -21,14 +21,16 @@ function let()
 
     function it_should_interrupt()
     {
-        $this->process([
+        $this->process(
+            5,
             function ($payload) { return $payload + 2; },
             function ($payload) { return $payload * 10; },
-            function ($payload) { return $payload * 10; },
-        ], 5)->shouldBe(70);
+            function ($payload) { return $payload * 10; }
+        )->shouldBe(70);
 
-        $this->process([
-            function ($payload) { return $payload + 2; },
-        ], 5)->shouldBe(7);
+        $this->process(
+            5,
+            function ($payload) { return $payload + 2; }
+        )->shouldBe(7);
     }
 }
diff --git a/src/FingersCrossedProcessor.php b/src/FingersCrossedProcessor.php
@@ -5,10 +5,10 @@
 
 class FingersCrossedProcessor implements ProcessorInterface
 {
-    public function process(array $stages, $payload)
+    public function process($payload, callable ...$stages)
     {
         foreach ($stages as $stage) {
-            $payload = call_user_func($stage, $payload);
+            $payload = $stage($payload);
         }
 
         return $payload;
diff --git a/src/InterruptibleProcessor.php b/src/InterruptibleProcessor.php
@@ -15,12 +15,14 @@ public function __construct(callable $check)
         $this->check = $check;
     }
 
-    public function process(array $stages, $payload)
+    public function process($payload, callable ...$stages)
     {
+        $check = $this->check;
+
         foreach ($stages as $stage) {
-            $payload = call_user_func($stage, $payload);
+            $payload = $stage($payload);
 
-            if (true !== call_user_func($this->check, $payload)) {
+            if (true !== $check($payload)) {
                 return $payload;
             }
         }
diff --git a/src/Pipeline.php b/src/Pipeline.php
@@ -31,7 +31,7 @@ public function pipe(callable $stage): PipelineInterface
 
     public function process($payload)
     {
-        return $this->processor->process($this->stages, $payload);
+        return $this->processor->process($payload, ...$this->stages);
     }
 
     public function __invoke($payload)
diff --git a/src/ProcessorInterface.php b/src/ProcessorInterface.php
@@ -6,10 +6,11 @@
 interface ProcessorInterface
 {
     /**
-     * @param array $stages
+     * Process the payload using multiple stages.
+     *
      * @param mixed $payload
      *
      * @return mixed
      */
-    public function process(array $stages, $payload);
+    public function process($payload, callable ...$stages);
 }

Original file line number	Diff line number	Diff line change
`@@ -15,8 +15,9 @@ function it_is_initializable()`
`15`	`15`
`16`	`16`	`function it_should_process_stages()`
`17`	`17`	`{`
`18`		`- $this->process([`
	`18`	`+ $this->process(`
	`19`	`+ 2,`
`19`	`20`	`function ($payload) { return $payload * 2; }`
`20`		`- ], 2)->shouldBe(4);`
	`21`	`+ )->shouldBe(4);`
`21`	`22`	`}`
`22`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,10 +5,10 @@`
`5`	`5`
`6`	`6`	`class FingersCrossedProcessor implements ProcessorInterface`
`7`	`7`	`{`
`8`		`- public function process(array $stages, $payload)`
	`8`	`+ public function process($payload, callable ...$stages)`
`9`	`9`	`{`
`10`	`10`	`foreach ($stages as $stage) {`
`11`		`- $payload = call_user_func($stage, $payload);`
	`11`	`+ $payload = $stage($payload);`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`return $payload;`
Original file line number	Diff line number	Diff line change
`@@ -15,12 +15,14 @@ public function __construct(callable $check)`
`15`	`15`	`$this->check = $check;`
`16`	`16`	`}`
`17`	`17`
`18`		`- public function process(array $stages, $payload)`
	`18`	`+ public function process($payload, callable ...$stages)`
`19`	`19`	`{`
	`20`	`+ $check = $this->check;`
	`21`	`+`
`20`	`22`	`foreach ($stages as $stage) {`
`21`		`- $payload = call_user_func($stage, $payload);`
	`23`	`+ $payload = $stage($payload);`
`22`	`24`
`23`		`- if (true !== call_user_func($this->check, $payload)) {`
	`25`	`+ if (true !== $check($payload)) {`
`24`	`26`	`return $payload;`
`25`	`27`	`}`
`26`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ public function pipe(callable $stage): PipelineInterface`
`31`	`31`
`32`	`32`	`public function process($payload)`
`33`	`33`	`{`
`34`		`- return $this->processor->process($this->stages, $payload);`
	`34`	`+ return $this->processor->process($payload, ...$this->stages);`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`public function __invoke($payload)`
Original file line number	Diff line number	Diff line change
`@@ -6,10 +6,11 @@`
`6`	`6`	`interface ProcessorInterface`
`7`	`7`	`{`
`8`	`8`	`/**`
`9`		`- * @param array $stages`
	`9`	`+ * Process the payload using multiple stages.`
	`10`	`+ *`
`10`	`11`	`* @param mixed $payload`
`11`	`12`	`*`
`12`	`13`	`* @return mixed`
`13`	`14`	`*/`
`14`		`- public function process(array $stages, $payload);`
	`15`	`+ public function process($payload, callable ...$stages);`
`15`	`16`	`}`