KRF-244 #fix Fixed spread() method in Promise API

khelle · khelle · commit 7239174df4b3 · 2016-07-25T20:50:21.000+02:00
diff --git a/Promise.php b/Promise.php
@@ -135,13 +135,13 @@ public function spread(callable $onFulfilled = null, callable $onRejected = null
     {
         return $this->then(
             function($values) use($onFulfilled) {
-                call_user_func_array($onFulfilled, (array) $values);
+                return call_user_func_array($onFulfilled, (array) $values);
             },
             function($rejections) use($onRejected) {
-                call_user_func_array($onRejected, (array) $rejections);
+                return call_user_func_array($onRejected, (array) $rejections);
             },
             function($reasons) use($onCancel) {
-                call_user_func_array($onCancel, (array) $reasons);
+                return call_user_func_array($onCancel, (array) $reasons);
             }
         );
     }
diff --git a/PromiseCancelled.php b/PromiseCancelled.php
@@ -100,14 +100,10 @@ public function done(callable $onFulfilled = null, callable $onRejected = null,
     public function spread(callable $onFulfilled = null, callable $onRejected = null, callable $onCancel = null)
     {
         return $this->then(
-            function($values) use($onFulfilled) {
-                call_user_func_array($onFulfilled, (array) $values);
-            },
-            function($rejections) use($onRejected) {
-                call_user_func_array($onRejected, (array) $rejections);
-            },
+            null,
+            null,
             function($reasons) use($onCancel) {
-                call_user_func_array($onCancel, (array) $reasons);
+                return call_user_func_array($onCancel, (array) $reasons);
             }
         );
     }
diff --git a/PromiseFulfilled.php b/PromiseFulfilled.php
@@ -89,13 +89,7 @@ public function spread(callable $onFulfilled = null, callable $onRejected = null
     {
         return $this->then(
             function($values) use($onFulfilled) {
-                call_user_func_array($onFulfilled, (array) $values);
-            },
-            function($rejections) use($onRejected) {
-                call_user_func_array($onRejected, (array) $rejections);
-            },
-            function($reasons) use($onCancel) {
-                call_user_func_array($onCancel, (array) $reasons);
+                return call_user_func_array($onFulfilled, (array) $values);
             }
         );
     }
diff --git a/PromiseRejected.php b/PromiseRejected.php
@@ -95,14 +95,9 @@ public function done(callable $onFulfilled = null, callable $onRejected = null,
     public function spread(callable $onFulfilled = null, callable $onRejected = null, callable $onCancel = null)
     {
         return $this->then(
-            function($values) use($onFulfilled) {
-                call_user_func_array($onFulfilled, (array) $values);
-            },
+            null,
             function($rejections) use($onRejected) {
-                call_user_func_array($onRejected, (array) $rejections);
-            },
-            function($reasons) use($onCancel) {
-                call_user_func_array($onCancel, (array) $reasons);
+                return call_user_func_array($onRejected, (array) $rejections);
             }
         );
     }

Original file line number	Diff line number	Diff line change
`@@ -135,13 +135,13 @@ public function spread(callable $onFulfilled = null, callable $onRejected = null`
`135`	`135`	`{`
`136`	`136`	`return $this->then(`
`137`	`137`	`function($values) use($onFulfilled) {`
`138`		`- call_user_func_array($onFulfilled, (array) $values);`
	`138`	`+ return call_user_func_array($onFulfilled, (array) $values);`
`139`	`139`	`},`
`140`	`140`	`function($rejections) use($onRejected) {`
`141`		`- call_user_func_array($onRejected, (array) $rejections);`
	`141`	`+ return call_user_func_array($onRejected, (array) $rejections);`
`142`	`142`	`},`
`143`	`143`	`function($reasons) use($onCancel) {`
`144`		`- call_user_func_array($onCancel, (array) $reasons);`
	`144`	`+ return call_user_func_array($onCancel, (array) $reasons);`
`145`	`145`	`}`
`146`	`146`	`);`
`147`	`147`	`}`
Original file line number	Diff line number	Diff line change
`@@ -100,14 +100,10 @@ public function done(callable $onFulfilled = null, callable $onRejected = null,`
`100`	`100`	`public function spread(callable $onFulfilled = null, callable $onRejected = null, callable $onCancel = null)`
`101`	`101`	`{`
`102`	`102`	`return $this->then(`
`103`		`- function($values) use($onFulfilled) {`
`104`		`- call_user_func_array($onFulfilled, (array) $values);`
`105`		`- },`
`106`		`- function($rejections) use($onRejected) {`
`107`		`- call_user_func_array($onRejected, (array) $rejections);`
`108`		`- },`
	`103`	`+ null,`
	`104`	`+ null,`
`109`	`105`	`function($reasons) use($onCancel) {`
`110`		`- call_user_func_array($onCancel, (array) $reasons);`
	`106`	`+ return call_user_func_array($onCancel, (array) $reasons);`
`111`	`107`	`}`
`112`	`108`	`);`
`113`	`109`	`}`
Original file line number	Diff line number	Diff line change
`@@ -89,13 +89,7 @@ public function spread(callable $onFulfilled = null, callable $onRejected = null`
`89`	`89`	`{`
`90`	`90`	`return $this->then(`
`91`	`91`	`function($values) use($onFulfilled) {`
`92`		`- call_user_func_array($onFulfilled, (array) $values);`
`93`		`- },`
`94`		`- function($rejections) use($onRejected) {`
`95`		`- call_user_func_array($onRejected, (array) $rejections);`
`96`		`- },`
`97`		`- function($reasons) use($onCancel) {`
`98`		`- call_user_func_array($onCancel, (array) $reasons);`
	`92`	`+ return call_user_func_array($onFulfilled, (array) $values);`
`99`	`93`	`}`
`100`	`94`	`);`
`101`	`95`	`}`
Original file line number	Diff line number	Diff line change
`@@ -95,14 +95,9 @@ public function done(callable $onFulfilled = null, callable $onRejected = null,`
`95`	`95`	`public function spread(callable $onFulfilled = null, callable $onRejected = null, callable $onCancel = null)`
`96`	`96`	`{`
`97`	`97`	`return $this->then(`
`98`		`- function($values) use($onFulfilled) {`
`99`		`- call_user_func_array($onFulfilled, (array) $values);`
`100`		`- },`
	`98`	`+ null,`
`101`	`99`	`function($rejections) use($onRejected) {`
`102`		`- call_user_func_array($onRejected, (array) $rejections);`
`103`		`- },`
`104`		`- function($reasons) use($onCancel) {`
`105`		`- call_user_func_array($onCancel, (array) $reasons);`
	`100`	`+ return call_user_func_array($onRejected, (array) $rejections);`
`106`	`101`	`}`
`107`	`102`	`);`
`108`	`103`	`}`