symfony
diff --git a/‎src/Symfony/Component/Cache/Adapter/AbstractAdapter.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Cache/Adapter/AbstractAdapter.php
+4-1Lines changed: 4 additions & 1 deletion b/‎src/Symfony/Component/Cache/Adapter/AbstractAdapter.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Cache/Adapter/AbstractAdapter.php
+4-1Lines changed: 4 additions & 1 deletion
diff --git a/‎src/Symfony/Component/Cache/Adapter/ApcuAdapter.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Cache/Adapter/ApcuAdapter.php
+2-2Lines changed: 2 additions & 2 deletions b/‎src/Symfony/Component/Cache/Adapter/ApcuAdapter.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Cache/Adapter/ApcuAdapter.php
+2-2Lines changed: 2 additions & 2 deletions
@@ -15,6 +15,7 @@
 use Psr\Log\LoggerAwareInterface;
 use Psr\Log\LoggerAwareTrait;
 use Psr\Log\LoggerInterface;
+use Psr\Log\NullLogger;
 use Symfony\Component\Cache\CacheItem;
 use Symfony\Component\Cache\Exception\InvalidArgumentException;
 
@@ -108,7 +109,9 @@ public static function createSystemCache($namespace, $defaultLifetime, $version,
         }
 
         $apcu = new ApcuAdapter($namespace, (int) $defaultLifetime / 5, $version);
-        if (null !== $logger) {
+        if ('cli' === PHP_SAPI && !ini_get('apc.enable_cli')) {
+            $apcu->setLogger(new NullLogger());
+        } elseif (null !== $logger) {
             $apcu->setLogger($logger);
         }
 
 
@@ -50,7 +50,7 @@ public function __construct($namespace = '', $defaultLifetime = 0, $version = nu
     protected function doFetch(array $ids)
     {
         try {
-            return apcu_fetch($ids);
+            return apcu_fetch($ids) ?: array();
         } catch (\Error $e) {
             throw new \ErrorException($e->getMessage(), $e->getCode(), E_ERROR, $e->getFile(), $e->getLine());
         }
@@ -92,7 +92,7 @@ protected function doDelete(array $ids)
     protected function doSave(array $values, $lifetime)
     {
         try {
-            return array_keys(apcu_store($values, null, $lifetime));
+            return array_keys(apcu_store($values, null, $lifetime) ?: $values);
         } catch (\Error $e) {
         } catch (\Exception $e) {
         }
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ public function __construct($namespace = '', $defaultLifetime = 0, $version = nu`
`50`	`50`	`protected function doFetch(array $ids)`
`51`	`51`	`{`
`52`	`52`	`try {`
`53`		`- return apcu_fetch($ids);`
	`53`	`+ return apcu_fetch($ids) ?: array();`
`54`	`54`	`} catch (\Error $e) {`
`55`	`55`	`throw new \ErrorException($e->getMessage(), $e->getCode(), E_ERROR, $e->getFile(), $e->getLine());`
`56`	`56`	`}`
`@@ -92,7 +92,7 @@ protected function doDelete(array $ids)`
`92`	`92`	`protected function doSave(array $values, $lifetime)`
`93`	`93`	`{`
`94`	`94`	`try {`
`95`		`- return array_keys(apcu_store($values, null, $lifetime));`
	`95`	`+ return array_keys(apcu_store($values, null, $lifetime) ?: $values);`
`96`	`96`	`} catch (\Error $e) {`
`97`	`97`	`} catch (\Exception $e) {`
`98`	`98`	`}`