From 6fd3294fbae98b12178e7bcb03cc031f6942af34 Mon Sep 17 00:00:00 2001
From: Erik <nuclear.ace@gmail.com>
Date: Tue, 14 Jun 2016 19:41:18 -0400
Subject: [PATCH] Revert "swift 2.3"

This reverts commit bfa163f3c2e85776d8bcf0c24eca65b7398f403d.
---
 Source/SocketEngine.swift          |  4 ++--
 Source/SocketIOClient.swift        |  2 +-
 Source/WebSocket/SSLSecurity.swift | 20 ++++++++++----------
 Source/WebSocket/WebSocket.swift   |  4 ++--
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/Source/SocketEngine.swift b/Source/SocketEngine.swift
index 717e9ef..80443ec 100644
--- a/Source/SocketEngine.swift
+++ b/Source/SocketEngine.swift
@@ -218,8 +218,8 @@ public final class SocketEngine : NSObject, SocketEnginePollable, SocketEngineWe
             return (NSURL(), NSURL())
         }
 
-        let urlPolling = NSURLComponents(string: url.absoluteString!)!
-        let urlWebSocket = NSURLComponents(string: url.absoluteString!)!
+        let urlPolling = NSURLComponents(string: url.absoluteString)!
+        let urlWebSocket = NSURLComponents(string: url.absoluteString)!
         var queryString = ""
         
         urlWebSocket.path = socketPath
diff --git a/Source/SocketIOClient.swift b/Source/SocketIOClient.swift
index 68bac0e..70c6f22 100644
--- a/Source/SocketIOClient.swift
+++ b/Source/SocketIOClient.swift
@@ -70,7 +70,7 @@ public final class SocketIOClient : NSObject, SocketEngineClient, SocketParsable
         self.options = options
         self.socketURL = socketURL
         
-        if socketURL.absoluteString!.hasPrefix("https://") {
+        if socketURL.absoluteString.hasPrefix("https://") {
             self.options.insertIgnore(.Secure(true))
         }
         
diff --git a/Source/WebSocket/SSLSecurity.swift b/Source/WebSocket/SSLSecurity.swift
index aa2990a..968e4eb 100644
--- a/Source/WebSocket/SSLSecurity.swift
+++ b/Source/WebSocket/SSLSecurity.swift
@@ -141,9 +141,9 @@ public class SSLSecurity : NSObject {
         }
         var policy: SecPolicyRef
         if self.validatedDN {
-            policy = SecPolicyCreateSSL(true, domain)!
+            policy = SecPolicyCreateSSL(true, domain)
         } else {
-            policy = SecPolicyCreateBasicX509()!
+            policy = SecPolicyCreateBasicX509()
         }
         SecTrustSetPolicies(trust,policy)
         if self.usePublicKeys {
@@ -164,10 +164,10 @@ public class SSLSecurity : NSObject {
                 collect.append(SecCertificateCreateWithData(nil,cert)!)
             }
             SecTrustSetAnchorCertificates(trust,collect)
-            var result = SecTrustResultType(rawValue: 0)
-            SecTrustEvaluate(trust, &result!)
-            let r = Int(result!.rawValue)
-            if r == Int(SecTrustResultType.Unspecified.rawValue) || r == Int(SecTrustResultType.Proceed.rawValue) {
+            var result: SecTrustResultType = 0
+            SecTrustEvaluate(trust,&result)
+            let r = Int(result)
+            if r == kSecTrustResultUnspecified || r == kSecTrustResultProceed {
                 var trustedCount = 0
                 for serverCert in serverCerts {
                     for cert in certs {
@@ -195,7 +195,7 @@ public class SSLSecurity : NSObject {
     func extractPublicKey(data: NSData) -> SecKeyRef? {
         guard let cert = SecCertificateCreateWithData(nil, data) else { return nil }
         
-        return extractPublicKeyFromCert(cert, policy: SecPolicyCreateBasicX509()!)
+        return extractPublicKeyFromCert(cert, policy: SecPolicyCreateBasicX509())
     }
     
     /**
@@ -211,7 +211,7 @@ public class SSLSecurity : NSObject {
         
         guard let trust = possibleTrust else { return nil }
         
-        var result = SecTrustResultType(rawValue:0)!
+        var result: SecTrustResultType = 0
         SecTrustEvaluate(trust, &result)
         return SecTrustCopyPublicKey(trust)
     }
@@ -246,7 +246,7 @@ public class SSLSecurity : NSObject {
         let keys = (0..<SecTrustGetCertificateCount(trust)).reduce([SecKeyRef]()) { (keys: [SecKeyRef], index: Int) -> [SecKeyRef] in
             var keys = keys
             let cert = SecTrustGetCertificateAtIndex(trust, index)
-            if let key = extractPublicKeyFromCert(cert!, policy: policy!) {
+            if let key = extractPublicKeyFromCert(cert!, policy: policy) {
                 keys.append(key)
             }
             
@@ -257,4 +257,4 @@ public class SSLSecurity : NSObject {
     }
     
     
-}
+}
\ No newline at end of file
diff --git a/Source/WebSocket/WebSocket.swift b/Source/WebSocket/WebSocket.swift
index 5ec5625..1204a78 100644
--- a/Source/WebSocket/WebSocket.swift
+++ b/Source/WebSocket/WebSocket.swift
@@ -227,7 +227,7 @@ public class WebSocket : NSObject, NSStreamDelegate {
         
         var port = url.port
         if port == nil {
-            if ["wss", "https"].contains(url.scheme!) {
+            if ["wss", "https"].contains(url.scheme) {
                 port = 443
             } else {
                 port = 80
@@ -285,7 +285,7 @@ public class WebSocket : NSObject, NSStreamDelegate {
         guard let inStream = inputStream, let outStream = outputStream else { return }
         inStream.delegate = self
         outStream.delegate = self
-        if ["wss", "https"].contains(url.scheme!) {
+        if ["wss", "https"].contains(url.scheme) {
             inStream.setProperty(NSStreamSocketSecurityLevelNegotiatedSSL, forKey: NSStreamSocketSecurityLevelKey)
             outStream.setProperty(NSStreamSocketSecurityLevelNegotiatedSSL, forKey: NSStreamSocketSecurityLevelKey)
         } else {