Merge branch 'extended-promise'

reactphp · Dec 25, 2014 · e668c06 · e668c06
2 parents 478ba7e + becfcee
commit e668c06
Show file tree

Hide file tree

Showing 27 changed files with 1,739 additions and 108 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,18 @@
 CHANGELOG
 =========
 
+* 2.2.0 (xxxx-xx-xx)
+
+  * Introduce new ExtendedPromiseInterface implemented by all promises
+  * Add new .done() method (part of the ExtendedPromiseInterface)
+  * Add new .otherwise() method (part of the ExtendedPromiseInterface)
+  * Add new .always() method (part of the ExtendedPromiseInterface)
+  * Add new .progress() method (part of the ExtendedPromiseInterface)
+  * Rename Deferred::progress to Deferred::notify to avoid confusion with
+    ExtendedPromiseInterface::progress (a Deferred::progress alias is still
+    available for backward compatibility)
+  * resolve() now always returns a ExtendedPromiseInterface
+
 * 2.1.0 (2014-10-15)
 
   * Introduce new CancellablePromiseInterface implemented by all promises