Fixed weird commit and merge issues

src/Mailgun/MailgunClient.php

@@ -2,48 +2,48 @@
 
 namespace Mailgun;
 
-use Mailgun\Connection\HttpBroker;
+use Mailgun\Logs\Logs;
-use Mailgun\Unsubscribes\Unsubscribes;
+use Mailgun\Stats\Stats;
+use Mailgun\Bounces\Bounces;
 use Mailgun\Messages\Messages;
 use Mailgun\Complaints\Complaints;
-use Mailgun\Bounces\Bounces;
+use Mailgun\Connection\HttpBroker;
-use Mailgun\Stats\Stats;
+use Mailgun\Unsubscribes\Unsubscribes;
-use Mailgun\Logs\Logs;
-
-
-use Mailgun\Connection\Exceptions\NoDomainsConfigured;
-use Mailgun\Connection\Exceptions\InvalidCredentials;
-use Mailgun\Connection\Exceptions\MissingRequiredMIMEParameters;
-use Mailgun\Connection\Exceptions\GenericHTTPError;
 
 class MailgunClient{
-
+    
-	protected $debug;
+    /* 
-	protected $httpBroker;
+     * Instantiate the HttpBroker to make it available to all 
-	
+     * classes created from here.
-	public function __construct($apiKey, $domain, $debug = false){
+    */
-		$this->httpBroker = new HttpBroker($apiKey, $domain, $debug);
+    
-	}
+    public function __construct($apiKey, $domain, $debug = false){
-	
+        $this->httpBroker = new HttpBroker($apiKey, $domain, $debug);
-	//Factory Methods for Class Creation from MailgunClient
+    }
-	public function Messages(){
+    
-		return new Messages($this->httpBroker);
+    /* 
-	}
+     * Factory methods for instantiating each endpoint class.
-	public function Unsubscribes(){
+     * If a new endpoint is added, create a factory method here.
-		return new Unsubscribes($this->httpBroker);
+     */    
-	}
+     
-	public function Complaints(){
+    public function Messages(){
-		return new Complaints($this->httpBroker);
+        return new Messages($this->httpBroker);
-	}
+    }
-	public function Bounces(){
+    public function Unsubscribes(){
-		return new Bounces($this->httpBroker);
+        return new Unsubscribes($this->httpBroker);
-	}
+    }
-	public function Stats(){
+    public function Complaints(){
-		return new Stats($this->httpBroker);
+        return new Complaints($this->httpBroker);
-	}
+    }
-	public function Logs(){
+    public function Bounces(){
-		return new Logs($this->httpBroker);
+        return new Bounces($this->httpBroker);
-	}	
+    }
+    public function Stats(){
+        return new Stats($this->httpBroker);
+    }
+    public function Logs(){
+        return new Logs($this->httpBroker);
+    }   
 }
 
 ?>

src/Mailgun/globals.php

@@ -7,7 +7,5 @@ const API_USER = "api";
 const SDK_VERSION = "0.1";
 const SDK_USER_AGENT = "mailgun-sdk-php";
 const DEFAULT_TIME_ZONE = "UTC";
-const DEFAULT_MG_API_KEY = "key-3ax6xnjp29jd6fds4gc373sgvjxteol0";
-const DEFAULT_MG_DOMAIN = "samples.mailgun.org";
 
 ?>