OilfieldToolsNet/shlink
4
0
Fork 0
mirror of https://github.com/shlinkio/shlink.git synced 2024-12-23 07:33:58 -06:00
Code Issues Packages Projects Releases Wiki Activity

Improved CacheFactory so that adapter can be set in config

Browse Source
This commit is contained in:
Alejandro Celaya 2016-08-01 20:16:13 +02:00
parent 30988b10d1
commit 7b98527f2e
3 changed files with 49 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
module/Common/config/middleware-pipeline.config.php
View File

@ -11,4 +11,5 @@ return [
'priority' => 5, 'priority' => 5,
], ],
], ],
]; ];

17
module/Common/src/Factory/CacheFactory.php
View File

@ -11,6 +11,11 @@ use Zend\ServiceManager\Factory\FactoryInterface;
class CacheFactory implements FactoryInterface class CacheFactory implements FactoryInterface
{ {
const VALID_CACHE_ADAPTERS = [
ApcuCache::class,
ArrayCache::class,
];
/** /**
* Create an object * Create an object
* *
@ -25,6 +30,16 @@ class CacheFactory implements FactoryInterface
*/ */
public function __invoke(ContainerInterface $container, $requestedName, array $options = null) public function __invoke(ContainerInterface $container, $requestedName, array $options = null)
{ {
return env('APP_ENV', 'dev') === 'pro' ? new ApcuCache() : new ArrayCache(); // Try to get the adapter from config
$config = $container->get('config');
if (isset($config['cache'])
&& isset($config['cache']['adapter'])
&& in_array($config['cache']['adapter'], self::VALID_CACHE_ADAPTERS)
) {
return new $config['cache']['adapter']();
}
// If the adapter has not been set in config, create one based on environment
return env('APP_ENV', 'pro') === 'pro' ? new ApcuCache() : new ArrayCache();
} }
} }

34
module/Common/test/Factory/CacheFactoryTest.php
View File

@ -3,6 +3,7 @@ namespace ShlinkioTest\Shlink\Common\Factory;
use Doctrine\Common\Cache\ApcuCache; use Doctrine\Common\Cache\ApcuCache;
use Doctrine\Common\Cache\ArrayCache; use Doctrine\Common\Cache\ArrayCache;
use Doctrine\Common\Cache\FilesystemCache;
use PHPUnit_Framework_TestCase as TestCase; use PHPUnit_Framework_TestCase as TestCase;
use Shlinkio\Shlink\Common\Factory\CacheFactory; use Shlinkio\Shlink\Common\Factory\CacheFactory;
use Zend\ServiceManager\ServiceManager; use Zend\ServiceManager\ServiceManager;
@ -30,7 +31,7 @@ class CacheFactoryTest extends TestCase
public function productionReturnsApcAdapter() public function productionReturnsApcAdapter()
{ {
putenv('APP_ENV=pro'); putenv('APP_ENV=pro');
$instance = $this->factory->__invoke(new ServiceManager(), ''); $instance = $this->factory->__invoke($this->createSM(), '');
$this->assertInstanceOf(ApcuCache::class, $instance); $this->assertInstanceOf(ApcuCache::class, $instance);
} }
@ -40,7 +41,36 @@ class CacheFactoryTest extends TestCase
public function developmentReturnsArrayAdapter() public function developmentReturnsArrayAdapter()
{ {
putenv('APP_ENV=dev'); putenv('APP_ENV=dev');
$instance = $this->factory->__invoke(new ServiceManager(), ''); $instance = $this->factory->__invoke($this->createSM(), '');
$this->assertInstanceOf(ArrayCache::class, $instance); $this->assertInstanceOf(ArrayCache::class, $instance);
} }
/**
* @test
*/
public function adapterDefinedInConfigIgnoresEnvironment()
{
putenv('APP_ENV=pro');
$instance = $this->factory->__invoke($this->createSM(ArrayCache::class), '');
$this->assertInstanceOf(ArrayCache::class, $instance);
}
/**
* @test
*/
public function invalidAdapterDefinedInConfigFallbacksToEnvironment()
{
putenv('APP_ENV=pro');
$instance = $this->factory->__invoke($this->createSM(FilesystemCache::class), '');
$this->assertInstanceOf(ApcuCache::class, $instance);
}
private function createSM($cacheAdapter = null)
{
return new ServiceManager(['services' => [
'config' => isset($cacheAdapter) ? [
'cache' => ['adapter' => $cacheAdapter],
] : [],
]]);
}
} }