From ecdfa174cbd1aea4db5a31c84294b001acce0c0f Mon Sep 17 00:00:00 2001 From: Zach Borboa Date: Tue, 27 Sep 2016 00:24:22 -0700 Subject: [PATCH] Rename setURL to setUrl --- README.md | 4 ++-- examples/set_url_2.php | 2 +- src/Curl/Curl.php | 20 ++++++++++---------- src/Curl/MultiCurl.php | 22 +++++++++++----------- 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/README.md b/README.md index d194715..1e8dc3d 100644 --- a/README.md +++ b/README.md @@ -226,7 +226,7 @@ Curl::setPort($port) Curl::setReferer($referer) Curl::setReferrer($referrer) Curl::setTimeout($seconds) -Curl::setURL($url, $data = array()) +Curl::setUrl($url, $data = array()) Curl::setUserAgent($user_agent) Curl::setXmlDecoder($function) Curl::success($callback) @@ -269,7 +269,7 @@ MultiCurl::setPort($port) MultiCurl::setReferer($referer) MultiCurl::setReferrer($referrer) MultiCurl::setTimeout($seconds) -MultiCurl::setURL($url) +MultiCurl::setUrl($url) MultiCurl::setUserAgent($user_agent) MultiCurl::setXmlDecoder($function) MultiCurl::start() diff --git a/examples/set_url_2.php b/examples/set_url_2.php index ca1b129..5515993 100644 --- a/examples/set_url_2.php +++ b/examples/set_url_2.php @@ -8,7 +8,7 @@ $pages = 10; $q = 'coffee'; $curl = new Curl(); -$curl->setURL('https://www.example.com/search'); +$curl->setUrl('https://www.example.com/search'); for ($i = 1; $i <= $pages; $i++) { // https://www.example.com/search?q=coffee&page=N diff --git a/src/Curl/Curl.php b/src/Curl/Curl.php index 7d044c6..02aaab0 100644 --- a/src/Curl/Curl.php +++ b/src/Curl/Curl.php @@ -109,7 +109,7 @@ class Curl $this->setOpt(CURLOPT_HEADERFUNCTION, array($this, 'headerCallback')); $this->setOpt(CURLOPT_RETURNTRANSFER, true); $this->headers = new CaseInsensitiveArray(); - $this->setURL($base_url); + $this->setUrl($base_url); $this->rfc2616 = array_fill_keys(self::$RFC2616, true); $this->rfc6265 = array_fill_keys(self::$RFC6265, true); } @@ -248,7 +248,7 @@ class Curl $url = $this->baseUrl; } - $this->setURL($url, $query_parameters); + $this->setUrl($url, $query_parameters); $this->setOpt(CURLOPT_CUSTOMREQUEST, 'DELETE'); $this->setOpt(CURLOPT_POSTFIELDS, $this->buildPostData($data)); return $this->exec(); @@ -408,7 +408,7 @@ class Curl $data = $url; $url = $this->baseUrl; } - $this->setURL($url, $data); + $this->setUrl($url, $data); $this->setOpt(CURLOPT_CUSTOMREQUEST, 'GET'); $this->setOpt(CURLOPT_HTTPGET, true); return $this->exec(); @@ -455,7 +455,7 @@ class Curl $data = $url; $url = $this->baseUrl; } - $this->setURL($url, $data); + $this->setUrl($url, $data); $this->setOpt(CURLOPT_CUSTOMREQUEST, 'HEAD'); $this->setOpt(CURLOPT_NOBODY, true); return $this->exec(); @@ -494,7 +494,7 @@ class Curl $data = $url; $url = $this->baseUrl; } - $this->setURL($url, $data); + $this->setUrl($url, $data); $this->removeHeader('Content-Length'); $this->setOpt(CURLOPT_CUSTOMREQUEST, 'OPTIONS'); return $this->exec(); @@ -520,7 +520,7 @@ class Curl $this->removeHeader('Content-Length'); } - $this->setURL($url); + $this->setUrl($url); $this->setOpt(CURLOPT_CUSTOMREQUEST, 'PATCH'); $this->setOpt(CURLOPT_POSTFIELDS, $this->buildPostData($data)); return $this->exec(); @@ -559,7 +559,7 @@ class Curl $url = $this->baseUrl; } - $this->setURL($url); + $this->setUrl($url); if ($follow_303_with_post) { $this->setOpt(CURLOPT_CUSTOMREQUEST, 'POST'); @@ -599,7 +599,7 @@ class Curl $data = $url; $url = $this->baseUrl; } - $this->setURL($url); + $this->setUrl($url); $this->setOpt(CURLOPT_CUSTOMREQUEST, 'PUT'); $put_data = $this->buildPostData($data); if (empty($this->options[CURLOPT_INFILE]) && empty($this->options[CURLOPT_INFILESIZE])) { @@ -628,7 +628,7 @@ class Curl $data = $url; $url = $this->baseUrl; } - $this->setURL($url); + $this->setUrl($url); $this->setOpt(CURLOPT_CUSTOMREQUEST, 'SEARCH'); $put_data = $this->buildPostData($data); if (empty($this->options[CURLOPT_INFILE]) && empty($this->options[CURLOPT_INFILESIZE])) { @@ -1049,7 +1049,7 @@ class Curl * @param $url * @param $data */ - public function setURL($url, $data = array()) + public function setUrl($url, $data = array()) { $this->baseUrl = $url; $this->url = $this->buildURL($url, $data); diff --git a/src/Curl/MultiCurl.php b/src/Curl/MultiCurl.php index 6a6b5b2..764c29a 100644 --- a/src/Curl/MultiCurl.php +++ b/src/Curl/MultiCurl.php @@ -34,7 +34,7 @@ class MultiCurl { $this->multiCurl = curl_multi_init(); $this->headers = new CaseInsensitiveArray(); - $this->setURL($base_url); + $this->setUrl($base_url); } /** @@ -55,7 +55,7 @@ class MultiCurl $url = $this->baseUrl; } $curl = new Curl(); - $curl->setURL($url, $query_parameters); + $curl->setUrl($url, $query_parameters); $curl->setOpt(CURLOPT_CUSTOMREQUEST, 'DELETE'); $curl->setOpt(CURLOPT_POSTFIELDS, $curl->buildPostData($data)); $this->queueHandle($curl); @@ -74,7 +74,7 @@ class MultiCurl public function addDownload($url, $mixed_filename) { $curl = new Curl(); - $curl->setURL($url); + $curl->setUrl($url); // Use tmpfile() or php://temp to avoid "Too many open files" error. if (is_callable($mixed_filename)) { @@ -112,7 +112,7 @@ class MultiCurl $url = $this->baseUrl; } $curl = new Curl(); - $curl->setURL($url, $data); + $curl->setUrl($url, $data); $curl->setOpt(CURLOPT_CUSTOMREQUEST, 'GET'); $curl->setOpt(CURLOPT_HTTPGET, true); $this->queueHandle($curl); @@ -135,7 +135,7 @@ class MultiCurl $url = $this->baseUrl; } $curl = new Curl(); - $curl->setURL($url, $data); + $curl->setUrl($url, $data); $curl->setOpt(CURLOPT_CUSTOMREQUEST, 'HEAD'); $curl->setOpt(CURLOPT_NOBODY, true); $this->queueHandle($curl); @@ -158,7 +158,7 @@ class MultiCurl $url = $this->baseUrl; } $curl = new Curl(); - $curl->setURL($url, $data); + $curl->setUrl($url, $data); $curl->removeHeader('Content-Length'); $curl->setOpt(CURLOPT_CUSTOMREQUEST, 'OPTIONS'); $this->queueHandle($curl); @@ -181,7 +181,7 @@ class MultiCurl $url = $this->baseUrl; } $curl = new Curl(); - $curl->setURL($url); + $curl->setUrl($url); $curl->removeHeader('Content-Length'); $curl->setOpt(CURLOPT_CUSTOMREQUEST, 'PATCH'); $curl->setOpt(CURLOPT_POSTFIELDS, $data); @@ -215,7 +215,7 @@ class MultiCurl $curl->removeHeader('Content-Length'); } - $curl->setURL($url); + $curl->setUrl($url); /* * For post-redirect-get requests, the CURLOPT_CUSTOMREQUEST option must not @@ -247,7 +247,7 @@ class MultiCurl $url = $this->baseUrl; } $curl = new Curl(); - $curl->setURL($url); + $curl->setUrl($url); $curl->setOpt(CURLOPT_CUSTOMREQUEST, 'PUT'); $put_data = $curl->buildPostData($data); if (is_string($put_data)) { @@ -274,7 +274,7 @@ class MultiCurl $url = $this->baseUrl; } $curl = new Curl(); - $curl->setURL($url); + $curl->setUrl($url); $curl->setOpt(CURLOPT_CUSTOMREQUEST, 'SEARCH'); $put_data = $curl->buildPostData($data); if (is_string($put_data)) { @@ -572,7 +572,7 @@ class MultiCurl * @access public * @param $url */ - public function setURL($url) + public function setUrl($url) { $this->baseUrl = $url; }