tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch '4.6' into 4

Browse Source
This commit is contained in:
Steve Boyd 2020-08-05 10:52:49 +12:00
commit 65c3295917
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/Dev/Install/DatabaseAdapterRegistry.php
View File

@ -164,9 +164,17 @@ class DatabaseAdapterRegistry implements Flushable
if (isset($_GET['flush'])) { if (isset($_GET['flush'])) {
static::flush(); static::flush();
} }
$cache = static::getCache(); try {
$cache = static::getCache();
} catch (\LogicException $e) {
// This try/catch statement is here rather than in getCache() for semver
// A LogicException may be thrown from `Symfony\Component\Finder\Finder::getIterator()`
// if the config manifest is empty. There are some edge cases where this can happen, for instance
// running `sspak save` on a fresh install without ?flush
$cache = null;
}
$key = __FUNCTION__; $key = __FUNCTION__;
if ($cache->has($key)) { if ($cache && $cache->has($key)) {
return (array) $cache->get($key); return (array) $cache->get($key);
} else { } else {
try { try {
@ -174,11 +182,16 @@ class DatabaseAdapterRegistry implements Flushable
} catch (Exception $e) { } catch (Exception $e) {
$paths = []; $paths = [];
} }
$cache->set($key, $paths); if ($cache) {
$cache->set($key, $paths);
}
return $paths; return $paths;
} }
} }
/**
* @return CacheInterface
*/
public static function getCache(): CacheInterface public static function getCache(): CacheInterface
{ {
return Injector::inst()->get(CacheInterface::class . '.DatabaseAdapterRegistry'); return Injector::inst()->get(CacheInterface::class . '.DatabaseAdapterRegistry');