GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Renamed HTTPResponse class to StatusNet_HTTPResponse to avoid conflict with PECL HTTP extension.

Browse Source 
The class isn't referenced by name by any other code I can see so this should have no side effects.
This commit is contained in:
Brion Vibber 2010-03-29 15:07:15 -07:00
parent d44e5ac935
commit a8d92dad5e
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/httpclient.php
View File

@ -44,6 +44,9 @@ require_once 'HTTP/Request2/Response.php';
* This extends the HTTP_Request2_Response class with methods to get info * This extends the HTTP_Request2_Response class with methods to get info
* about any followed redirects. * about any followed redirects.
* *
* Originally used the name 'HTTPResponse' to match earlier code, but
* this conflicts with a class in in the PECL HTTP extension.
*
* @category HTTP * @category HTTP
* @package StatusNet * @package StatusNet
* @author Evan Prodromou <evan@status.net> * @author Evan Prodromou <evan@status.net>
@ -51,7 +54,7 @@ require_once 'HTTP/Request2/Response.php';
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://status.net/ * @link http://status.net/
*/ */
class HTTPResponse extends HTTP_Request2_Response class StatusNet_HTTPResponse extends HTTP_Request2_Response
{ {
function __construct(HTTP_Request2_Response $response, $url, $redirects=0) function __construct(HTTP_Request2_Response $response, $url, $redirects=0)
{ {
@ -146,7 +149,7 @@ class HTTPClient extends HTTP_Request2
/** /**
* Convenience function to run a GET request. * Convenience function to run a GET request.
* *
* @return HTTPResponse * @return StatusNet_HTTPResponse
* @throws HTTP_Request2_Exception * @throws HTTP_Request2_Exception
*/ */
public function get($url, $headers=array()) public function get($url, $headers=array())
@ -157,7 +160,7 @@ class HTTPClient extends HTTP_Request2
/** /**
* Convenience function to run a HEAD request. * Convenience function to run a HEAD request.
* *
* @return HTTPResponse * @return StatusNet_HTTPResponse
* @throws HTTP_Request2_Exception * @throws HTTP_Request2_Exception
*/ */
public function head($url, $headers=array()) public function head($url, $headers=array())
@ -171,7 +174,7 @@ class HTTPClient extends HTTP_Request2
* @param string $url * @param string $url
* @param array $headers optional associative array of HTTP headers * @param array $headers optional associative array of HTTP headers
* @param array $data optional associative array or blob of form data to submit * @param array $data optional associative array or blob of form data to submit
* @return HTTPResponse * @return StatusNet_HTTPResponse
* @throws HTTP_Request2_Exception * @throws HTTP_Request2_Exception
*/ */
public function post($url, $headers=array(), $data=array()) public function post($url, $headers=array(), $data=array())
@ -183,7 +186,7 @@ class HTTPClient extends HTTP_Request2
} }
/** /**
* @return HTTPResponse * @return StatusNet_HTTPResponse
* @throws HTTP_Request2_Exception * @throws HTTP_Request2_Exception
*/ */
protected function doRequest($url, $method, $headers) protected function doRequest($url, $method, $headers)
@ -217,12 +220,12 @@ class HTTPClient extends HTTP_Request2
} }
/** /**
* Actually performs the HTTP request and returns an HTTPResponse object * Actually performs the HTTP request and returns a
* with response body and header info. * StatusNet_HTTPResponse object with response body and header info.
* *
* Wraps around parent send() to add logging and redirection processing. * Wraps around parent send() to add logging and redirection processing.
* *
* @return HTTPResponse * @return StatusNet_HTTPResponse
* @throw HTTP_Request2_Exception * @throw HTTP_Request2_Exception
*/ */
public function send() public function send()
@ -265,6 +268,6 @@ class HTTPClient extends HTTP_Request2
} }
break; break;
} while ($maxRedirs); } while ($maxRedirs);
return new HTTPResponse($response, $this->getUrl(), $redirs); return new StatusNet_HTTPResponse($response, $this->getUrl(), $redirs);
} }
} }