mirror_php/guzzle
1
0
Fork 0
mirror of https://github.com/guzzle/guzzle.git synced 2025-02-25 18:43:22 +01:00
Code Issues Releases Wiki Activity

Removing @ error suppression from CurlHandle and instead checking if the handle is a resource before doing any curl related calls. Making the JsonDescriptionBuilder more readable.

Browse Source
This commit is contained in:
Michael Dowling 2012-01-24 14:56:04 -06:00
parent 53a2bf791c
commit dc22f479d0
2 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/Guzzle/Http/Curl/CurlHandle.php
View File

@ -170,7 +170,9 @@ class CurlHandle
*/
public function close()
{
@curl_close($this->handle);
if (is_resource($this->handle)) {
curl_close($this->handle);
}
$this->handle = null;
}
@ -181,7 +183,7 @@ class CurlHandle
*/
public function isAvailable()
{
return false != @curl_getinfo($this->handle, CURLINFO_EFFECTIVE_URL);
return is_resource($this->handle) && false != curl_getinfo($this->handle, CURLINFO_EFFECTIVE_URL);
}
/**
@ -191,7 +193,7 @@ class CurlHandle
*/
public function getError()
{
return @curl_error($this->handle) ?: '';
return $this->isAvailable() ? curl_error($this->handle) : '';
}
/**
@ -201,7 +203,11 @@ class CurlHandle
*/
public function getErrorNo()
{
return $this->errorNo ?: @curl_errno($this->handle);
if ($this->errorNo) {
return $this->errorNo;
}
return $this->isAvailable() ? curl_errno($this->handle) : 0;
}
/**
@ -228,11 +234,15 @@ class CurlHandle
*/
public function getInfo($option = null)
{
if (null !== $option) {
return @curl_getinfo($this->handle, $option) ?: null;
} else {
return @curl_getinfo($this->handle) ?: array();
if (!is_resource($this->handle)) {
return null;
}
if (null !== $option) {
return curl_getinfo($this->handle, $option) ?: null;
}
return curl_getinfo($this->handle) ?: array();
}
/**

3
src/Guzzle/Service/Description/JsonDescriptionBuilder.php
View File

@ -9,7 +9,8 @@ class JsonDescriptionBuilder implements DescriptionBuilderInterface
{
public static function parseJsonFile($jsonFile)
{
if (false === $json = file_get_contents($jsonFile)) {
$json = file_get_contents($jsonFile);
if (false === $json) {
throw new \RuntimeException('Error loading data from ' . $jsonFile);
}