diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/config.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/config.html.twig
index da5ac20a03..cdb7b8fbc3 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/config.html.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/config.html.twig
@@ -171,6 +171,10 @@
APC |
{{ collector.hasapc ? 'enabled' : 'disabled' }} |
+
+ Zend OPcache |
+ {{ collector.haszendopcache ? 'enabled' : 'disabled' }} |
+
EAccelerator |
{{ collector.haseaccelerator ? 'enabled' : 'disabled' }} |
diff --git a/src/Symfony/Component/HttpKernel/DataCollector/ConfigDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/ConfigDataCollector.php
index 9475431816..47529fd190 100644
--- a/src/Symfony/Component/HttpKernel/DataCollector/ConfigDataCollector.php
+++ b/src/Symfony/Component/HttpKernel/DataCollector/ConfigDataCollector.php
@@ -56,21 +56,22 @@ class ConfigDataCollector extends DataCollector
public function collect(Request $request, Response $response, \Exception $exception = null)
{
$this->data = array(
- 'app_name' => $this->name,
- 'app_version' => $this->version,
- 'token' => $response->headers->get('X-Debug-Token'),
- 'symfony_version' => Kernel::VERSION,
- 'name' => isset($this->kernel) ? $this->kernel->getName() : 'n/a',
- 'env' => isset($this->kernel) ? $this->kernel->getEnvironment() : 'n/a',
- 'debug' => isset($this->kernel) ? $this->kernel->isDebug() : 'n/a',
- 'php_version' => PHP_VERSION,
- 'xdebug_enabled' => extension_loaded('xdebug'),
- 'eaccel_enabled' => extension_loaded('eaccelerator') && ini_get('eaccelerator.enable'),
- 'apc_enabled' => extension_loaded('apc') && ini_get('apc.enabled'),
- 'xcache_enabled' => extension_loaded('xcache') && ini_get('xcache.cacher'),
- 'wincache_enabled' => extension_loaded('wincache') && ini_get('wincache.ocenabled'),
- 'bundles' => array(),
- 'sapi_name' => php_sapi_name()
+ 'app_name' => $this->name,
+ 'app_version' => $this->version,
+ 'token' => $response->headers->get('X-Debug-Token'),
+ 'symfony_version' => Kernel::VERSION,
+ 'name' => isset($this->kernel) ? $this->kernel->getName() : 'n/a',
+ 'env' => isset($this->kernel) ? $this->kernel->getEnvironment() : 'n/a',
+ 'debug' => isset($this->kernel) ? $this->kernel->isDebug() : 'n/a',
+ 'php_version' => PHP_VERSION,
+ 'xdebug_enabled' => extension_loaded('xdebug'),
+ 'eaccel_enabled' => extension_loaded('eaccelerator') && ini_get('eaccelerator.enable'),
+ 'apc_enabled' => extension_loaded('apc') && ini_get('apc.enabled'),
+ 'xcache_enabled' => extension_loaded('xcache') && ini_get('xcache.cacher'),
+ 'wincache_enabled' => extension_loaded('wincache') && ini_get('wincache.ocenabled'),
+ 'zend_opcache_enabled' => extension_loaded('Zend OPcache') && ini_get('opcache.enable'),
+ 'bundles' => array(),
+ 'sapi_name' => php_sapi_name()
);
if (isset($this->kernel)) {
@@ -180,6 +181,16 @@ class ConfigDataCollector extends DataCollector
return $this->data['apc_enabled'];
}
+ /**
+ * Returns true if Zend OPcache is enabled
+ *
+ * @return Boolean true if Zend OPcache is enabled, false otherwise
+ */
+ public function hasZendOpcache()
+ {
+ return $this->data['zend_opcache_enabled'];
+ }
+
/**
* Returns true if XCache is enabled.
*
@@ -207,7 +218,7 @@ class ConfigDataCollector extends DataCollector
*/
public function hasAccelerator()
{
- return $this->hasApc() || $this->hasEAccelerator() || $this->hasXCache() || $this->hasWinCache();
+ return $this->hasApc() || $this->hasZendOpcache() || $this->hasEAccelerator() || $this->hasXCache() || $this->hasWinCache();
}
public function getBundles()
diff --git a/src/Symfony/Component/HttpKernel/Tests/DataCollector/ConfigDataCollectorTest.php b/src/Symfony/Component/HttpKernel/Tests/DataCollector/ConfigDataCollectorTest.php
index 5a0166d39e..192c8083e0 100644
--- a/src/Symfony/Component/HttpKernel/Tests/DataCollector/ConfigDataCollectorTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/DataCollector/ConfigDataCollectorTest.php
@@ -53,6 +53,8 @@ class ConfigDataCollectorTest extends \PHPUnit_Framework_TestCase
||
(extension_loaded('apc') && ini_get('apc.enabled'))
||
+ (extension_loaded('Zend OPcache') && ini_get('opcache.enable'))
+ ||
(extension_loaded('xcache') && ini_get('xcache.cacher'))
||
(extension_loaded('wincache') && ini_get('wincache.ocenabled')))) {