File tree Expand file tree Collapse file tree 3 files changed +5
-5
lines changed
test/Rx/Functional/Promise Expand file tree Collapse file tree 3 files changed +5
-5
lines changed Original file line number Diff line number Diff line change 2121 ],
2222 "require" : {
2323 "php" : " >=7.0.0" ,
24- "react/promise" : " ~2.2"
24+ "react/promise" : " ^3 || ~2.2"
2525 },
2626 "require-dev" : {
2727 "satooshi/php-coveralls" : " ~1.0" ,
Original file line number Diff line number Diff line change 22
33namespace Rx \React ;
44
5- use React \Promise \CancellablePromiseInterface ;
65use React \Promise \Promise as ReactPromise ;
76use React \Promise \PromiseInterface ;
87use Rx \Disposable \CallbackDisposable ;
1110use Rx \Observable \AnonymousObservable ;
1211use Rx \Subject \AsyncSubject ;
1312use React \Promise \Deferred ;
13+ use Throwable ;
1414
1515final class Promise
1616{
@@ -32,7 +32,7 @@ public static function resolved($value): ReactPromise
3232 public static function rejected ($ exception ): ReactPromise
3333 {
3434 $ d = new Deferred ();
35- $ d ->reject ($ exception );
35+ $ d ->reject ($ exception instanceof Throwable ? $ exception : new RejectedPromiseException ( $ exception ) );
3636 return $ d ->promise ();
3737 }
3838
@@ -94,7 +94,7 @@ function ($error) use ($subject) {
9494 $ disp = $ subject ->subscribe ($ observer );
9595 return new CallbackDisposable (function () use ($ p , $ disp ) {
9696 $ disp ->dispose ();
97- if ($ p instanceof CancellablePromiseInterface ) {
97+ if (\method_exists ( $ p , ' cancel ' ) ) {
9898 $ p ->cancel ();
9999 }
100100 });
Original file line number Diff line number Diff line change @@ -40,7 +40,7 @@ function () {
4040 */
4141 public function from_promise_failure ()
4242 {
43- $ p = \React \Promise \reject ('error ' );
43+ $ p = \React \Promise \reject (new RejectedPromiseException ( 'error ' ) );
4444
4545 $ source = Observable::fromPromise ($ p );
4646
You can’t perform that action at this time.
0 commit comments