From 157bee6697a32c0cf3ad69d0cf77c7beeed2a1e0 Mon Sep 17 00:00:00 2001 From: Zach Borboa Date: Wed, 10 Aug 2016 02:44:53 -0700 Subject: [PATCH 1/3] Replace unsafe example --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 1644237..feb3f36 100644 --- a/README.md +++ b/README.md @@ -81,8 +81,8 @@ var_dump($curl->responseHeaders); ```php $curl = new Curl(); -$curl->setOpt(CURLOPT_SSL_VERIFYPEER, false); -$curl->get('https://encrypted.example.com/'); +$curl->setOpt(CURLOPT_FOLLOWLOCATION, true); +$curl->get('https://shortn.example.com/bHbVsP'); ``` ```php From 8f2b8782376786369ba4b1ca2f444dc1560b9406 Mon Sep 17 00:00:00 2001 From: Zach Borboa Date: Wed, 10 Aug 2016 02:46:38 -0700 Subject: [PATCH 2/3] Clean up spacing --- README.md | 2 +- src/Curl/MultiCurl.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index feb3f36..e75d712 100644 --- a/README.md +++ b/README.md @@ -262,7 +262,7 @@ MultiCurl::setXmlDecoder($function) MultiCurl::start() MultiCurl::success($callback) MultiCurl::unsetHeader($key) -MultiCurl::verbose($on = true, $output=STDERR) +MultiCurl::verbose($on = true, $output = STDERR) ``` ### Contribute diff --git a/src/Curl/MultiCurl.php b/src/Curl/MultiCurl.php index 445f275..0564741 100644 --- a/src/Curl/MultiCurl.php +++ b/src/Curl/MultiCurl.php @@ -555,7 +555,7 @@ class MultiCurl * @param bool $on * @param resource $output */ - public function verbose($on = true, $output=STDERR) + public function verbose($on = true, $output = STDERR) { // Turn off CURLINFO_HEADER_OUT for verbose to work. This has the side // effect of causing Curl::requestHeaders to be empty. From 35df88a9c5857d2220744d43afaded699cb04b4d Mon Sep 17 00:00:00 2001 From: Zach Borboa Date: Wed, 10 Aug 2016 02:51:46 -0700 Subject: [PATCH 3/3] Remove unnecessary function call --- src/Curl/Curl.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Curl/Curl.php b/src/Curl/Curl.php index e311ed8..32e18b6 100644 --- a/src/Curl/Curl.php +++ b/src/Curl/Curl.php @@ -1235,7 +1235,7 @@ class Curl $return[$key] = $value; } } else { - if (class_exists('CURLFile') && $value instanceof \CURLFile) { + if ($value instanceof \CURLFile) { $return[$key] = $value; } else { $return = array_merge(