Browse Source

Added error messages to response object

Jan Oris 8 years ago
parent
commit
9fa4f78a40
2 changed files with 9 additions and 4 deletions
  1. 1 1
      composer.json
  2. 8 3
      src/Ixudra/Curl/Builder.php

+ 1 - 1
composer.json

@@ -1,7 +1,7 @@
 {
     "name": "ixudra/curl",
     "description": "Custom PHP Curl library for the Laravel 5 framework - developed by Ixudra",
-    "version": "6.4.1",
+    "version": "6.5.0",
     "keywords": ["Ixudra", "Laravel", "Curl"],
     "homepage": "http://ixudra.be",
     "license": "MIT",

+ 8 - 3
src/Ixudra/Curl/Builder.php

@@ -340,10 +340,12 @@ class Builder {
         $responseData = array();
         if( $this->packageOptions[ 'responseObject' ] ) {
             $responseData = curl_getinfo( $this->curlObject );
-            if(curl_errno($this->curlObject)){
-                $responseData['errorMessage'] = curl_error($this->curlObject);
+
+            if( curl_errno($this->curlObject) ) {
+                $responseData[ 'errorMessage' ] = curl_error($this->curlObject);
             }
         }
+
         curl_close( $this->curlObject );
 
         if( $this->packageOptions[ 'saveFile' ] ) {
@@ -378,7 +380,9 @@ class Builder {
         $object = new stdClass();
         $object->content = $content;
         $object->status = $responseData[ 'http_code' ];
-        $object->error = $responseData['errorMessage'];
+        if( array_key_exists('errorMessage', $responseData) ) {
+            $object->error = $responseData[ 'errorMessage' ];
+        }
 
         return $object;
     }
@@ -418,4 +422,5 @@ class Builder {
 
         return $this->curlOptions[ 'URL' ] .= $parameterString;
     }
+
 }