will/GeoIP2-php
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Tidying and doc fixes

Browse Source
This commit is contained in:
Gregory Oschwald 2013-10-21 06:18:12 -07:00
parent 234dcaff7c
commit e03b9558a9
13 changed files with 102 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/GeoIp2/Exception/HttpException.php
View File

@ -17,7 +17,7 @@ class HttpException extends GeoIp2Exception
$message, $message,
$httpStatus, $httpStatus,
$uri, $uri,
Exception $previous = null \Exception $previous = null
) { ) {
$this->uri = $uri; $this->uri = $uri;
parent::__construct($message, $httpStatus, $previous); parent::__construct($message, $httpStatus, $previous);

2
src/GeoIp2/Exception/InvalidRequestException.php
View File

@ -18,7 +18,7 @@ class InvalidRequestException extends HttpException
$error, $error,
$httpStatus, $httpStatus,
$uri, $uri,
Exception $previous = null \Exception $previous = null
) { ) {
$this->error = $error; $this->error = $error;
parent::__construct($message, $httpStatus, $uri, $previous); parent::__construct($message, $httpStatus, $uri, $previous);

8
src/GeoIp2/ProviderInterface.php
View File

@ -7,28 +7,28 @@ interface ProviderInterface
/** /**
* @param ipAddress * @param ipAddress
* IPv4 or IPv6 address to lookup. * IPv4 or IPv6 address to lookup.
* @return A Country model for the requested IP address. * @return \GeoIp2\Model\Country A Country model for the requested IP address.
*/ */
public function country($ipAddress); public function country($ipAddress);
/** /**
* @param ipAddress * @param ipAddress
* IPv4 or IPv6 address to lookup. * IPv4 or IPv6 address to lookup.
* @return A City model for the requested IP address. * @return \GeoIp2\Model\City A City model for the requested IP address.
*/ */
public function city($ipAddress); public function city($ipAddress);
/** /**
* @param ipAddress * @param ipAddress
* IPv4 or IPv6 address to lookup. * IPv4 or IPv6 address to lookup.
* @return A CityIspOrg model for the requested IP address. * @return \GeoIp2\Model\CityIspOrg A CityIspOrg model for the requested IP address.
*/ */
public function cityIspOrg($ipAddress); public function cityIspOrg($ipAddress);
/** /**
* @param ipAddress * @param ipAddress
* IPv4 or IPv6 address to lookup. * IPv4 or IPv6 address to lookup.
* @return An Omni model for the requested IP address. * @return \GeoIp2\Model\Omni An Omni model for the requested IP address.
*/ */
public function omni($ipAddress); public function omni($ipAddress);
} }

8
src/GeoIp2/WebService/Client.php
View File

@ -2,15 +2,15 @@
namespace GeoIp2\WebService; namespace GeoIp2\WebService;
use GeoIp2\Exception\GeoIp2Exception;
use GeoIp2\Exception\HttpException;
use GeoIp2\Exception\AddressNotFoundException; use GeoIp2\Exception\AddressNotFoundException;
use GeoIp2\Exception\AuthenticationException; use GeoIp2\Exception\AuthenticationException;
use GeoIp2\Exception\GeoIp2Exception;
use GeoIp2\Exception\HttpException;
use GeoIp2\Exception\InvalidRequestException; use GeoIp2\Exception\InvalidRequestException;
use GeoIp2\Exception\OutOfQueriesException; use GeoIp2\Exception\OutOfQueriesException;
use GeoIp2\ProviderInterface; use GeoIp2\ProviderInterface;
use Guzzle\Http\Client as GuzzleClient;
use Guzzle\Common\Exception\RuntimeException; use Guzzle\Common\Exception\RuntimeException;
use Guzzle\Http\Client as GuzzleClient;
use Guzzle\Http\Exception\ClientErrorResponseException; use Guzzle\Http\Exception\ClientErrorResponseException;
use Guzzle\Http\Exception\ServerErrorResponseException; use Guzzle\Http\Exception\ServerErrorResponseException;
@ -258,8 +258,6 @@ class Client implements ProviderInterface
{ {
$status = $response->getStatusCode(); $status = $response->getStatusCode();
$body = array();
if ($response->getContentLength() > 0) { if ($response->getContentLength() > 0) {
if (strstr($response->getContentType(), 'json')) { if (strstr($response->getContentType(), 'json')) {
try { try {