bug #23091 [Cache] ApcuAdapter::isSupported() should return true when apc.enable_cli=Off (nicolas-grekas)

fabpot · fabpot · commit 40beab4a419e · 2017-06-08T17:26:56.000-07:00
This PR was merged into the 3.2 branch. Discussion ---------- [Cache] ApcuAdapter::isSupported() should return true when apc.enable_cli=Off | Q | A | ------------- | --- | Branch? | 3.2 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - By being sensitive to apc.enable_cli, CLI cache warmup is broken when the setting is set to off because a PhpFilesAdapter will be warmed up by the CLI, whereas the Web mode will look at the FilesystemAdapter pools, which will be empty. Commits ------- aadf263 [Cache] APCu isSupported() should return true when apc.enable_cli=Off
diff --git a/src/Symfony/Component/Cache/Adapter/ApcuAdapter.php b/src/Symfony/Component/Cache/Adapter/ApcuAdapter.php
@@ -21,7 +21,7 @@ class ApcuAdapter extends AbstractAdapter
 {
     public static function isSupported()
     {
-        return function_exists('apcu_fetch') && ini_get('apc.enabled') && !('cli' === PHP_SAPI && !ini_get('apc.enable_cli'));
+        return function_exists('apcu_fetch') && ini_get('apc.enabled');
     }
 
     public function __construct($namespace = '', $defaultLifetime = 0, $version = null)
@@ -69,7 +69,7 @@ protected function doHave($id)
      */
     protected function doClear($namespace)
     {
-        return isset($namespace[0]) && class_exists('APCuIterator', false)
+        return isset($namespace[0]) && class_exists('APCuIterator', false) && ('cli' !== PHP_SAPI || ini_get('apc.enable_cli'))
             ? apcu_delete(new \APCuIterator(sprintf('/^%s/', preg_quote($namespace, '/')), APC_ITER_KEY))
             : apcu_clear_cache();
     }
diff --git a/src/Symfony/Component/Cache/Adapter/PhpFilesAdapter.php b/src/Symfony/Component/Cache/Adapter/PhpFilesAdapter.php
@@ -26,7 +26,7 @@ class PhpFilesAdapter extends AbstractAdapter
 
     public static function isSupported()
     {
-        return function_exists('opcache_compile_file') && ini_get('opcache.enable');
+        return function_exists('opcache_invalidate') && ini_get('opcache.enable');
     }
 
     public function __construct($namespace = '', $defaultLifetime = 0, $directory = null)
@@ -118,7 +118,7 @@ protected function doSave(array $values, $lifetime)
             $ok = $this->write($file, '<?php return '.var_export($data, true).';') && $ok;
 
             if ($allowCompile) {
-                @opcache_compile_file($file);
+                @opcache_invalidate($file, true);
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ class ApcuAdapter extends AbstractAdapter`
`21`	`21`	`{`
`22`	`22`	`public static function isSupported()`
`23`	`23`	`{`
`24`		`- return function_exists('apcu_fetch') && ini_get('apc.enabled') && !('cli' === PHP_SAPI && !ini_get('apc.enable_cli'));`
	`24`	`+ return function_exists('apcu_fetch') && ini_get('apc.enabled');`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`public function __construct($namespace = '', $defaultLifetime = 0, $version = null)`
`@@ -69,7 +69,7 @@ protected function doHave($id)`
`69`	`69`	`*/`
`70`	`70`	`protected function doClear($namespace)`
`71`	`71`	`{`
`72`		`- return isset($namespace[0]) && class_exists('APCuIterator', false)`
	`72`	`+ return isset($namespace[0]) && class_exists('APCuIterator', false) && ('cli' !== PHP_SAPI \|\| ini_get('apc.enable_cli'))`
`73`	`73`	`? apcu_delete(new \APCuIterator(sprintf('/^%s/', preg_quote($namespace, '/')), APC_ITER_KEY))`
`74`	`74`	`: apcu_clear_cache();`
`75`	`75`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ class PhpFilesAdapter extends AbstractAdapter`
`26`	`26`
`27`	`27`	`public static function isSupported()`
`28`	`28`	`{`
`29`		`- return function_exists('opcache_compile_file') && ini_get('opcache.enable');`
	`29`	`+ return function_exists('opcache_invalidate') && ini_get('opcache.enable');`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`public function __construct($namespace = '', $defaultLifetime = 0, $directory = null)`
`@@ -118,7 +118,7 @@ protected function doSave(array $values, $lifetime)`
`118`	`118`	`$ok = $this->write($file, '<?php return '.var_export($data, true).';') && $ok;`
`119`	`119`
`120`	`120`	`if ($allowCompile) {`
`121`		`- @opcache_compile_file($file);`
	`121`	`+ @opcache_invalidate($file, true);`
`122`	`122`	`}`
`123`	`123`	`}`
`124`	`124`