Merge branch 'develop'

Author: bgaillard

composer.json

@@ -1,7 +1,7 @@
 {
 	"name" : "gomoob/php-pushwoosh",
 	"description" : "A PHP Library to easily work with the Pushwoosh REST Web Services.",
-	"version" : "1.0.6",
+	"version" : "1.0.7",
 	"license" : "MIT",
 	"type" : "library",
 	"keywords" : [

composer.lock

@@ -1,6 +1,6 @@
 {
   "name": "gomoob-php-pushwoosh",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "license": "MIT",
   "repository" : {
     "type" : "git",

package.json

@@ -8,10 +8,9 @@
  */
 namespace Gomoob\Pushwoosh\Client;
 
-use Gomoob\Curl\CurlRequest;
-use Gomoob\Curl\ICurlRequest;
-
 use Gomoob\Pushwoosh\ICURLClient;
+use Gomoob\Pushwoosh\Curl\CurlRequest;
+use Gomoob\Pushwoosh\Curl\ICurlRequest;
 use Gomoob\Pushwoosh\Exception\PushwooshException;
 
 /**

src/main/php/Gomoob/Pushwoosh/Client/CURLClient.php

@@ -6,7 +6,7 @@
  * @copyright Copyright (c) 2015, GOMOOB SARL (http://gomoob.com)
  * @license   http://www.opensource.org/licenses/mit-license.php MIT (see the LICENSE.md file)
  */
-namespace Gomoob\Curl;
+namespace Gomoob\Pushwoosh\Curl;
 
 /**
  * An implementation for the ICurlRequest interface.

src/main/php/Gomoob/Curl/CurlRequest.php renamed to src/main/php/Gomoob/Pushwoosh/Curl/CurlRequest.php

@@ -6,7 +6,7 @@
  * @copyright Copyright (c) 2015, GOMOOB SARL (http://gomoob.com)
  * @license   http://www.opensource.org/licenses/mit-license.php MIT (see the LICENSE.md file)
  */
-namespace Gomoob\Curl;
+namespace Gomoob\Pushwoosh\Curl;
 
 /**
  * Interface used to abstract the CURL PHP methods.

src/main/php/Gomoob/Curl/ICurlRequest.php renamed to src/main/php/Gomoob/Pushwoosh/Curl/ICurlRequest.php

@@ -28,7 +28,7 @@ public function testPushwooshCall()
         $curlClient = new CURLClient();
 
         // First test with a response return which does not correspond to a valid JSON payload
-        $curlRequest = $this->getMock('\Gomoob\CURL\CURLRequest');
+        $curlRequest = $this->getMock('\Gomoob\Pushwoosh\Curl\CURLRequest');
         $curlRequest->method('exec')->willReturn(false);
         $curlRequest->method('getInfo')->willReturn('CURL_INFO');
 
@@ -61,7 +61,7 @@ public function testPushwooshCall()
         }
 
         // Second test with a CURL error encountered
-        $curlRequest = $this->getMock('\Gomoob\CURL\CURLRequest');
+        $curlRequest = $this->getMock('\Gomoob\Pushwoosh\Curl\CURLRequest');
         $curlRequest->method('exec')->willReturn(
             array(
                 'status_code' => 400,