Terminology update ($error -> $reason)

Author: jsor

README.md

@@ -83,7 +83,7 @@ $deferred = new React\Promise\Deferred();
 
 $deferred->then(callable $fulfilledHandler = null, callable $errorHandler = null, callable $progressHandler = null);
 $deferred->resolve(mixed $promiseOrValue = null);
-$deferred->reject(mixed $error = null);
+$deferred->reject(mixed $reason = null);
 $deferred->progress(mixed $update = null);
 ```
 
@@ -152,12 +152,12 @@ Resolves a Deferred. All consumers are notified by having their
 `$result`.
 
 ``` php
-$resolver->reject(mixed $error = null);
+$resolver->reject(mixed $reason = null);
 ```
 
 Rejects a Deferred, signalling that the Deferred's computation failed.
 All consumers are notified by having their `$errorHandler` (which they
-registered via `$promise->then()`) called with `$error`.
+registered via `$promise->then()`) called with `$reason`.
 
 ``` php
 $resolver->progress(mixed $update = null);
@@ -290,8 +290,8 @@ getAwesomeResultPromise()
         function ($result) {
             // Deferred resolved, do something with $result
         },
-        function ($error) {
-            // Deferred rejected, do something with $error
+        function ($reason) {
+            // Deferred rejected, do something with $reason
         },
         function ($update) {
             // Progress notification triggered, do something with $update

src/React/Promise/Deferred.php

@@ -83,9 +83,9 @@ public function resolve($result = null)
         return $this->promise();
     }
 
-    public function reject($error = null)
+    public function reject($reason = null)
     {
-        return $this->resolve(new RejectedPromise($error));
+        return $this->resolve(new RejectedPromise($reason));
     }
 
     public function progress($update = null)

src/React/Promise/DeferredResolver.php

@@ -16,9 +16,9 @@ public function resolve($result = null)
         return $this->deferred->resolve($result);
     }
 
-    public function reject($error = null)
+    public function reject($reason = null)
     {
-        return $this->deferred->reject($error);
+        return $this->deferred->reject($reason);
     }
 
     public function progress($update = null)

src/React/Promise/RejectedPromise.php

@@ -4,21 +4,21 @@
 
 class RejectedPromise implements PromiseInterface
 {
-    private $error;
+    private $reason;
 
-    public function __construct($error = null)
+    public function __construct($reason = null)
     {
-        $this->error = $error;
+        $this->reason = $reason;
     }
 
     public function then($fulfilledHandler = null, $errorHandler = null, $progressHandler = null)
     {
         try {
             if (!$errorHandler) {
-                return new RejectedPromise($this->error);
+                return new RejectedPromise($this->reason);
             }
 
-            return Util::promiseFor(call_user_func($errorHandler, $this->error));
+            return Util::promiseFor(call_user_func($errorHandler, $this->reason));
         } catch (\Exception $exception) {
             return new RejectedPromise($exception);
         }

src/React/Promise/ResolverInterface.php

@@ -5,6 +5,6 @@
 interface ResolverInterface
 {
     public function resolve($result = null);
-    public function reject($error = null);
+    public function reject($reason = null);
     public function progress($update = null);
 }