[Cache] fix warming up cache.system and apcu

This commit is contained in:
Nicolas Grekas 2019-02-21 14:30:53 +01:00
parent 424773da1f
commit b0a85ad015

View File

@ -94,7 +94,7 @@ abstract class AbstractAdapter implements AdapterInterface, CacheInterface, Logg
} }
/** /**
* Returns an ApcuAdapter if supported, a PhpFilesAdapter otherwise. * Returns the best possible adapter that your runtime supports.
* *
* Using ApcuAdapter makes system caches compatible with read-only filesystems. * Using ApcuAdapter makes system caches compatible with read-only filesystems.
* *
@ -108,16 +108,12 @@ abstract class AbstractAdapter implements AdapterInterface, CacheInterface, Logg
*/ */
public static function createSystemCache($namespace, $defaultLifetime, $version, $directory, LoggerInterface $logger = null) public static function createSystemCache($namespace, $defaultLifetime, $version, $directory, LoggerInterface $logger = null)
{ {
if (null === self::$apcuSupported) { $opcache = new PhpFilesAdapter($namespace, $defaultLifetime, $directory, true);
self::$apcuSupported = ApcuAdapter::isSupported(); if (null !== $logger) {
$opcache->setLogger($logger);
} }
if (!self::$apcuSupported) { if (!self::$apcuSupported = self::$apcuSupported ?? ApcuAdapter::isSupported()) {
$opcache = new PhpFilesAdapter($namespace, $defaultLifetime, $directory, true);
if (null !== $logger) {
$opcache->setLogger($logger);
}
return $opcache; return $opcache;
} }
@ -128,7 +124,7 @@ abstract class AbstractAdapter implements AdapterInterface, CacheInterface, Logg
$apcu->setLogger($logger); $apcu->setLogger($logger);
} }
return $apcu; return new ChainAdapter([$apcu, $opcache]);
} }
public static function createConnection($dsn, array $options = []) public static function createConnection($dsn, array $options = [])