@@ -1,75 +1,145 @@ -<?php -/* -The MIT License - -Copyright (c) 2008 Rafael S. Souza - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. -*/ - -require_once "Joeh/Net/Curl/Response.php"; -require_once "Joeh/Net/Curl/Option.php"; - -class Joeh_Net_Curl { - - private $handle; - - private $option; - - public function __construct($url = null) { - $this->init(); - $this->option = new Joeh_Net_Curl_Option($this->getHandle()); - $this->option->url($url); - } - - public function __destruct() { - curl_close($this->getHandle()); - } - - public function __call($option, $arguments) { - call_user_func_array(array($this->option, $option), $arguments); - return $this; - } - - public function getHandle() { - return $this->handle; - } - - public function getOptions() { - return $this->option; - } - - public function execute() { - $handle = $this->getHandle(); - curl_setopt_array($handle, $this->option->getForExecute()); - $response = curl_exec($handle); - return new Joeh_Net_Curl_Response($response); - } - - ################## - ## PRIVATE METHODS - ################## - - private function init() { - $this->handle = curl_init(); - curl_setopt($this->handle, CURLOPT_HEADER, true); - curl_setopt($this->handle, CURLOPT_RETURNTRANSFER, true); - } -} +<?php +/* +The MIT License + +Copyright (c) 2008 Rafael S. Souza + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. +*/ + +require_once 'Joeh/Net/Curl/Response.php'; +require_once 'Joeh/Net/Curl/Option.php'; + +class Joeh_Net_Curl { + + ##################### + ## PRIVATE ATTRIBUTES + ##################### + + private $handle; + + private $option; + + private $curlExec = true; + + private $curlExecLoops = 0; + + private $curlExecMaxLoops = 20; + + ################ + ## MAGIC METHODS + ################ + + public function __construct($url = null) { + $this->init(); + $this->option = new Joeh_Net_Curl_Option($this->getHandle()); + $this->option->url($url); + } + + public function __destruct() { + curl_close($this->getHandle()); + } + + public function __call($option, $arguments) { + call_user_func_array(array($this->option, $option), $arguments); + return $this; + } + + ################# + ## PUBLIC METHODS + ################# + + public function getHandle() { + return $this->handle; + } + + public function getOptions() { + return $this->option; + } + + public function execute() { + if(isset($this->option->followLocation)) { + if(!@curl_setopt(CURLOPT_FOLLOWLOCATION, $this->option->followLocation)) { + unset($this->option->followLocation); + $this->curlExec = false; + } + } + + $handle = $this->getHandle(); + curl_setopt_array($handle, $this->option->getForExecute()); + $response = $this->exec($handle); + return new Joeh_Net_Curl_Response($response); + } + + ################## + ## PRIVATE METHODS + ################## + + private function init() { + $this->handle = curl_init(); + curl_setopt($this->handle, CURLOPT_HEADER, true); + curl_setopt($this->handle, CURLOPT_RETURNTRANSFER, true); + } + + private function exec($handle) { + if($this->curlExec) { + return curl_exec($handle); + } + + if ($this->curlExecLoops++ >= $this->curlExecMaxLoops) { + $this->curlExecLoops = 0; + return false; + } + + $data = curl_exec($handle); + + $debbbb = $data; + list($header, $data) = explode(PHP_EOL . PHP_EOL, $data, 2); + $httpCode = curl_getinfo($handle, CURLINFO_HTTP_CODE); + + if ($httpCode == 301 || $httpCode == 302) { + $matches = array(); + preg_match('/Location:(.*?)\n/', $header, $matches); + $url = @parse_url(trim(array_pop($matches))); + if (!$url) { + $this->curlExecLoops = 0; + return $data; + } + + $lastUrl = parse_url(curl_getinfo($handle, CURLINFO_EFFECTIVE_URL)); + $newUrl = $url['scheme'] . '://' . $url['host']; + + if(!empty($url['path'])) { + $newUrl .= $url['path']; + } + + if(!empty($url['query'])) { + $newUrl .= '?' . $url['query']; + } + + curl_setopt($handle, CURLOPT_URL, $newUrl); + return $this->exec($handle); + } + else { + $this->curlExecLoops = 0; + return $debbbb; + } + } +} ?> \ No newline at end of file lib/Joeh/Net/Curl.php @@ -1,29 +1,29 @@ -<?php -/* -The MIT License - -Copyright (c) 2008 Rafael S. Souza - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. -*/ - -class Joeh_Net_Curl_Exception extends Exception { - -} +<?php +/* +The MIT License + +Copyright (c) 2008 Rafael S. Souza + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. +*/ + +class Joeh_Net_Curl_Exception extends Exception { + +} ?> \ No newline at end of file lib/Joeh/Net/Curl/Exception.php @@ -1,132 +1,133 @@ -<?php -/* -The MIT License - -Copyright (c) 2008 Rafael S. Souza - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. -*/ - -/** - * @see Joeh_Net_Curl_Exception - */ -require_once "Joeh/Net/Curl/Exception.php"; - -class Joeh_Net_Curl_Option { - - private $methods = array( - "inFileSize" => CURLOPT_INFILESIZE, - "verbose" => CURLOPT_VERBOSE, - /* "header" => CURLOPT_HEADER, */ - "noProgress" => CURLOPT_NOPROGRESS, - "nobody" => CURLOPT_NOBODY, - "failOnError" => CURLOPT_FAILONERROR, - "upload" => CURLOPT_UPLOAD, - "post" => CURLOPT_POST, - "ftpListOnly" => CURLOPT_FTPLISTONLY, - "ftpAppend" => CURLOPT_FTPAPPEND, - "netRc" => CURLOPT_NETRC, - "followLocation" => CURLOPT_FOLLOWLOCATION, - "put" => CURLOPT_PUT, - /* "mute" => CURLOPT_MUTE, */ - "timeout" => CURLOPT_TIMEOUT, - "lowSpeedLimit" => CURLOPT_LOW_SPEED_LIMIT, - "lowSpeedTime" => CURLOPT_LOW_SPEED_TIME, - "resumeFrom" => CURLOPT_RESUME_FROM, - "caInfo" => CURLOPT_CAINFO, - "sslVerifyPeer" => CURLOPT_SSL_VERIFYPEER, - "sslVersion" => CURLOPT_SSLVERSION, - "sslVerifyHost" => CURLOPT_SSL_VERIFYHOST, - "timeCondition" => CURLOPT_TIMECONDITION, - "timeValue" => CURLOPT_TIMEVALUE, - /* "returnTransfer" => CURLOPT_RETURNTRANSFER, */ - "url" => CURLOPT_URL, - "userPwd" => CURLOPT_USERPWD, - "proxyUserPwd" => CURLOPT_PROXYUSERPWD, - "range" => CURLOPT_RANGE, - "postFields" => CURLOPT_POSTFIELDS, - "referer" => CURLOPT_REFERER, - "userAgent" => CURLOPT_USERAGENT, - "ftpPort" => CURLOPT_FTPPORT, - "cookie" => CURLOPT_COOKIE, - "sslCert" => CURLOPT_SSLCERT, - "sslCertPasswd" => CURLOPT_SSLCERTPASSWD, - "cookieFile" => CURLOPT_COOKIEFILE, - "customRequest" => CURLOPT_CUSTOMREQUEST, - "proxy" => CURLOPT_PROXY, - "interface" => CURLOPT_INTERFACE, - "krb4Level" => CURLOPT_KRB4LEVEL, - "httpHeader" => CURLOPT_HTTPHEADER, - "quote" => CURLOPT_QUOTE, - "postQuote" => CURLOPT_POSTQUOTE, - "file" => CURLOPT_FILE, - "inFile" => CURLOPT_INFILE, - "writeHeader" => CURLOPT_WRITEHEADER, - "stdError" => CURLOPT_STDERR - ); - - private $options = array(); - - public function __call($option, $arguments) { - if(!isset($this->methods[$option])) { - throw new Joeh_Net_Curl_Exception("Invalid option - {$option}"); - } - - $option = $this->methods[$option]; - $this->options[$option] = $arguments[0]; - } - - public function __get($option) { - $option = $this->methods[$option]; - return $this->options[$option]; - } - - public function __isset($option) { - $option = $this->methods[$option]; - return isset($this->options[$option]); - } - - public function getForExecute() { - return $this->options; - } - - /* - public function __get($option) { - return $this->$option(); - } - - public function set($option, $value) { - curl_setopt($this->curl->getHandle(), $option, $value); - } - - private function url() { - return $this->getInfo(CURLINFO_EFFECTIVE_URL); - } - - private function verbose() { - return $this->getInfo(CURLOPT_AUTOREFERER); - } - - private function getInfo($info) { - $handle = $this->curl->getHandle(); - return curl_getinfo($handle, $info); - } - */ -} +<?php +/* +The MIT License + +Copyright (c) 2008 Rafael S. Souza + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. +*/ + +/** + * @see Joeh_Net_Curl_Exception + */ +require_once "Joeh/Net/Curl/Exception.php"; + +class Joeh_Net_Curl_Option { + + private $methods = array( + "inFileSize" => CURLOPT_INFILESIZE, + "verbose" => CURLOPT_VERBOSE, + /* "header" => CURLOPT_HEADER, */ + "noProgress" => CURLOPT_NOPROGRESS, + "nobody" => CURLOPT_NOBODY, + "failOnError" => CURLOPT_FAILONERROR, + "upload" => CURLOPT_UPLOAD, + "post" => CURLOPT_POST, + "ftpListOnly" => CURLOPT_FTPLISTONLY, + "ftpAppend" => CURLOPT_FTPAPPEND, + "netRc" => CURLOPT_NETRC, + "followLocation" => CURLOPT_FOLLOWLOCATION, + "put" => CURLOPT_PUT, + /* "mute" => CURLOPT_MUTE, */ + "timeout" => CURLOPT_TIMEOUT, + "lowSpeedLimit" => CURLOPT_LOW_SPEED_LIMIT, + "lowSpeedTime" => CURLOPT_LOW_SPEED_TIME, + "resumeFrom" => CURLOPT_RESUME_FROM, + "caInfo" => CURLOPT_CAINFO, + "sslVerifyPeer" => CURLOPT_SSL_VERIFYPEER, + "sslVersion" => CURLOPT_SSLVERSION, + "sslVerifyHost" => CURLOPT_SSL_VERIFYHOST, + "timeCondition" => CURLOPT_TIMECONDITION, + "timeValue" => CURLOPT_TIMEVALUE, + /* "returnTransfer" => CURLOPT_RETURNTRANSFER, */ + "url" => CURLOPT_URL, + "userPwd" => CURLOPT_USERPWD, + "proxyUserPwd" => CURLOPT_PROXYUSERPWD, + "range" => CURLOPT_RANGE, + "postFields" => CURLOPT_POSTFIELDS, + "referer" => CURLOPT_REFERER, + "userAgent" => CURLOPT_USERAGENT, + "ftpPort" => CURLOPT_FTPPORT, + "cookie" => CURLOPT_COOKIE, + "sslCert" => CURLOPT_SSLCERT, + "sslCertPasswd" => CURLOPT_SSLCERTPASSWD, + "cookieFile" => CURLOPT_COOKIEFILE, + "customRequest" => CURLOPT_CUSTOMREQUEST, + "proxy" => CURLOPT_PROXY, + "interface" => CURLOPT_INTERFACE, + "krb4Level" => CURLOPT_KRB4LEVEL, + "httpHeader" => CURLOPT_HTTPHEADER, + "quote" => CURLOPT_QUOTE, + "postQuote" => CURLOPT_POSTQUOTE, + "file" => CURLOPT_FILE, + "inFile" => CURLOPT_INFILE, + "writeHeader" => CURLOPT_WRITEHEADER, + "stdError" => CURLOPT_STDERR + ); + + private $options = array(); + + public function __call($option, $arguments) { + if(!isset($this->methods[$option])) { + throw new Joeh_Net_Curl_Exception("Invalid option - {$option}"); + } + + $option = $this->methods[$option]; + $this->options[$option] = $arguments[0]; + } + + public function __get($option) { + $option = $this->methods[$option]; + return $this->options[$option]; + } + + public function __isset($option) { + $option = $this->methods[$option]; + return isset($this->options[$option]); + } + + public function __unset($option) { + $option = $this->methods[$option]; + unset($this->options[$option]); + } + + public function getForExecute() { + return $this->options; + } + + /* + public function set($option, $value) { + curl_setopt($this->curl->getHandle(), $option, $value); + } + + private function url() { + return $this->getInfo(CURLINFO_EFFECTIVE_URL); + } + + private function verbose() { + return $this->getInfo(CURLOPT_AUTOREFERER); + } + + private function getInfo($info) { + $handle = $this->curl->getHandle(); + return curl_getinfo($handle, $info); + } + */ +} ?> \ No newline at end of file lib/Joeh/Net/Curl/Option.php @@ -1,126 +1,127 @@ -<?php -/* -The MIT License - -Copyright (c) 2008 Rafael S. Souza - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. -*/ - -/** - * @see Joeh_String - */ -require_once "Joeh/String.php"; - -class Joeh_Net_Curl_Response { - - private $hasHeader = false; - - private $hasBody = false; - - private $httpVersion; - - private $statusCode; - - private $statusDescription; - - private $headers = array(); - - private $body; - - public function __construct($response) { - $this->processHeader($response); - } - - public function __call($name, $arguments) { - if(isset($this->headers[$name])) { - return $this->headers[$name]; - } - return null; - } - - public function hasHeader() { - return $this->hasHeader; - } - - public function hasBody() { - return $this->hasBody; - } - - public function httpVersion() { - return $this->httpVersion; - } - - public function statusCode() { - return $this->statusCode; - } - - public function statusDescription() { - return $this->statusDescription; - } - - public function body() { - return $this->body; - } - - ################## - ## PRIVATE METHODS - ################## - - private function processHeader($response) { - if(strpos($response, "HTTP/1.") === false) { - return; - } - - $this->hasHeader = true; - $headers = split("\r\n", trim($response, "\r\n")); - foreach($headers as $header) { - if(empty($header)) { - break; - } - - if(preg_match("/HTTP\/(1.[0-9]+) ([0-9]{3}) (.*)/s", $header, $match)) { - $this->httpVersion = $match[1]; - $this->statusCode = (int)$match[2]; - $this->statusDescription = $match[3]; - } - else { - $indexOf = strpos($header, ":"); - $name = Joeh_String::camelize(substr($header, 0, $indexOf)); - $value = substr($header, $indexOf+2); - $this->headers[$name] = $value; - } - } - - $start = key($headers); - if($start > 0) { - $count = count($headers); - $body = null; - for($i = $start; $i < $count; $i++) { - $body .= $headers[$i]; - } - - if($body !== null) { - $this->hasBody = true; - $this->body = $body; - } - } - } -} -?> \ No newline at end of file +<?php +/* +The MIT License + +Copyright (c) 2008 Rafael S. Souza + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. +*/ + +/** + * @see Joeh_String + */ +require_once "Joeh/String.php"; + +class Joeh_Net_Curl_Response { + + private $hasHeader = false; + + private $hasBody = false; + + private $httpVersion; + + private $statusCode; + + private $statusDescription; + + private $headers = array(); + + private $body; + + public function __construct($response) { + $this->processHeader($response); + } + + public function __call($name, $arguments) { + if(isset($this->headers[$name])) { + return $this->headers[$name]; + } + return null; + } + + public function hasHeader() { + return $this->hasHeader; + } + + public function hasBody() { + return $this->hasBody; + } + + public function httpVersion() { + return $this->httpVersion; + } + + public function statusCode() { + return $this->statusCode; + } + + public function statusDescription() { + return $this->statusDescription; + } + + public function body() { + return $this->body; + } + + ################## + ## PRIVATE METHODS + ################## + + private function processHeader($response) { + if(strpos($response, "HTTP/1.") === false) { + return; + } + + $this->hasHeader = true; + $headers = split(PHP_EOL, trim($response, PHP_EOL)); + foreach($headers as $header) { + if(empty($header)) { + break; + } + + if(preg_match("/HTTP\/(1.[0-9]+) ([0-9]{3}) (.*)/s", $header, $match)) { + $this->httpVersion = $match[1]; + $this->statusCode = (int)$match[2]; + $this->statusDescription = $match[3]; + } + else { + $indexOf = strpos($header, ":"); + $name = Joeh_String::camelize(substr($header, 0, $indexOf)); + $value = substr($header, $indexOf+2); + $this->headers[$name] = $value; + } + } + + $start = key($headers); + if($start > 0) { + $count = count($headers); + $body = null; + for($i = $start; $i < $count; $i++) { + $body .= $headers[$i]; + } + + if($body !== null) { + $this->hasBody = true; + $this->body = $body; + } + } + } +} +?> + lib/Joeh/Net/Curl/Response.php @@ -1,48 +1,48 @@ -<?php -/* -The MIT License - -Copyright (c) 2008 Rafael S. Souza - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. -*/ - -class Joeh_String { - - /** - * Transforma uma string em CamelCase - * - * @param string $string - * @param boolean $capsFirst - * @return string - */ - public static function camelize($string, $capsFirst = false) { - $string = str_replace('-', '_', $string); - $string = '_' . str_replace('_', ' ', $string); - $string = ltrim(str_replace(' ', '', ucwords($string)), '_'); - if($capsFirst) { - $string = ucfirst($string); - } - else { - $string[0] = strtolower($string[0]); - } - return $string; - } -} +<?php +/* +The MIT License + +Copyright (c) 2008 Rafael S. Souza + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. +*/ + +class Joeh_String { + + /** + * Transforma uma string em CamelCase + * + * @param string $string + * @param boolean $capsFirst + * @return string + */ + public static function camelize($string, $capsFirst = false) { + $string = str_replace('-', '_', $string); + $string = '_' . str_replace('_', ' ', $string); + $string = ltrim(str_replace(' ', '', ucwords($string)), '_'); + if($capsFirst) { + $string = ucfirst($string); + } + else { + $string[0] = strtolower($string[0]); + } + return $string; + } +} ?> \ No newline at end of file lib/Joeh/String.php @@ -1,39 +1,39 @@ -<?php -/* -The MIT License - -Copyright (c) 2008 Rafael S. Souza - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. -*/ - -error_reporting(E_ALL | E_STRICT | E_RECOVERABLE_ERROR); -date_default_timezone_set("America/Sao_Paulo"); - -require_once "PHPUnit/Framework.php"; - -/** - * Classe base para testes unitários do framework - */ -class Joeh_Test_UnitTestCase extends PHPUnit_Framework_TestCase { - -} - -set_include_path(get_include_path() . PATH_SEPARATOR . realpath(dirname(__FILE__) . "/../../")); +<?php +/* +The MIT License + +Copyright (c) 2008 Rafael S. Souza + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. +*/ + +error_reporting(E_ALL | E_STRICT | E_RECOVERABLE_ERROR); +date_default_timezone_set("America/Sao_Paulo"); + +require_once "PHPUnit/Framework.php"; + +/** + * Classe base para testes unitários do framework + */ +class Joeh_Test_UnitTestCase extends PHPUnit_Framework_TestCase { + +} + +set_include_path(get_include_path() . PATH_SEPARATOR . realpath(dirname(__FILE__) . "/../../")); ?> \ No newline at end of file lib/Joeh/Test/UnitTestCase.php @@ -1,61 +1,61 @@ -<?php -/* -The MIT License - -Copyright (c) 2008 Rafael S. Souza - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. -*/ - -require_once dirname(__FILE__) . "/config.php"; - -if(!defined('PHPUnit_MAIN_METHOD')) { - define('PHPUnit_MAIN_METHOD', 'AllTests::main'); -} - -set_include_path(get_include_path() . PATH_SEPARATOR . VENDOR_PATH . PATH_SEPARATOR . TEST_PATH); - -require_once 'PHPUnit/Framework.php'; -require_once 'PHPUnit/TextUI/TestRunner.php'; - -require_once 'Joeh/Net/CurlTest.php'; -require_once 'Joeh/Net/Curl/OptionTest.php'; - -class AllTests { - - public static function main() { - PHPUnit_TextUI_TestRunner::run(self::suite(), array( - "reportDirectory" => COVERAGE_PATH - )); - } - - public static function suite() { - PHPUnit_Util_Filter::addFileToFilter(__FILE__); - - $suite = new PHPUnit_Framework_TestSuite('Joeh Framework'); - $suite->addTestSuite('Joeh_Net_CurlTest'); - $suite->addTestSuite('Joeh_Net_Curl_OptionTest'); - return $suite; - } -} - -if(PHPUnit_MAIN_METHOD == 'AllTests::main') { - AllTests::main(); -} +<?php +/* +The MIT License + +Copyright (c) 2008 Rafael S. Souza + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. +*/ + +require_once dirname(__FILE__) . "/config.php"; + +if(!defined('PHPUnit_MAIN_METHOD')) { + define('PHPUnit_MAIN_METHOD', 'AllTests::main'); +} + +set_include_path(get_include_path() . PATH_SEPARATOR . VENDOR_PATH . PATH_SEPARATOR . TEST_PATH); + +require_once 'PHPUnit/Framework.php'; +require_once 'PHPUnit/TextUI/TestRunner.php'; + +require_once 'Joeh/Net/CurlTest.php'; +require_once 'Joeh/Net/Curl/OptionTest.php'; + +class AllTests { + + public static function main() { + PHPUnit_TextUI_TestRunner::run(self::suite(), array( + "reportDirectory" => COVERAGE_PATH + )); + } + + public static function suite() { + PHPUnit_Util_Filter::addFileToFilter(__FILE__); + + $suite = new PHPUnit_Framework_TestSuite('Joeh Framework'); + $suite->addTestSuite('Joeh_Net_CurlTest'); + $suite->addTestSuite('Joeh_Net_Curl_OptionTest'); + return $suite; + } +} + +if(PHPUnit_MAIN_METHOD == 'AllTests::main') { + AllTests::main(); +} ?> \ No newline at end of file tests/AllTests.php @@ -1,284 +1,284 @@ -<?php -/* -The MIT License - -Copyright (c) 2008 Rafael S. Souza - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. -*/ - -require_once dirname(__FILE__) . "/../../../config.php"; -require_once VENDOR_PATH . "Joeh/Test/UnitTestCase.php"; -require_once VENDOR_PATH . "Joeh/Net/Curl/Option.php"; - -class Joeh_Net_Curl_OptionTest extends Joeh_Test_UnitTestCase { - - private $curlOption; - - public function setUp() { - $this->curlOption = new Joeh_Net_Curl_Option(); - } - - public function testUrl() { - $this->stringOptionsTest("url", "http://www.w3haus.com.br"); - } - - public function testVerbose() { - $this->booleanOptionsTests("verbose"); - } - - public function testInFileSize() { - $this->integerOptionsTests("lowSpeedLimit", 1024000); - } - - public function testNoProgress() { - $this->booleanOptionsTests("noProgress"); - } - - public function testNobody() { - $this->booleanOptionsTests("nobody"); - } - - public function testFailOnError() { - $this->booleanOptionsTests("failOnError"); - } - - public function testUpload() { - $this->booleanOptionsTests("upload"); - } - - public function testPost() { - $this->booleanOptionsTests("post"); - } - - public function testFtpListOnly() { - $this->booleanOptionsTests("ftpListOnly"); - } - - public function testFtpAppend() { - $this->booleanOptionsTests("ftpAppend"); - } - - public function testNetRc() { - $this->booleanOptionsTests("netRc"); - } - - public function testFollowLocation() { - $this->booleanOptionsTests("followLocation"); - } - - public function testPut() { - $this->booleanOptionsTests("put"); - } - - public function testTimeout() { - $this->integerOptionsTests("lowSpeedLimit", 5); - } - - public function testLowSpeedLimit() { - $this->integerOptionsTests("lowSpeedLimit", 100000); - } - - public function testLowSpeedTime() { - $this->integerOptionsTests("lowSpeedLimit", 10); - } - - public function testResumeFrom() { - $this->integerOptionsTests("lowSpeedLimit", 512); - } - - public function testCaInfo() { - $this->stringOptionsTest("caInfo", "cainfo.file"); - } - - public function testSslVerifyPeer() { - $this->booleanOptionsTests("sslVerifyPeer"); - } - - public function testSslVersion() { - $this->integerOptionsTests("sslVersion", 2); - $this->integerOptionsTests("sslVersion", 3); - } - - public function testSslVerifyHost() { - $this->booleanOptionsTests("sslVerifyHost"); - } - - public function testTimeCondition() { - $this->integerOptionsTests("timeCondition", time()); - } - - public function testTimeValue() { - $this->integerOptionsTests("timeValue", time()); - } - - public function testUserPwd() { - $this->stringOptionsTest("userPwd", "username:password"); - } - - public function testProxyUserPwd() { - $this->stringOptionsTest("proxyUserPwd", "username:password"); - } - - public function testRange() { - $this->stringOptionsTest("range", "100-200"); - $this->stringOptionsTest("range", "100-200,300-400"); - } - - public function testPostFields() { - $this->stringOptionsTest("postFields", "name=joeh&age=23"); - } - - public function testReferer() { - $this->stringOptionsTest("referer", "http://www.google.com.br/?s=php"); - } - - public function testUserAgent() { - $this->stringOptionsTest("userAgent", "JoehBrowser 0.1"); - } - - public function testFtpPort() { - $this->stringOptionsTest("ftpPort", "127.0.0.1"); - $this->stringOptionsTest("ftpPort", "my.server"); - $this->stringOptionsTest("ftpPort", "eth0"); - $this->stringOptionsTest("ftpPort", "-"); - } - - public function testCookie() { - $this->stringOptionsTest("cookie", "mycookie"); - } - - public function testSslCert() { - $this->stringOptionsTest("sslCert", "my.cert"); - } - - public function testSslCertPasswd() { - $this->stringOptionsTest("sslCertPasswd", "mycertpasswd"); - } - - public function testCookieFile() { - $this->stringOptionsTest("cookieFile", "/tmp/cookie.txt"); - } - - public function testCustomRequest() { - $this->stringOptionsTest("customRequest", "PUT"); - $this->stringOptionsTest("customRequest", "DELETE"); - } - - public function testProxy() { - $this->stringOptionsTest("proxy", "myproxy.com"); - } - - public function testInterface() { - $this->stringOptionsTest("interface", "eth0"); - $this->stringOptionsTest("interface", "127.0.0.1"); - $this->stringOptionsTest("interface", "myserver.com"); - } - - public function testKrb4Level() { - $levels = array('clear', 'safe', 'confidential', 'private'); - foreach($levels as $level) { - $this->stringOptionsTest("krb4Level", $level); - } - } - - public function testHttpHeader() { - $header = array("Accept: text/html", "Content-type: text/html; charset=utf-8"); - - $this->curlOption->httpHeader($header); - $this->assertSame($header, $this->curlOption->httpHeader); - } - - public function testQuote() { - $commands = array("PORT", "PASV", "TYPE A"); - - $this->curlOption->quote($commands); - $this->assertSame($commands, $this->curlOption->quote); - } - - public function testPostQuote() { - $commands = array("PORT", "PASV", "TYPE A"); - - $this->curlOption->quote($commands); - $this->assertSame($commands, $this->curlOption->quote); - } - - public function testFile() { - $fp = fopen(TMP_PATH . "file.out", "w"); - - $this->curlOption->file($fp); - $this->assertSame($fp, $this->curlOption->file); - } - - public function testInFile() { - $fp = fopen(TMP_PATH . "file.out", "r"); - - $this->curlOption->inFile($fp); - $this->assertSame($fp, $this->curlOption->inFile); - } - - public function testWriteHeader() { - $callback = array($this, "writeHeaderCallback"); - - $this->curlOption->writeHeader($callback); - $this->assertSame($callback, $this->curlOption->writeHeader); - } - - public function testStdError() { - $fp = fopen(TMP_PATH . "file.err", "w"); - - $this->curlOption->stdError($fp); - $this->assertSame($fp, $this->curlOption->stdError); - } - - public function testIsset() { - $this->assertFalse(isset($this->curlOption->url)); - $this->curlOption->url("http://www.google.com.br"); - $this->assertTrue(isset($this->curlOption->url)); - } - - public function testGetForExecute() { - $this->curlOption->url("http://www.google.com.br"); - - $this->assertSame(array(CURLOPT_URL => "http://www.google.com.br"), $this->curlOption->getForExecute()); - } - - ################## - ## PRIVATE METHODS - ################## - - private function stringOptionsTest($option, $value) { - $this->curlOption->$option($value); - $this->assertSame($value, $this->curlOption->$option); - } - - private function booleanOptionsTests($option) { - $this->curlOption->$option(true); - $this->assertTrue($this->curlOption->$option); - - $this->curlOption->$option(false); - $this->assertFalse($this->curlOption->$option); - } - - private function integerOptionsTests($option, $value) { - $this->curlOption->$option($value); - $this->assertSame($value, $this->curlOption->$option); - } -} +<?php +/* +The MIT License + +Copyright (c) 2008 Rafael S. Souza + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. +*/ + +require_once dirname(__FILE__) . "/../../../config.php"; +require_once VENDOR_PATH . "Joeh/Test/UnitTestCase.php"; +require_once VENDOR_PATH . "Joeh/Net/Curl/Option.php"; + +class Joeh_Net_Curl_OptionTest extends Joeh_Test_UnitTestCase { + + private $curlOption; + + public function setUp() { + $this->curlOption = new Joeh_Net_Curl_Option(); + } + + public function testUrl() { + $this->stringOptionsTest("url", "http://www.w3haus.com.br"); + } + + public function testVerbose() { + $this->booleanOptionsTests("verbose"); + } + + public function testInFileSize() { + $this->integerOptionsTests("lowSpeedLimit", 1024000); + } + + public function testNoProgress() { + $this->booleanOptionsTests("noProgress"); + } + + public function testNobody() { + $this->booleanOptionsTests("nobody"); + } + + public function testFailOnError() { + $this->booleanOptionsTests("failOnError"); + } + + public function testUpload() { + $this->booleanOptionsTests("upload"); + } + + public function testPost() { + $this->booleanOptionsTests("post"); + } + + public function testFtpListOnly() { + $this->booleanOptionsTests("ftpListOnly"); + } + + public function testFtpAppend() { + $this->booleanOptionsTests("ftpAppend"); + } + + public function testNetRc() { + $this->booleanOptionsTests("netRc"); + } + + public function testFollowLocation() { + $this->booleanOptionsTests("followLocation"); + } + + public function testPut() { + $this->booleanOptionsTests("put"); + } + + public function testTimeout() { + $this->integerOptionsTests("lowSpeedLimit", 5); + } + + public function testLowSpeedLimit() { + $this->integerOptionsTests("lowSpeedLimit", 100000); + } + + public function testLowSpeedTime() { + $this->integerOptionsTests("lowSpeedLimit", 10); + } + + public function testResumeFrom() { + $this->integerOptionsTests("lowSpeedLimit", 512); + } + + public function testCaInfo() { + $this->stringOptionsTest("caInfo", "cainfo.file"); + } + + public function testSslVerifyPeer() { + $this->booleanOptionsTests("sslVerifyPeer"); + } + + public function testSslVersion() { + $this->integerOptionsTests("sslVersion", 2); + $this->integerOptionsTests("sslVersion", 3); + } + + public function testSslVerifyHost() { + $this->booleanOptionsTests("sslVerifyHost"); + } + + public function testTimeCondition() { + $this->integerOptionsTests("timeCondition", time()); + } + + public function testTimeValue() { + $this->integerOptionsTests("timeValue", time()); + } + + public function testUserPwd() { + $this->stringOptionsTest("userPwd", "username:password"); + } + + public function testProxyUserPwd() { + $this->stringOptionsTest("proxyUserPwd", "username:password"); + } + + public function testRange() { + $this->stringOptionsTest("range", "100-200"); + $this->stringOptionsTest("range", "100-200,300-400"); + } + + public function testPostFields() { + $this->stringOptionsTest("postFields", "name=joeh&age=23"); + } + + public function testReferer() { + $this->stringOptionsTest("referer", "http://www.google.com.br/?s=php"); + } + + public function testUserAgent() { + $this->stringOptionsTest("userAgent", "JoehBrowser 0.1"); + } + + public function testFtpPort() { + $this->stringOptionsTest("ftpPort", "127.0.0.1"); + $this->stringOptionsTest("ftpPort", "my.server"); + $this->stringOptionsTest("ftpPort", "eth0"); + $this->stringOptionsTest("ftpPort", "-"); + } + + public function testCookie() { + $this->stringOptionsTest("cookie", "mycookie"); + } + + public function testSslCert() { + $this->stringOptionsTest("sslCert", "my.cert"); + } + + public function testSslCertPasswd() { + $this->stringOptionsTest("sslCertPasswd", "mycertpasswd"); + } + + public function testCookieFile() { + $this->stringOptionsTest("cookieFile", "/tmp/cookie.txt"); + } + + public function testCustomRequest() { + $this->stringOptionsTest("customRequest", "PUT"); + $this->stringOptionsTest("customRequest", "DELETE"); + } + + public function testProxy() { + $this->stringOptionsTest("proxy", "myproxy.com"); + } + + public function testInterface() { + $this->stringOptionsTest("interface", "eth0"); + $this->stringOptionsTest("interface", "127.0.0.1"); + $this->stringOptionsTest("interface", "myserver.com"); + } + + public function testKrb4Level() { + $levels = array('clear', 'safe', 'confidential', 'private'); + foreach($levels as $level) { + $this->stringOptionsTest("krb4Level", $level); + } + } + + public function testHttpHeader() { + $header = array("Accept: text/html", "Content-type: text/html; charset=utf-8"); + + $this->curlOption->httpHeader($header); + $this->assertSame($header, $this->curlOption->httpHeader); + } + + public function testQuote() { + $commands = array("PORT", "PASV", "TYPE A"); + + $this->curlOption->quote($commands); + $this->assertSame($commands, $this->curlOption->quote); + } + + public function testPostQuote() { + $commands = array("PORT", "PASV", "TYPE A"); + + $this->curlOption->quote($commands); + $this->assertSame($commands, $this->curlOption->quote); + } + + public function testFile() { + $fp = fopen(TMP_PATH . "file.out", "w"); + + $this->curlOption->file($fp); + $this->assertSame($fp, $this->curlOption->file); + } + + public function testInFile() { + $fp = fopen(TMP_PATH . "file.out", "r"); + + $this->curlOption->inFile($fp); + $this->assertSame($fp, $this->curlOption->inFile); + } + + public function testWriteHeader() { + $callback = array($this, "writeHeaderCallback"); + + $this->curlOption->writeHeader($callback); + $this->assertSame($callback, $this->curlOption->writeHeader); + } + + public function testStdError() { + $fp = fopen(TMP_PATH . "file.err", "w"); + + $this->curlOption->stdError($fp); + $this->assertSame($fp, $this->curlOption->stdError); + } + + public function testIsset() { + $this->assertFalse(isset($this->curlOption->url)); + $this->curlOption->url("http://www.google.com.br"); + $this->assertTrue(isset($this->curlOption->url)); + } + + public function testGetForExecute() { + $this->curlOption->url("http://www.google.com.br"); + + $this->assertSame(array(CURLOPT_URL => "http://www.google.com.br"), $this->curlOption->getForExecute()); + } + + ################## + ## PRIVATE METHODS + ################## + + private function stringOptionsTest($option, $value) { + $this->curlOption->$option($value); + $this->assertSame($value, $this->curlOption->$option); + } + + private function booleanOptionsTests($option) { + $this->curlOption->$option(true); + $this->assertTrue($this->curlOption->$option); + + $this->curlOption->$option(false); + $this->assertFalse($this->curlOption->$option); + } + + private function integerOptionsTests($option, $value) { + $this->curlOption->$option($value); + $this->assertSame($value, $this->curlOption->$option); + } +} ?> \ No newline at end of file tests/Joeh/Net/Curl/OptionTest.php @@ -1,83 +1,83 @@ -<?php -/* -The MIT License - -Copyright (c) 2008 Rafael S. Souza - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. -*/ - -require_once dirname(__FILE__) . "/../../../config.php"; -require_once VENDOR_PATH . "Joeh/Test/UnitTestCase.php"; -require_once VENDOR_PATH . "Joeh/Net/Curl/Response.php"; - -class Joeh_Net_Curl_ResponseTest extends Joeh_Test_UnitTestCase { - - /** - * @var Joeh_Net_Curl_Response $response - */ - private $response; - - public function setUp() { - if($this->getName() != "testInit") { - $this->response = $this->init(); - } - } - - public function testInit() { - $response = $this->init(); - $this->assertTrue($response->hasHeader()); - $this->assertTrue($response->hasBody()); - } - - public function testHttpVersion() { - $this->assertSame("1.1", $this->response->httpVersion()); - } - - public function testStatusCode() { - $this->assertSame(302, $this->response->statusCode()); - } - - public function testLocation() { - $this->assertSame("http://www.google.com.br/", $this->response->location()); - } - - public function testContentType() { - $this->assertSame("text/html; charset=UTF-8", $this->response->contentType()); - } - - public function testBody() { - $this->assertNotNull($this->response->body()); - } - - /** - * @return Joeh_Net_Curl_Response - */ - private function init() { - $ch = curl_init("http://www.google.com"); - curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); - curl_setopt($ch, CURLOPT_HEADER, true); - //curl_setopt($ch, CURLOPT_NOBODY, true); - $response = curl_exec($ch); - curl_close($ch); - - return new Joeh_Net_Curl_Response($response); - } -} +<?php +/* +The MIT License + +Copyright (c) 2008 Rafael S. Souza + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. +*/ + +require_once dirname(__FILE__) . "/../../../config.php"; +require_once VENDOR_PATH . "Joeh/Test/UnitTestCase.php"; +require_once VENDOR_PATH . "Joeh/Net/Curl/Response.php"; + +class Joeh_Net_Curl_ResponseTest extends Joeh_Test_UnitTestCase { + + /** + * @var Joeh_Net_Curl_Response $response + */ + private $response; + + public function setUp() { + if($this->getName() != "testInit") { + $this->response = $this->init(); + } + } + + public function testInit() { + $response = $this->init(); + $this->assertTrue($response->hasHeader()); + $this->assertTrue($response->hasBody()); + } + + public function testHttpVersion() { + $this->assertSame("1.1", $this->response->httpVersion()); + } + + public function testStatusCode() { + $this->assertSame(302, $this->response->statusCode()); + } + + public function testLocation() { + $this->assertSame("http://www.google.com.br/", $this->response->location()); + } + + public function testContentType() { + $this->assertSame("text/html; charset=UTF-8", $this->response->contentType()); + } + + public function testBody() { + $this->assertNotNull($this->response->body()); + } + + /** + * @return Joeh_Net_Curl_Response + */ + private function init() { + $ch = curl_init("http://www.google.com"); + curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); + curl_setopt($ch, CURLOPT_HEADER, true); + //curl_setopt($ch, CURLOPT_NOBODY, true); + $response = curl_exec($ch); + curl_close($ch); + + return new Joeh_Net_Curl_Response($response); + } +} ?> \ No newline at end of file tests/Joeh/Net/Curl/ResponseTest.php @@ -1,64 +1,77 @@ -<?php -/* -The MIT License - -Copyright (c) 2008 Rafael S. Souza - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. -*/ - -require_once dirname(__FILE__) . "/../../config.php"; -require_once VENDOR_PATH . "Joeh/Test/UnitTestCase.php"; -require_once VENDOR_PATH . "Joeh/Net/Curl.php"; - -class Joeh_Net_CurlTest extends Joeh_Test_UnitTestCase { - - - /** - * @var Joeh_Net_Curl $curl - */ - private $curl; - - public function setUp() { - $this->curl = new Joeh_Net_Curl("http://www.google.com"); - } - - public function tearDown() { - $this->curl = null; - } - - public function testInit() { - $this->assertType("resource", $this->curl->getHandle()); - $this->assertSame("http://www.google.com", $this->curl->getOptions()->url); - - $curl = new Joeh_Net_Curl(); - $this->assertType("resource", $curl->getHandle()); - $this->assertNull($curl->getOptions()->url); - } - - public function testExecute() { - $this->assertType("Joeh_Net_Curl_Response", $this->curl->execute()); - } - - public function testUndefinedOption() { - $this->setExpectedException("Joeh_Net_Curl_Exception", "Invalid option - invalidOption"); - $this->curl->invalidOption("invalid value"); - } -} +<?php +/* +The MIT License + +Copyright (c) 2008 Rafael S. Souza + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. +*/ + +require_once dirname(__FILE__) . "/../../config.php"; +require_once VENDOR_PATH . "Joeh/Test/UnitTestCase.php"; +require_once VENDOR_PATH . "Joeh/Net/Curl.php"; + +class Joeh_Net_CurlTest extends Joeh_Test_UnitTestCase { + + + /** + * @var Joeh_Net_Curl $curl + */ + private $curl; + + public function setUp() { + $this->curl = new Joeh_Net_Curl("http://www.google.com"); + } + + public function tearDown() { + $this->curl = null; + } + + public function testInit() { + $this->assertType("resource", $this->curl->getHandle()); + $this->assertSame("http://www.google.com", $this->curl->getOptions()->url); + + $curl = new Joeh_Net_Curl(); + $this->assertType("resource", $curl->getHandle()); + $this->assertNull($curl->getOptions()->url); + } + + public function testExecute() { + $response = $this->curl->execute(); + $this->assertType("Joeh_Net_Curl_Response", $response); + $this->assertTrue($response->hasHeader()); + $this->assertSame(302, $response->statusCode()); + } + + public function testExecuteWithFollowLocationAndOpenBaseDir() { + $response = $this->curl + ->followLocation(true) + ->execute(); + + $this->assertType("Joeh_Net_Curl_Response", $response); + $this->assertTrue($response->hasHeader()); + $this->assertSame(200, $response->statusCode()); + } + + public function testUndefinedOption() { + $this->setExpectedException("Joeh_Net_Curl_Exception", "Invalid option - invalidOption"); + $this->curl->invalidOption("invalid value"); + } +} ?> \ No newline at end of file tests/Joeh/Net/CurlTest.php @@ -1,49 +1,49 @@ -<?php -/* -The MIT License - -Copyright (c) 2008 Rafael S. Souza - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. -*/ - -if(!defined("ROOT_PATH")) { - define("ROOT_PATH", realpath(dirname(__FILE__) . "/../") . "/"); -} -if(!defined("VENDOR_PATH")) { - define("VENDOR_PATH", ROOT_PATH . "lib/"); -} -if(!defined("TEST_PATH")) { - define("TEST_PATH", dirname(__FILE__)); -} -if(!defined("TMP_PATH")) { - define("TMP_PATH", ROOT_PATH . "tmp/"); -} -if(!defined("COVERAGE_PATH")) { - define("COVERAGE_PATH", ROOT_PATH . "coverage/"); -} -if(!defined("LOG_PATH")) { - define("LOG_PATH", dirname(__FILE__) . "/../logs/"); -} -if(!defined('UPLOAD_PATH')) { - define("UPLOAD_PATH", ROOT_PATH . "upload/"); -} - -set_include_path(get_include_path() . PATH_SEPARATOR . VENDOR_PATH); +<?php +/* +The MIT License + +Copyright (c) 2008 Rafael S. Souza + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. +*/ + +if(!defined("ROOT_PATH")) { + define("ROOT_PATH", realpath(dirname(__FILE__) . "/../") . "/"); +} +if(!defined("VENDOR_PATH")) { + define("VENDOR_PATH", ROOT_PATH . "lib/"); +} +if(!defined("TEST_PATH")) { + define("TEST_PATH", dirname(__FILE__)); +} +if(!defined("TMP_PATH")) { + define("TMP_PATH", ROOT_PATH . "tmp/"); +} +if(!defined("COVERAGE_PATH")) { + define("COVERAGE_PATH", ROOT_PATH . "coverage/"); +} +if(!defined("LOG_PATH")) { + define("LOG_PATH", dirname(__FILE__) . "/../logs/"); +} +if(!defined('UPLOAD_PATH')) { + define("UPLOAD_PATH", ROOT_PATH . "upload/"); +} + +set_include_path(get_include_path() . PATH_SEPARATOR . VENDOR_PATH); ?> \ No newline at end of file tests/config.php 03bc320a58ee558f0bd1cd05cf26561d41982cb0 unknown rafael.ssouza@gmail.com http://github.com/rafaelss/joeh-curl/commit/6e372665a418dca8a2c0ddeae1b6091cb867a3d3 6e372665a418dca8a2c0ddeae1b6091cb867a3d3 2008-09-08T11:37:25-07:00 2008-09-08T11:37:25-07:00 handling follow location opt to work with safe_mode/open_basedir 29b66f1b8f47c6da138b17e46ddf230f93d46e50 unknown rafael.ssouza@gmail.com