-
-
Notifications
You must be signed in to change notification settings - Fork 9.6k
Extract the profiler to a new component #10374
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Closed
Closed
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -11,235 +11,9 @@ | |
|
|
||
| namespace Symfony\Component\HttpKernel\DataCollector; | ||
|
|
||
| use Symfony\Component\HttpKernel\KernelInterface; | ||
| use Symfony\Component\HttpKernel\Kernel; | ||
| use Symfony\Component\HttpFoundation\Request; | ||
| use Symfony\Component\HttpFoundation\Response; | ||
|
|
||
| /** | ||
| * ConfigDataCollector. | ||
| * | ||
| * @author Fabien Potencier <[email protected]> | ||
| * @deprecated Deprecated in 2.5, to be removed in 3.0. Use the HttpProfiler component instead. | ||
| */ | ||
| class ConfigDataCollector extends DataCollector | ||
| class ConfigDataCollector extends \Symfony\Component\HttpProfiler\DataCollector\ConfigDataCollector | ||
| { | ||
| private $kernel; | ||
| private $name; | ||
| private $version; | ||
|
|
||
| /** | ||
| * Constructor. | ||
| * | ||
| * @param string $name The name of the application using the web profiler | ||
| * @param string $version The version of the application using the web profiler | ||
| */ | ||
| public function __construct($name = null, $version = null) | ||
| { | ||
| $this->name = $name; | ||
| $this->version = $version; | ||
| } | ||
|
|
||
| /** | ||
| * Sets the Kernel associated with this Request. | ||
| * | ||
| * @param KernelInterface $kernel A KernelInterface instance | ||
| */ | ||
| public function setKernel(KernelInterface $kernel = null) | ||
| { | ||
| $this->kernel = $kernel; | ||
| } | ||
|
|
||
| /** | ||
| * {@inheritdoc} | ||
| */ | ||
| 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'), | ||
| 'zend_opcache_enabled' => extension_loaded('Zend OPcache') && ini_get('opcache.enable'), | ||
| 'bundles' => array(), | ||
| 'sapi_name' => php_sapi_name() | ||
| ); | ||
|
|
||
| if (isset($this->kernel)) { | ||
| foreach ($this->kernel->getBundles() as $name => $bundle) { | ||
| $this->data['bundles'][$name] = $bundle->getPath(); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| public function getApplicationName() | ||
| { | ||
| return $this->data['app_name']; | ||
| } | ||
|
|
||
| public function getApplicationVersion() | ||
| { | ||
| return $this->data['app_version']; | ||
| } | ||
|
|
||
| /** | ||
| * Gets the token. | ||
| * | ||
| * @return string The token | ||
| */ | ||
| public function getToken() | ||
| { | ||
| return $this->data['token']; | ||
| } | ||
|
|
||
| /** | ||
| * Gets the Symfony version. | ||
| * | ||
| * @return string The Symfony version | ||
| */ | ||
| public function getSymfonyVersion() | ||
| { | ||
| return $this->data['symfony_version']; | ||
| } | ||
|
|
||
| /** | ||
| * Gets the PHP version. | ||
| * | ||
| * @return string The PHP version | ||
| */ | ||
| public function getPhpVersion() | ||
| { | ||
| return $this->data['php_version']; | ||
| } | ||
|
|
||
| /** | ||
| * Gets the application name. | ||
| * | ||
| * @return string The application name | ||
| */ | ||
| public function getAppName() | ||
| { | ||
| return $this->data['name']; | ||
| } | ||
|
|
||
| /** | ||
| * Gets the environment. | ||
| * | ||
| * @return string The environment | ||
| */ | ||
| public function getEnv() | ||
| { | ||
| return $this->data['env']; | ||
| } | ||
|
|
||
| /** | ||
| * Returns true if the debug is enabled. | ||
| * | ||
| * @return Boolean true if debug is enabled, false otherwise | ||
| */ | ||
| public function isDebug() | ||
| { | ||
| return $this->data['debug']; | ||
| } | ||
|
|
||
| /** | ||
| * Returns true if the XDebug is enabled. | ||
| * | ||
| * @return Boolean true if XDebug is enabled, false otherwise | ||
| */ | ||
| public function hasXDebug() | ||
| { | ||
| return $this->data['xdebug_enabled']; | ||
| } | ||
|
|
||
| /** | ||
| * Returns true if EAccelerator is enabled. | ||
| * | ||
| * @return Boolean true if EAccelerator is enabled, false otherwise | ||
| */ | ||
| public function hasEAccelerator() | ||
| { | ||
| return $this->data['eaccel_enabled']; | ||
| } | ||
|
|
||
| /** | ||
| * Returns true if APC is enabled. | ||
| * | ||
| * @return Boolean true if APC is enabled, false otherwise | ||
| */ | ||
| public function hasApc() | ||
| { | ||
| 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. | ||
| * | ||
| * @return Boolean true if XCache is enabled, false otherwise | ||
| */ | ||
| public function hasXCache() | ||
| { | ||
| return $this->data['xcache_enabled']; | ||
| } | ||
|
|
||
| /** | ||
| * Returns true if WinCache is enabled. | ||
| * | ||
| * @return Boolean true if WinCache is enabled, false otherwise | ||
| */ | ||
| public function hasWinCache() | ||
| { | ||
| return $this->data['wincache_enabled']; | ||
| } | ||
|
|
||
| /** | ||
| * Returns true if any accelerator is enabled. | ||
| * | ||
| * @return Boolean true if any accelerator is enabled, false otherwise | ||
| */ | ||
| public function hasAccelerator() | ||
| { | ||
| return $this->hasApc() || $this->hasZendOpcache() || $this->hasEAccelerator() || $this->hasXCache() || $this->hasWinCache(); | ||
| } | ||
|
|
||
| public function getBundles() | ||
| { | ||
| return $this->data['bundles']; | ||
| } | ||
|
|
||
| /** | ||
| * Gets the PHP SAPI name. | ||
| * | ||
| * @return string The environment | ||
| */ | ||
| public function getSapiName() | ||
| { | ||
| return $this->data['sapi_name']; | ||
| } | ||
|
|
||
| /** | ||
| * {@inheritdoc} | ||
| */ | ||
| public function getName() | ||
| { | ||
| return 'config'; | ||
| } | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
you should make these deprecated class implement the deprecated
DataCollectorInterfaceas well to provide BC