Merge branch 'ReneB-master'

Author: nathanhosselton

Sources/Promise+Properties.swift

@@ -13,6 +13,25 @@ extension Promise {
         }
     }
 
+    /**
+     Provides an alias for the `error` property for cases where the Swift
+     compiler cannot disambiguate from our `error` function.
+     
+     More than likely use of this alias will never be necessary as it's
+     the inverse situation where Swift usually becomes confused. But 
+     we provide this anyway just in case.
+     
+     If you absolutely cannot get Swift to accept `error` then 
+     `errorValue` may be used instead as it returns the same thing.
+
+     - Warning: This alias will be unavailable in PromiseKit 4.0.0
+     - SeeAlso: [https://github.com/mxcl/PromiseKit/issues/347](https://github.com/mxcl/PromiseKit/issues/347)
+    */
+    @available(*, deprecated, renamed="error", message="Temporary alias `errorValue` will eventually be removed and should only be used when the Swift compiler cannot be satisfied with `error`")
+    public var errorValue: ErrorType? {
+        return self.error
+    }
+
     /**
      - Returns: `true` if the promise has not yet resolved.
     */

Sources/Promise.swift

@@ -390,6 +390,33 @@ public class Promise<T> {
         }
     }
 
+    /**
+     Provides an alias for the `error` function for cases where the Swift
+     compiler cannot disambiguate from our `error` property. If you're
+     having trouble with `error`, before using this alias, first try 
+     being as explicit as possible with the types e.g.:
+
+         }.error { (error:ErrorType) -> Void in
+             //...
+         }
+
+     Or even using verbose function syntax:
+
+         }.error({ (error:ErrorType) -> Void in
+             //...
+         })
+     
+     If you absolutely cannot get Swift to accept `error` then `onError`
+     may be used instead as it does the same thing.
+     
+     - Warning: This alias will be unavailable in PromiseKit 4.0.0
+     - SeeAlso: [https://github.com/mxcl/PromiseKit/issues/347](https://github.com/mxcl/PromiseKit/issues/347)
+    */
+    @available(*, deprecated, renamed="error", message="Temporary alias `onError` will eventually be removed and should only be used when the Swift compiler cannot be satisfied with `error`")
+    public func onError(policy policy: ErrorPolicy = .AllErrorsExceptCancellation, _ body: (ErrorType) -> Void) {
+        error(policy: policy, body)
+    }
+
     /**
      The provided closure is executed when this promise is rejected giving you
      an opportunity to recover from the error and continue the promise chain.

Tests/CorePromise/ErrorUnhandler.test.swift

@@ -116,6 +116,19 @@ class ErrorHandlingTests_Swift: XCTestCase {
         }
     }
 
+    // a temporary alias `onError` exists for the `error` function
+    func test7() {
+        twice { promise, ex in
+            PMKUnhandledErrorHandler = { err in
+                XCTFail()
+            }
+
+            promise.onError { error in
+                ex.fulfill()
+            }
+        }
+    }
+
     func testDoubleRejectDoesNotTriggerUnhandler() {
         enum Error: ErrorType {
             case Test