resolve() accepts callables returning generators - added to changelog

amphp · May 11, 2016 · 92e0042 · 92e0042
1 parent 3ab10de
commit 92e0042
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+1.2.0
+-----
+
+- resolve() now also accepts callables returning Generators.
+
 ### 1.1.1
 
 - Fix memory leak in NativeReactor, retaining an empty array

diff --git a/lib/functions.php b/lib/functions.php
@@ -752,7 +752,7 @@ function coroutine(callable $func) {
  * Upon resolution the Generator return value is used to succeed the promised result. If an
  * error occurs during coroutine resolution the returned promise fails.
  *
- * @param \Generator|callable $generator A generator or callable the returns a generator to resolve as a coroutine
+ * @param \Generator|callable $generator A generator or callable that returns a generator to resolve as a coroutine
  * @return \Amp\Promise
  */
 function resolve($generator) {