mirror_php/guzzle
1
0
Fork 0
mirror of https://github.com/guzzle/guzzle.git synced 2025-02-16 05:44:37 +01:00
Code Issues Releases Wiki Activity

[Service] Removing extraneous code from Guzzle\Service\ServiceBuilder

Browse Source
This commit is contained in:
Michael Dowling 2011-03-28 00:10:12 -05:00
parent d081e30d59
commit 1dce958700
2 changed files with 2 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
library/Guzzle/Service/ServiceBuilder.php
View File

@ -26,26 +26,14 @@ class ServiceBuilder
*/ */
protected $clients = array(); protected $clients = array();
/**
* @var CacheAdapterInterface Cache adapter to use for Service caching
*/
protected $cache;
/**
* @var int Cache entry TTL
*/
protected $ttl;
/** /**
* Create a new ServiceBuilder using an XML configuration file to configure * Create a new ServiceBuilder using an XML configuration file to configure
* the registered ServiceBuilder builder objects * the registered ServiceBuilder builder objects
* *
* @param string $filename Full path to the XML configuration file * @param string $filename Full path to the XML configuration file
* @param CacheAdapterInterface $cacheAdapter (optional) Pass a cache * @param CacheAdapterInterface $cacheAdapter (optional) Pass a cache
* adapter to cache the service configuration settings loaded from the * adapter to cache the XML service configuration settings
* XML and to cache dynamically built services. * @param int $ttl (optional) How long to cache the parsed XML data
* @param int $ttl (optional) How long to cache items in the cache
* adapter (defaults to 24 hours).
* *
* @return ServiceBuilder * @return ServiceBuilder
* @throws RuntimeException if the file cannot be openend * @throws RuntimeException if the file cannot be openend
@ -108,10 +96,6 @@ class ServiceBuilder
} }
$builder = new self($config); $builder = new self($config);
if ($cacheAdapter) {
// Always share the cache
$builder->setCache($cacheAdapter, $ttl);
}
return $builder; return $builder;
} }
@ -129,27 +113,6 @@ class ServiceBuilder
$this->builderConfig = $serviceBuilderConfig; $this->builderConfig = $serviceBuilderConfig;
} }
/**
* Set the CacheAdapter to pass to generated builders which will allow the
* builders to access the CacheAdapter. This is helpul for speeding up
* the process of parsing and loading dynamically generated clients.
*
* @param CacheAdapterInterface $cacheAdapter (optional) Pass a cache
* adapter to cache the service configuration settings loaded from the
* XML and to cache dynamically built services.
* @param int $ttl (optional) How long to cache items in the cache
* adapter (defaults to 24 hours).
*
* @return ServiceBuilder
*/
public function setCache(CacheAdapterInterface $cacheAdapter, $ttl = 86400)
{
$this->cache = $cacheAdapter;
$this->ttl = $ttl ?: 86400;
return $this;
}
/** /**
* Get a client using a registered builder * Get a client using a registered builder
* *

4
tests/Guzzle/Tests/Service/ServiceBuilderTest.php
View File

@ -105,7 +105,6 @@ EOT;
/** /**
* @covers Guzzle\Service\ServiceBuilder::factory * @covers Guzzle\Service\ServiceBuilder::factory
* @covers Guzzle\Service\ServiceBuilder::setCache
* @covers Guzzle\Service\ServiceBuilder * @covers Guzzle\Service\ServiceBuilder
*/ */
public function testFactoryUsesCacheAdapterWhenAvailable() public function testFactoryUsesCacheAdapterWhenAvailable()
@ -124,9 +123,6 @@ EOT;
$builder = ServiceBuilder::factory($this->tempFile); $builder = ServiceBuilder::factory($this->tempFile);
$this->assertEquals($s1, $s2); $this->assertEquals($s1, $s2);
$this->assertSame($s1, $s1->setCache($adapter, 86400));
$client = $s1->get('michael.mock');
} }
/** /**