Merge branch 'promisor-interface'

* promisor-interface:
  Add PromisorInterface for promise-providing objects

CHANGELOG.md

@@ -1,6 +1,9 @@
 CHANGELOG
 =========
 
+* 1.0.3 (2012-11-17)
+
+  * Add `PromisorInterface` for objects that have a `promise()` method.
 
 * 1.0.2 (2012-11-14)
 

README.md

@@ -26,6 +26,7 @@ Table of Contents
      * [When::reduce()](#whenreduce)
      * [When::resolve()](#whenresolve)
      * [When::reject()](#whenreject)
+   * [Promisor](#promisor)
 4. [Examples](#examples)
    * [How to use Deferred](#how-to-use-deferred)
    * [How Promise forwarding works](#how-promise-forwarding-works)
@@ -275,6 +276,12 @@ This can be useful in situations where you need to reject a Promise without
 throwing an exception. For example, it allows you to propagate a rejection with
 the value of another Promise.
 
+### Promisor
+
+The `React\Promise\PromisorInterface` provides a common interface for objects
+that provide a promise. `React\Promise\Deferred` implements it, but since it
+is part of the public API anyone can implement it.
+
 Examples
 --------
 

src/React/Promise/Deferred.php

@@ -2,7 +2,7 @@
 
 namespace React\Promise;
 
-class Deferred implements PromiseInterface, ResolverInterface
+class Deferred implements PromiseInterface, ResolverInterface, PromisorInterface
 {
     private $completed;
     private $promise;

src/React/Promise/PromisorInterface.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace React\Promise;
+
+interface PromisorInterface
+{
+    public function promise();
+}