Merge pull request #138 from WyriHaximus-secret-labs/php-7.x

Enforce Throwable rejection reason and require PHP 7+ as a consequence

Author: jsor

.travis.yml

@@ -1,21 +1,17 @@
 language: php
 
 php:
-  - 5.4
-  - 5.5
-  - 5.6
   - 7.0
   - 7.1
   - 7.2
+  - 7.3
   - nightly # ignore errors, see below
-  - hhvm # ignore errors, see below
 
 # lock distro so new future defaults will not break the build
 dist: trusty
 
 matrix:
   allow_failures:
-    - php: hhvm
     - php: nightly
 
 install:

README.md

@@ -11,6 +11,10 @@ A lightweight implementation of
 > For the code of the current stable 2.x release, checkout the 
 > [2.x branch](https://github.com/reactphp/promise/tree/2.x).
 
+> The upcoming 3.0 release will be the way forward for this package. 
+> However we will still actively support 2.0 and 1.0 for those not yet 
+> on PHP 7+.
+
 Table of Contents
 -----------------
 

composer.json

@@ -6,10 +6,10 @@
         {"name": "Jan Sorgalla", "email": "jsorgalla@gmail.com"}
     ],
     "require": {
-        "php": ">=5.4.0"
+        "php": ">=7.0.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "~4.8.35 || ~5.7 || ~6.4"
+        "phpunit/phpunit": "~6.4"
     },
     "autoload": {
         "psr-4": {

src/Exception/CompositeException.php

@@ -11,20 +11,20 @@
  */
 class CompositeException extends \Exception
 {
-    private $exceptions;
+    private $throwables;
 
-    public function __construct(array $exceptions, $message = '', $code = 0, $previous = null)
+    public function __construct(array $throwables, $message = '', $code = 0, $previous = null)
     {
         parent::__construct($message, $code, $previous);
 
-        $this->exceptions = $exceptions;
+        $this->throwables = $throwables;
     }
 
     /**
-     * @return \Throwable[]|\Exception[]
+     * @return \Throwable[]
      */
-    public function getExceptions()
+    public function getThrowables()
     {
-        return $this->exceptions;
+        return $this->throwables;
     }
 }

src/FulfilledPromise.php

@@ -27,8 +27,6 @@ public function then(callable $onFulfilled = null, callable $onRejected = null)
                     $resolve($onFulfilled($this->value));
                 } catch (\Throwable $exception) {
                     $reject($exception);
-                } catch (\Exception $exception) {
-                    $reject($exception);
                 }
             });
         });
@@ -45,8 +43,6 @@ public function done(callable $onFulfilled = null, callable $onRejected = null)
                 $result = $onFulfilled($this->value);
             } catch (\Throwable $exception) {
                 return fatalError($exception);
-            } catch (\Exception $exception) {
-                return fatalError($exception);
             }
 
             if ($result instanceof PromiseInterface) {

src/Internal/CancellationQueue.php

@@ -43,7 +43,6 @@ private function drain()
             try {
                 $cancellable->cancel();
             } catch (\Throwable $exception) {
-            } catch (\Exception $exception) {
             }
 
             unset($this->queue[$i]);

src/Internal/Queue.php

@@ -26,7 +26,6 @@ private function drain()
             try {
                 $task();
             } catch (\Throwable $exception) {
-            } catch (\Exception $exception) {
             }
 
             unset($this->queue[$i]);

src/Promise.php

@@ -205,8 +205,6 @@ function ($reason) {
             }
         } catch (\Throwable $e) {
             $this->reject($e);
-        } catch (\Exception $e) {
-            $this->reject($e);
         }
     }
 }

src/RejectedPromise.php

@@ -6,18 +6,8 @@ final class RejectedPromise implements PromiseInterface
 {
     private $reason;
 
-    public function __construct($reason)
+    public function __construct(\Throwable $reason)
     {
-        if (!$reason instanceof \Throwable && !$reason instanceof \Exception) {
-            throw new \InvalidArgumentException(
-                sprintf(
-                    'A Promise must be rejected with a \Throwable or \Exception instance, got "%s" instead.',
-                    is_object($reason) ? get_class($reason) : gettype($reason)
-                )
-
-            );
-        }
-
         $this->reason = $reason;
     }
 
@@ -33,8 +23,6 @@ public function then(callable $onFulfilled = null, callable $onRejected = null)
                     $resolve($onRejected($this->reason));
                 } catch (\Throwable $exception) {
                     $reject($exception);
-                } catch (\Exception $exception) {
-                    $reject($exception);
                 }
             });
         });
@@ -51,8 +39,6 @@ public function done(callable $onFulfilled = null, callable $onRejected = null)
                 $result = $onRejected($this->reason);
             } catch (\Throwable $exception) {
                 return fatalError($exception);
-            } catch (\Exception $exception) {
-                return fatalError($exception);
             }
 
             if ($result instanceof self) {

src/functions.php

@@ -53,10 +53,10 @@ function resolve($promiseOrValue = null)
  * throwing an exception. For example, it allows you to propagate a rejection with
  * the value of another promise.
  *
- * @param mixed $promiseOrValue
+ * @param \Throwable $promiseOrValue
  * @return PromiseInterface
  */
-function reject($reason)
+function reject(\Throwable $reason)
 {
     return new RejectedPromise($reason);
 }
@@ -318,9 +318,6 @@ function fatalError($error)
     } catch (\Throwable $e) {
         \set_error_handler(null);
         \trigger_error($error, E_USER_ERROR);
-    } catch (\Exception $e) {
-        \set_error_handler(null);
-        \trigger_error($error, E_USER_ERROR);
     }
 }