with response object for curl

Author: hhxsv5

README.md

@@ -22,104 +22,98 @@ use Hhxsv5\PhpMultiCurl\Curl;
 use Hhxsv5\PhpMultiCurl\MultiCurl;
 
 //Single http request
-$getUrl = 'http://www.weather.com.cn/data/cityinfo/101270101.html';
 $options = [//The custom the curl options
     CURLOPT_TIMEOUT        => 10,
     CURLOPT_CONNECTTIMEOUT => 5,
     CURLOPT_USERAGENT      => 'Multi-Curl Client V1.0',
 ];
+
 $c1 = new Curl($options);
 $c1->makeGet($getUrl);
-$ret = $c1->exec();
-var_dump($ret);
-if ($ret) {
-    //Success
-    var_dump($c1->getResponse());
-} else {
+$response = $c1->exec();
+if ($response->hasError()) {
     //Fail
-    var_dump($c1->getError());
+    var_dump($response->getError());
+} else {
+    //Success
+    var_dump($response->getHttpCode(), $response->getBody());
 }
 ```
 
 ```PHP
 //Multi http request
-$getUrl = 'http://www.weather.com.cn/data/cityinfo/101270101.html';
-$postUrl = 'https://api.weixin.qq.com/cgi-bin/qrcode/create?access_token=yourtoken';
-
-$c1 = new Curl();
-$c1->makeGet($getUrl);
-
 $c2 = new Curl();
-$c2->makePost($postUrl);
+$c2->makeGet($getUrl);
+$c3 = new Curl();
+$c3->makePost($postUrl);
 
 $mc = new MultiCurl();
-
-$mc->addCurls([$c1, $c2]);
-$ret = $mc->exec();
-var_dump($ret);
-if ($ret) {
-    //Success
-    var_dump($c1->getResponse(), $c2->getResponse());
+$mc->addCurls([$c2, $c3]);
+$allSuccess = $mc->exec();
+if ($allSuccess) {
+    //All success
+    var_dump($c2->getResponse()->getBody(), $c3->getResponse()->getBody());
 } else {
     //Some curls failed
-    var_dump($c1->getError(), $c2->getError());
+    var_dump($c2->getResponse()->getError(), $c3->getResponse()->getError());
 }
 
 //Reuse $mc
-$c3 = new Curl();
-$c3->makeGet($getUrl);
-
 $c4 = new Curl();
-$c4->makePost($postUrl);
-
-$mc->addCurls([$c3, $c4]);
-$ret = $mc->exec();
-var_dump($ret);
-if ($ret) {
-    //Success
-    var_dump($c3->getResponse(), $c4->getResponse());
+$c4->makeGet($getUrl);
+$c5 = new Curl();
+$c5->makePost($postUrl);
+$mc->addCurls([$c4, $c5]);
+$allSuccess = $mc->exec();
+if ($allSuccess) {
+    //All success
+    var_dump($c4->getResponse()->getBody(), $c5->getResponse()->getBody());
 } else {
     //Some curls failed
-    var_dump($c3->getError(), $c4->getError());
+    var_dump($c4->getResponse()->getError(), $c5->getResponse()->getError());
 }
 ```
 
 ```PHP
 //Upload file
 $postUrl = 'http://localhost/upload.php';//<?php var_dump($_FILES);
-$c = new Curl();
-$file1 = new \CURLFile('./olddriver.gif', 'image/gif', 'name1');
+
+$options = [//The custom the curl options
+    CURLOPT_TIMEOUT        => 10,
+    CURLOPT_CONNECTTIMEOUT => 5,
+    CURLOPT_USERAGENT      => 'Multi-Curl Client V1.0',
+];
+$c = new Curl($options);
+$file1 = new CURLFile('./olddriver.gif', 'image/gif', 'name1');
 $params = ['file1' => $file1];
 $c->makePost($postUrl, $params);
-$ret = $c->exec();
-var_dump($ret);
-if ($ret) {
-    //Success
-    var_dump($c->getResponse());
-} else {
+$response = $c->exec();
+if ($response->hasError()) {
     //Fail
-    var_dump($c->getError());
+    var_dump($response->getError());
+} else {
+    //Success
+    var_dump($response->getBody());
 }
 ```
 
 ```PHP
 //Download file
-$fileUrl = 'http://localhost/test.gif';
+$fileUrl = 'http://localhost/test.gif';//<?php var_dump($_FILES);
 $options = [//The custom the curl options
     CURLOPT_TIMEOUT        => 3600,//1 hour
     CURLOPT_CONNECTTIMEOUT => 10,
 ];
 $c = new Curl($options);
 $c->makeGet($fileUrl);
-$ret = $c->exec();
-var_dump($ret);
-if ($ret) {
+$response = $c->exec();
+if ($response->hasError()) {
+    //Fail
+    var_dump($response->getError());
+} else {
     //Success
     $targetFile = './a/b/c/test.gif';
     var_dump($c->responseToFile($targetFile));
-} else {
-    //Fail
-    var_dump($c->getError());
 }
 ```
 

examples/downloadfile.php

@@ -10,13 +10,12 @@
 ];
 $c = new Curl($options);
 $c->makeGet($fileUrl);
-$ret = $c->exec();
-var_dump($ret);
-if ($ret) {
+$response = $c->exec();
+if ($response->hasError()) {
+    //Fail
+    var_dump($response->getError());
+} else {
     //Success
     $targetFile = './a/b/c/test.gif';
     var_dump($c->responseToFile($targetFile));
-} else {
-    //Fail
-    var_dump($c->getError());
 }

examples/example.php

@@ -24,7 +24,6 @@
     //Success
     var_dump($response->getHttpCode(), $response->getBody());
 }
-return;
 
 //Multi http request
 $c2 = new Curl();

examples/uploadfile.php

@@ -15,12 +15,11 @@
 $file1 = new CURLFile('./olddriver.gif', 'image/gif', 'name1');
 $params = ['file1' => $file1];
 $c->makePost($postUrl, $params);
-$ret = $c->exec();
-var_dump($ret);
-if ($ret) {
-    //Success
-    var_dump($c->getResponse());
-} else {
+$response = $c->exec();
+if ($response->hasError()) {
     //Fail
-    var_dump($c->getError());
+    var_dump($response->getError());
+} else {
+    //Success
+    var_dump($response->getBody());
 }