diff --git a/src/Guzzle/Guzzle.php b/src/Guzzle/Guzzle.php index c3341adf..02a32fb0 100644 --- a/src/Guzzle/Guzzle.php +++ b/src/Guzzle/Guzzle.php @@ -34,7 +34,6 @@ class Guzzle */ public static function getDefaultUserAgent() { - // @codeCoverageIgnoreStart if (!self::$userAgent) { $version = self::getCurlInfo(); self::$userAgent = sprintf('Guzzle/%s (Language=PHP/%s; curl=%s; Host=%s)', @@ -44,8 +43,7 @@ class Guzzle $version['host'] ); } - // @codeCoverageIgnoreEnd - + return self::$userAgent; } @@ -69,14 +67,12 @@ class Guzzle */ public static function getCurlInfo($type = null) { - // @codeCoverageIgnoreStart if (!self::$curl) { self::$curl = curl_version(); // Check if CURLOPT_FOLLOWLOCATION is available self::$curl['follow_location'] = !ini_get('open_basedir'); } - // @codeCoverageIgnoreEnd - + if (!$type) { return self::$curl; } else if (isset(self::$curl[$type])) { diff --git a/tests/Guzzle/Tests/GuzzleTest.php b/tests/Guzzle/Tests/GuzzleTest.php index e02a2db2..a8289bbc 100644 --- a/tests/Guzzle/Tests/GuzzleTest.php +++ b/tests/Guzzle/Tests/GuzzleTest.php @@ -19,11 +19,10 @@ class GuzzleTest extends GuzzleTestCase */ public function testGetDefaultUserAgent() { + Guzzle::reset(); $version = curl_version(); $agent = sprintf('Guzzle/%s (Language=PHP/%s; curl=%s; Host=%s)', Guzzle::VERSION, \PHP_VERSION, $version['version'], $version['host']); - $this->assertEquals($agent, Guzzle::getDefaultUserAgent()); - // Get it from cache this time $this->assertEquals($agent, Guzzle::getDefaultUserAgent()); } @@ -34,7 +33,6 @@ class GuzzleTest extends GuzzleTestCase public function testGetHttpDate() { $fmt = 'D, d M Y H:i:s \G\M\T'; - $this->assertEquals(gmdate($fmt), Guzzle::getHttpDate('now')); $this->assertEquals(gmdate($fmt), Guzzle::getHttpDate(strtotime('now'))); $this->assertEquals(gmdate($fmt, strtotime('+1 day')), Guzzle::getHttpDate('+1 day')); @@ -76,10 +74,13 @@ class GuzzleTest extends GuzzleTestCase */ public function testCachesCurlInfo() { + Guzzle::reset(); $c = curl_version(); - $this->assertInternalType('array', Guzzle::getCurlInfo()); + $info = Guzzle::getCurlInfo(); + $this->assertInternalType('array', $info); $this->assertEquals(false, Guzzle::getCurlInfo('ewfewfewfe')); $this->assertEquals($c['version'], Guzzle::getCurlInfo('version')); + $this->assertSame(Guzzle::getCurlInfo(), $info); } /**