From 0da3832de05ba7646b42854af93679fc78539150 Mon Sep 17 00:00:00 2001
From: Evert Pot <me@evertpot.com>
Date: Fri, 23 Oct 2015 21:10:20 -0400
Subject: [PATCH] Prepping for 3.0.0-alpha1 release.

---
 CHANGELOG.md      | 10 ++++++++--
 README.md         |  4 +++-
 composer.json     |  4 ++--
 lib/Loop/Loop.php |  2 +-
 lib/Version.php   |  2 +-
 5 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fe8a6a8..9451079 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,21 @@
 ChangeLog
 =========
 
-3.0.0 (????-??-??)
-------------------
+3.0.0-alpha1 (2015-10-23)
+-------------------------
 
+* This package now requires PHP 5.5.
 * #26: Added an event loop implementation. Also knows as the Reactor Pattern.
 * Renamed `Promise::error` to `Promise::otherwise` to be consistent with
   ReactPHP and Guzzle. The `error` method is kept for BC but will be removed
   in a future version.
 * #27: Support for Promise-based coroutines via the `Sabre\Event\coroutine`
   function.
+* BC Break: Promises now use the EventLoop to run "then"-events in a separate
+  execution context. In practise that means you need to run the event loop to
+  wait for any `then`/`otherwise` callbacks to trigger.
+* Promises now have a `wait()` method. Allowing you to make a promise
+  synchronous and simply wait for a result (or exception) to happen.
 
 
 2.0.1 (2014-10-06)
diff --git a/README.md b/README.md
index 12863b6..fde6ada 100644
--- a/README.md
+++ b/README.md
@@ -3,10 +3,12 @@ sabre/event
 
 A lightweight library for event-based development in PHP.
 
-This library provides two patterns:
+This library provides the following event-based concepts:
 
 1. EventEmitter
 2. Promises
+3. An Event Loop using `stream_select()`.
+4. Co-routines.
 
 Full documentation can be found on [the website][1].
 
diff --git a/composer.json b/composer.json
index 99fce39..c2b8f8d 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
     "homepage": "http://sabre.io/event/",
     "license": "BSD-3-Clause",
     "require": {
-        "php": ">=5.4.1"
+        "php": ">=5.5"
     },
     "authors": [
         {
@@ -36,7 +36,7 @@
         ]
     },
     "require-dev": {
-        "sabre/cs": "~0.0.1",
+        "sabre/cs": "~0.0.4",
         "phpunit/phpunit" : "*"
     },
     "config" : {
diff --git a/lib/Loop/Loop.php b/lib/Loop/Loop.php
index 606bd41..86ee7c8 100644
--- a/lib/Loop/Loop.php
+++ b/lib/Loop/Loop.php
@@ -263,7 +263,7 @@ function stop() {
     /**
      * Executes all 'nextTick' callbacks.
      *
-     * return @void
+     * return void
      */
     protected function runNextTicks() {
 
diff --git a/lib/Version.php b/lib/Version.php
index 5de2219..2bece1e 100644
--- a/lib/Version.php
+++ b/lib/Version.php
@@ -14,6 +14,6 @@ class Version {
     /**
      * Full version number
      */
-    const VERSION = '3.0.0';
+    const VERSION = '3.0.0-alpha1';
 
 }