PSR-4; Guzzle 6.x

academe · Nov 29, 2018 · 65ee406 · 65ee406
1 parent 469be43
commit 65ee406
Show file tree

Hide file tree

Showing 17 changed files with 28 additions and 16 deletions.
diff --git a/composer.json b/composer.json
@@ -5,7 +5,6 @@
     "homepage": "https://github.com/academe/sugarrestapi",
     "type": "library",
     "license": "MIT",
-    "version": "0.9.0",
     "authors": [
         {
             "name": "Jason Judge",
@@ -15,11 +14,11 @@
     ],
     "require": {
         "php": ">=5.3.0",
-        "guzzle/guzzle": "3.*"
+        "guzzle/guzzle": "~6.3"
     },
     "autoload": {
-        "psr-0": {
-            "Academe\\SugarRestApi": "/"
+        "psr-4": {
+            "Academe\\SugarRestApi": "src/"
         }
     }
 }
diff --git a/Academe/SugarRestApi/Api/Api.php → src/Api/Api.php b/Academe/SugarRestApi/Api/Api.php → src/Api/Api.php
diff --git a/Academe/SugarRestApi/Api/ApiAbstract.php → src/Api/ApiAbstract.php b/Academe/SugarRestApi/Api/ApiAbstract.php → src/Api/ApiAbstract.php
diff --git a/Academe/SugarRestApi/Api/ApiInterface.php → src/Api/ApiInterface.php b/Academe/SugarRestApi/Api/ApiInterface.php → src/Api/ApiInterface.php
diff --git a/Academe/SugarRestApi/Api/v4.php → src/Api/v4.php b/Academe/SugarRestApi/Api/v4.php → src/Api/v4.php
diff --git a/Academe/SugarRestApi/Api/v41.php → src/Api/v41.php b/Academe/SugarRestApi/Api/v41.php → src/Api/v41.php
diff --git a/Academe/SugarRestApi/Api/v4portal.php → src/Api/v4portal.php b/Academe/SugarRestApi/Api/v4portal.php → src/Api/v4portal.php
diff --git a/...pi/Exception/InvalidArgumentException.php → src/Exception/InvalidArgumentException.php b/...pi/Exception/InvalidArgumentException.php → src/Exception/InvalidArgumentException.php
diff --git a/...stApi/Exception/SugarRestApiException.php → src/Exception/SugarRestApiException.php b/...stApi/Exception/SugarRestApiException.php → src/Exception/SugarRestApiException.php
diff --git a/Academe/SugarRestApi/Model/Entry.php → src/Model/Entry.php b/Academe/SugarRestApi/Model/Entry.php → src/Model/Entry.php
diff --git a/Academe/SugarRestApi/Model/EntryList.php → src/Model/EntryList.php b/Academe/SugarRestApi/Model/EntryList.php → src/Model/EntryList.php
diff --git a/Academe/SugarRestApi/Model/ModelAbstract.php → src/Model/ModelAbstract.php b/Academe/SugarRestApi/Model/ModelAbstract.php → src/Model/ModelAbstract.php
diff --git a/...eme/SugarRestApi/Model/ModelInterface.php → src/Model/ModelInterface.php b/...eme/SugarRestApi/Model/ModelInterface.php → src/Model/ModelInterface.php
diff --git a/Academe/SugarRestApi/Model/Module.php → src/Model/Module.php b/Academe/SugarRestApi/Model/Module.php → src/Model/Module.php
diff --git a/...rRestApi/Transport/ControllerAbstract.php → src/Transport/ControllerAbstract.php b/...rRestApi/Transport/ControllerAbstract.php → src/Transport/ControllerAbstract.php
diff --git a/...garRestApi/Transport/ControllerGuzzle.php → src/Transport/ControllerGuzzle.php b/...garRestApi/Transport/ControllerGuzzle.php → src/Transport/ControllerGuzzle.php
@@ -17,10 +17,14 @@ public function setClient()
         // Instantiate the controller if necessary. 
         if (empty($this->client)) {
             // Build the URL.
+
             $this->buildEntryPoint();
 
             // Instantiate the client REST controller with the URL.
-            $this->client = new \Guzzle\Http\Client($this->entryPointUrl);
+
+            $this->client = new \GuzzleHttp\Client([
+                'base_uri' => $this->entryPointUrl,
+            ]);
         }
     }
 
@@ -44,22 +48,31 @@ public function post($data)
         // Clear the error message.
         $this->resetErrorMessage();
 
-        $request = $this->client
-            ->post($path)
-            ->addPostFields($data);
-
         try {
-            // Send the request for a resource and get the result back, with the assumption that it is JSON.
-            $response = $request->send();
-            $result = $response->json();
+            // Send the request for a resource and get the result back,
+            // with the assumption that it is JSON.
+
+            //$response = $request->send();
+            $response = $this->client->request('POST', $path, [
+                'form_params' => $data,
+            ]);
+
+            $body = $response->getBody();
+            $result = json_decode((string)$body, true);
+
+            if (json_last_error() != \JSON_ERROR_NONE) {
+                // Failure to decode the response as JSON.
+                $result = null;
+                $this->errorMessage = $e->getMessage();
+            }
         }
-        catch (\Guzzle\Http\Exception\BadResponseException $e) {
-            // 4xx or 5xx
+        catch (\GuzzleHttp\Exception\ClientException $e) {
+            // 4xx
             $result = null;
             $this->errorMessage = $e->getMessage();
         }
-        catch (\Guzzle\Common\Exception\RuntimeException $e) {
-            // Failure to decode the response as JSON.
+        catch (\GuzzleHttp\Exception\ServerException $e) {
+            // 5xx
             $result = null;
             $this->errorMessage = $e->getMessage();
         }

diff --git a/...RestApi/Transport/ControllerInterface.php → src/Transport/ControllerInterface.php b/...RestApi/Transport/ControllerInterface.php → src/Transport/ControllerInterface.php