tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-06-28 15:39:40 +02:00
Code Issues Projects Releases Wiki Activity

Fix cache used in ModuleManifest

Browse Source
This commit is contained in:
Damian Mooyman 2017-02-26 17:05:25 +13:00
parent c452d5f6cd
commit 3983b4d1b1
1 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/Core/Manifest/ModuleManifest.php
View File

@ -3,8 +3,6 @@
namespace SilverStripe\Core\Manifest;
use LogicException;
use SilverStripe\Core\Cache;
use Zend_Cache_Core;
/**
* A utility class which builds a manifest of configuration items
@ -23,7 +21,7 @@ class ModuleManifest
*
* @var string
*/
protected $key;
protected $cacheKey;
/**
* Whether `test` directories should be searched when searching for configuration
@ -33,7 +31,7 @@ class ModuleManifest
protected $includeTests;
/**
* @var Zend_Cache_Core
* @var ManifestCache
*/
protected $cache;
@ -93,15 +91,14 @@ class ModuleManifest
public function __construct($base, $includeTests = false, $forceRegen = false)
{
$this->base = $base;
$this->key = sha1($base).'_modules';
$this->cacheKey = sha1($base).'_modules';
$this->includeTests = $includeTests;
// Get the Zend Cache to load/store cache into
$this->cache = $this->getCache();
$this->cache = $this->getCache($includeTests);
// Unless we're forcing regen, try loading from cache
if (!$forceRegen) {
$this->modules = $this->cache->load($this->key) ?: [];
$this->modules = $this->cache->load($this->cacheKey) ?: [];
}
if (empty($this->modules)) {
$this->regenerate($includeTests);
@ -110,14 +107,15 @@ class ModuleManifest
/**
* Provides a hook for mock unit tests despite no DI
* @return Zend_Cache_Core
*
* @param bool $includeTests
* @return ManifestCache
*/
protected function getCache()
protected function getCache($includeTests = false)
{
return Cache::factory('SS_Configuration', 'Core', array(
'automatic_serialization' => true,
'lifetime' => null
));
// Cache
$cacheClass = getenv('SS_MANIFESTCACHE') ?: ManifestCache_File::class;
return new $cacheClass('classmanifest'.($includeTests ? '_tests' : ''));
}
/**
@ -165,7 +163,7 @@ class ModuleManifest
$finder->find($this->base);
if ($cache) {
$this->cache->save($this->modules, $this->key);
$this->cache->save($this->modules, $this->cacheKey);
}
}