Set a NullLogger in ApcuAdapter when Apcu is disabled in CLI

iamluc · iamluc · commit 4a01cd85bc19 · 2017-09-26T12:11:06.000+02:00
Same check as in https://github.com/symfony/symfony/pull/23390/files#diff-a5185cd58702e8e073786794a423cb27R112
diff --git a/src/Symfony/Component/Cache/Adapter/AbstractAdapter.php b/src/Symfony/Component/Cache/Adapter/AbstractAdapter.php
@@ -116,7 +116,7 @@ public static function createSystemCache($namespace, $defaultLifetime, $version,
         }
 
         $apcu = new ApcuAdapter($namespace, (int) $defaultLifetime / 5, $version);
-        if ('cli' === PHP_SAPI && !ini_get('apc.enable_cli')) {
+        if ('cli' === \PHP_SAPI && !ini_get('apc.enable_cli')) {
             $apcu->setLogger(new NullLogger());
         } elseif (null !== $logger) {
             $apcu->setLogger($logger);
diff --git a/src/Symfony/Component/PropertyAccess/PropertyAccessor.php b/src/Symfony/Component/PropertyAccess/PropertyAccessor.php
@@ -13,6 +13,7 @@
 
 use Psr\Cache\CacheItemPoolInterface;
 use Psr\Log\LoggerInterface;
+use Psr\Log\NullLogger;
 use Symfony\Component\Cache\Adapter\AdapterInterface;
 use Symfony\Component\Cache\Adapter\ApcuAdapter;
 use Symfony\Component\Cache\Adapter\NullAdapter;
@@ -928,7 +929,9 @@ public static function createCache($namespace, $defaultLifetime, $version, Logge
         }
 
         $apcu = new ApcuAdapter($namespace, $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);
         }
 

Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@ public static function createSystemCache($namespace, $defaultLifetime, $version,`
`116`	`116`	`}`
`117`	`117`
`118`	`118`	`$apcu = new ApcuAdapter($namespace, (int) $defaultLifetime / 5, $version);`
`119`		`- if ('cli' === PHP_SAPI && !ini_get('apc.enable_cli')) {`
	`119`	`+ if ('cli' === \PHP_SAPI && !ini_get('apc.enable_cli')) {`
`120`	`120`	`$apcu->setLogger(new NullLogger());`
`121`	`121`	`} elseif (null !== $logger) {`
`122`	`122`	`$apcu->setLogger($logger);`