Merge pull request php-curl-class#370 from zachborboa/master

zachborboa · web-flow · commit f619176a0ef2 · 2016-08-10T10:19:59.000-07:00
Remove unnecessary function call
diff --git 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
@@ -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/Curl.php b/src/Curl/Curl.php
@@ -1235,7 +1235,7 @@ public static function array_flatten_multidim($array, $prefix = false)
                             $return[$key] = $value;
                         }
                     } else {
-                        if (class_exists('CURLFile') && $value instanceof \CURLFile) {
+                        if ($value instanceof \CURLFile) {
                             $return[$key] = $value;
                         } else {
                             $return = array_merge(
diff --git a/src/Curl/MultiCurl.php b/src/Curl/MultiCurl.php
@@ -555,7 +555,7 @@ public function unsetHeader($key)
      * @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.

Original file line number	Diff line number	Diff line change
`@@ -1235,7 +1235,7 @@ public static function array_flatten_multidim($array, $prefix = false)`
`1235`	`1235`	`$return[$key] = $value;`
`1236`	`1236`	`}`
`1237`	`1237`	`} else {`
`1238`		`- if (class_exists('CURLFile') && $value instanceof \CURLFile) {`
	`1238`	`+ if ($value instanceof \CURLFile) {`
`1239`	`1239`	`$return[$key] = $value;`
`1240`	`1240`	`} else {`
`1241`	`1241`	`$return = array_merge(`
Original file line number	Diff line number	Diff line change
`@@ -555,7 +555,7 @@ public function unsetHeader($key)`
`555`	`555`	`* @param bool $on`
`556`	`556`	`* @param resource $output`
`557`	`557`	`*/`
`558`		`- public function verbose($on = true, $output=STDERR)`
	`558`	`+ public function verbose($on = true, $output = STDERR)`
`559`	`559`	`{`
`560`	`560`	`// Turn off CURLINFO_HEADER_OUT for verbose to work. This has the side`
`561`	`561`	`// effect of causing Curl::requestHeaders to be empty.`