Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Updated the "PHP config" panel in the profiler #20697

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.

Sign up for GitHub

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
wants to merge 4 commits into from
Closed

Updated the "PHP config" panel in the profiler #20697

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f12aff6
Updated the "PHP config" panel in the profiler
javiereguiluz Nov 30, 2016
921b8ff
Updated tests
javiereguiluz Nov 30, 2016
29f6259
Renamed "locale" to "Intl locale"
javiereguiluz Nov 30, 2016
5a7f20a
Check "APCu" instead of "APC"
javiereguiluz Nov 30, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Renamed "locale" to "Intl locale"
  • Loading branch information
@javiereguiluz
javiereguiluz committed Nov 30, 2016
commit 29f625977bb90ee899dc1b2dd665d32efa1ac23f
4 changes: 2 additions & 2 deletions 4 src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/config.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,8 +197,8 @@
</div>

<div class="metric">
<span class="value">{{ collector.phplocale }}</span>
<span class="label">Locale</span>
<span class="value">{{ collector.phpintllocale }}</span>
<span class="label">Intl locale</span>
</div>

<div class="metric">
Expand Down
6 changes: 3 additions & 3 deletions 6 src/Symfony/Component/HttpKernel/DataCollector/ConfigDataCollector.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ public function collect(Request $request, Response $response, \Exception $except
'debug' => isset($this->kernel) ? $this->kernel->isDebug() : 'n/a',
'php_version' => PHP_VERSION,
'php_architecture' => PHP_INT_SIZE * 8,
'php_locale' => \Locale::getDefault() ?: 'n/a',
'php_intl_locale' => \Locale::getDefault() ?: 'n/a',
'php_timezone' => date_default_timezone_get(),
'xdebug_enabled' => extension_loaded('xdebug'),
'apc_enabled' => extension_loaded('apc') && ini_get('apc.enabled'),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We could even drop the case of APC here, because APC does not have its opcode caching features anymore on PHP 5.5+ (as it can only be installed thanks to the BC layer of APCu)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In 5a7f20a I've changed this to only check for APCu. Is that a better idea or should we remove this APC check entirely? Thanks!

Copy link
Contributor

@robfrawley robfrawley Dec 3, 2016 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@javiereguiluz I'd prefer to retain APCu check (but not APC-original, as removed in 5a7f20a)

Expand Down Expand Up @@ -147,9 +147,9 @@ public function getPhpArchitecture()
/**
* @return string
*/
public function getPhpLocale()
public function getPhpIntlLocale()
{
return $this->data['php_locale'];
return $this->data['php_intl_locale'];
}

/**
Expand Down
2 changes: 1 addition & 1 deletion 2 src/Symfony/Component/HttpKernel/Tests/DataCollector/ConfigDataCollectorTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public function testCollect()
$this->assertSame('testkernel', $c->getAppName());
$this->assertSame(PHP_VERSION, $c->getPhpVersion());
$this->assertSame(PHP_INT_SIZE * 8, $c->getPhpArchitecture());
$this->assertSame(\Locale::getDefault() ?: 'n/a', $c->getPhpLocale());
$this->assertSame(\Locale::getDefault() ?: 'n/a', $c->getPhpIntlLocale());
$this->assertSame(date_default_timezone_get(), $c->getPhpTimezone());
$this->assertSame(Kernel::VERSION, $c->getSymfonyVersion());
$this->assertNull($c->getToken());
Expand Down
Morty Proxy This is a proxified and sanitized view of the page, visit original site.