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

Commit d0acda8

Browse filesBrowse files
TobionTobion
committed
Merge branch '2.8'
Conflicts: CHANGELOG-2.3.md CHANGELOG-2.7.md composer.json src/Symfony/Bridge/Twig/composer.json src/Symfony/Bundle/FrameworkBundle/composer.json src/Symfony/Bundle/SecurityBundle/composer.json src/Symfony/Component/Console/Tests/Helper/LegacyProgressHelperTest.php src/Symfony/Component/Console/Tests/Helper/LegacyTableHelperTest.php src/Symfony/Component/Console/composer.json src/Symfony/Component/DomCrawler/composer.json src/Symfony/Component/Form/Tests/FormRegistryTest.php src/Symfony/Component/Form/composer.json src/Symfony/Component/HttpFoundation/composer.json src/Symfony/Component/HttpKernel/Tests/Profiler/MongoDbProfilerStorageTest.php src/Symfony/Component/Intl/composer.json src/Symfony/Component/Ldap/composer.json src/Symfony/Component/Security/Core/composer.json src/Symfony/Component/Security/Csrf/composer.json src/Symfony/Component/Security/Http/composer.json src/Symfony/Component/Security/composer.json src/Symfony/Component/Serializer/Encoder/JsonEncoder.php src/Symfony/Component/Serializer/composer.json src/Symfony/Component/Templating/PhpEngine.php src/Symfony/Component/Translation/composer.json src/Symfony/Component/VarDumper/Tests/HtmlDumperTest.php src/Symfony/Component/VarDumper/composer.json
2 parents fa78eac + de71e26 commit d0acda8
Copy full SHA for d0acda8

File tree

Expand file treeCollapse file tree

120 files changed

+425
-797
lines changed
Filter options

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Dismiss banner
Expand file treeCollapse file tree

120 files changed

+425
-797
lines changed

‎CONTRIBUTORS.md

Copy file name to clipboardExpand all lines: CONTRIBUTORS.md
+63-36Lines changed: 63 additions & 36 deletions
Large diffs are not rendered by default.

‎composer.json

Copy file name to clipboardExpand all lines: composer.json
+9-4Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,14 @@
2020
"doctrine/common": "~2.4",
2121
"twig/twig": "~1.20|~2.0",
2222
"psr/log": "~1.0",
23-
"paragonie/random_compat": "~1.0"
23+
"symfony/security-acl": "~2.7",
24+
"symfony/polyfill-intl-icu": "~1.0",
25+
"symfony/polyfill-mbstring": "~1.0",
26+
"symfony/polyfill-php54": "~1.0",
27+
"symfony/polyfill-php55": "~1.0",
28+
"symfony/polyfill-php56": "~1.0",
29+
"symfony/polyfill-php70": "~1.0",
30+
"symfony/polyfill-util": "~1.0"
2431
},
2532
"replace": {
2633
"symfony/asset": "self.version",
@@ -93,10 +100,8 @@
93100
"Symfony\\Component\\": "src/Symfony/Component/"
94101
},
95102
"classmap": [
96-
"src/Symfony/Component/HttpFoundation/Resources/stubs",
97103
"src/Symfony/Component/Intl/Resources/stubs"
98-
],
99-
"files": [ "src/Symfony/Component/Intl/Resources/stubs/functions.php" ]
104+
]
100105
},
101106
"minimum-stability": "dev",
102107
"extra": {

‎src/Symfony/Bridge/Doctrine/DataCollector/DoctrineDataCollector.php

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Doctrine/DataCollector/DoctrineDataCollector.php
+3Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,9 @@ private function sanitizeQueries($connectionName, $queries)
117117
private function sanitizeQuery($connectionName, $query)
118118
{
119119
$query['explainable'] = true;
120+
if (null === $query['params']) {
121+
$query['params'] = array();
122+
}
120123
if (!is_array($query['params'])) {
121124
$query['params'] = array($query['params']);
122125
}

‎src/Symfony/Bridge/Doctrine/Form/DoctrineOrmTypeGuesser.php

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Doctrine/Form/DoctrineOrmTypeGuesser.php
+12-12Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public function __construct(ManagerRegistry $registry)
3939
public function guessType($class, $property)
4040
{
4141
if (!$ret = $this->getMetadata($class)) {
42-
return new TypeGuess('text', array(), Guess::LOW_CONFIDENCE);
42+
return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\TextType', array(), Guess::LOW_CONFIDENCE);
4343
}
4444

4545
list($metadata, $name) = $ret;
@@ -48,35 +48,35 @@ public function guessType($class, $property)
4848
$multiple = $metadata->isCollectionValuedAssociation($property);
4949
$mapping = $metadata->getAssociationMapping($property);
5050

51-
return new TypeGuess('entity', array('em' => $name, 'class' => $mapping['targetEntity'], 'multiple' => $multiple), Guess::HIGH_CONFIDENCE);
51+
return new TypeGuess('Symfony\Bridge\Doctrine\Form\Type\EntityType', array('em' => $name, 'class' => $mapping['targetEntity'], 'multiple' => $multiple), Guess::HIGH_CONFIDENCE);
5252
}
5353

5454
switch ($metadata->getTypeOfField($property)) {
5555
case Type::TARRAY:
56-
return new TypeGuess('collection', array(), Guess::MEDIUM_CONFIDENCE);
56+
return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\CollectionType', array(), Guess::MEDIUM_CONFIDENCE);
5757
case Type::BOOLEAN:
58-
return new TypeGuess('checkbox', array(), Guess::HIGH_CONFIDENCE);
58+
return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\CheckboxType', array(), Guess::HIGH_CONFIDENCE);
5959
case Type::DATETIME:
6060
case Type::DATETIMETZ:
6161
case 'vardatetime':
62-
return new TypeGuess('datetime', array(), Guess::HIGH_CONFIDENCE);
62+
return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\DateTimeType', array(), Guess::HIGH_CONFIDENCE);
6363
case Type::DATE:
64-
return new TypeGuess('date', array(), Guess::HIGH_CONFIDENCE);
64+
return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\DateType', array(), Guess::HIGH_CONFIDENCE);
6565
case Type::TIME:
66-
return new TypeGuess('time', array(), Guess::HIGH_CONFIDENCE);
66+
return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\TimeType', array(), Guess::HIGH_CONFIDENCE);
6767
case Type::DECIMAL:
6868
case Type::FLOAT:
69-
return new TypeGuess('number', array(), Guess::MEDIUM_CONFIDENCE);
69+
return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\NumberType', array(), Guess::MEDIUM_CONFIDENCE);
7070
case Type::INTEGER:
7171
case Type::BIGINT:
7272
case Type::SMALLINT:
73-
return new TypeGuess('integer', array(), Guess::MEDIUM_CONFIDENCE);
73+
return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\IntegerType', array(), Guess::MEDIUM_CONFIDENCE);
7474
case Type::STRING:
75-
return new TypeGuess('text', array(), Guess::MEDIUM_CONFIDENCE);
75+
return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\TextType', array(), Guess::MEDIUM_CONFIDENCE);
7676
case Type::TEXT:
77-
return new TypeGuess('textarea', array(), Guess::MEDIUM_CONFIDENCE);
77+
return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\TextareaType', array(), Guess::MEDIUM_CONFIDENCE);
7878
default:
79-
return new TypeGuess('text', array(), Guess::LOW_CONFIDENCE);
79+
return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\TextType', array(), Guess::LOW_CONFIDENCE);
8080
}
8181
}
8282

‎src/Symfony/Bridge/Doctrine/Logger/DbalLogger.php

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Doctrine/Logger/DbalLogger.php
+3-10Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -99,16 +99,9 @@ private function normalizeParams(array $params)
9999
}
100100

101101
// detect if the too long string must be shorten
102-
if (function_exists('mb_strlen')) {
103-
if (self::MAX_STRING_LENGTH < mb_strlen($params[$index], 'UTF-8')) {
104-
$params[$index] = mb_substr($params[$index], 0, self::MAX_STRING_LENGTH - 6, 'UTF-8').' [...]';
105-
continue;
106-
}
107-
} else {
108-
if (self::MAX_STRING_LENGTH < strlen($params[$index])) {
109-
$params[$index] = substr($params[$index], 0, self::MAX_STRING_LENGTH - 6).' [...]';
110-
continue;
111-
}
102+
if (self::MAX_STRING_LENGTH < iconv_strlen($params[$index], 'UTF-8')) {
103+
$params[$index] = iconv_substr($params[$index], 0, self::MAX_STRING_LENGTH - 6, 'UTF-8').' [...]';
104+
continue;
112105
}
113106
}
114107

‎src/Symfony/Bridge/Doctrine/Tests/DataCollector/DoctrineDataCollectorTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Doctrine/Tests/DataCollector/DoctrineDataCollectorTest.php
+22-6Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,25 @@ public function testCollectQueries($param, $types, $expected, $explainable)
7979
$c = $this->createCollector($queries);
8080
$c->collect(new Request(), new Response());
8181

82-
$collected_queries = $c->getQueries();
83-
$this->assertEquals($expected, $collected_queries['default'][0]['params'][0]);
84-
$this->assertEquals($explainable, $collected_queries['default'][0]['explainable']);
82+
$collectedQueries = $c->getQueries();
83+
$this->assertEquals($expected, $collectedQueries['default'][0]['params'][0]);
84+
$this->assertEquals($explainable, $collectedQueries['default'][0]['explainable']);
85+
}
86+
87+
public function testCollectQueryWithNoParams()
88+
{
89+
$queries = array(
90+
array('sql' => 'SELECT * FROM table1', 'params' => array(), 'types' => array(), 'executionMS' => 1),
91+
array('sql' => 'SELECT * FROM table1', 'params' => null, 'types' => null, 'executionMS' => 1),
92+
);
93+
$c = $this->createCollector($queries);
94+
$c->collect(new Request(), new Response());
95+
96+
$collectedQueries = $c->getQueries();
97+
$this->assertEquals(array(), $collectedQueries['default'][0]['params']);
98+
$this->assertTrue($collectedQueries['default'][0]['explainable']);
99+
$this->assertEquals(array(), $collectedQueries['default'][1]['params']);
100+
$this->assertTrue($collectedQueries['default'][1]['explainable']);
85101
}
86102

87103
/**
@@ -96,9 +112,9 @@ public function testSerialization($param, $types, $expected, $explainable)
96112
$c->collect(new Request(), new Response());
97113
$c = unserialize(serialize($c));
98114

99-
$collected_queries = $c->getQueries();
100-
$this->assertEquals($expected, $collected_queries['default'][0]['params'][0]);
101-
$this->assertEquals($explainable, $collected_queries['default'][0]['explainable']);
115+
$collectedQueries = $c->getQueries();
116+
$this->assertEquals($expected, $collectedQueries['default'][0]['params'][0]);
117+
$this->assertEquals($explainable, $collectedQueries['default'][0]['explainable']);
102118
}
103119

104120
public function paramProvider()

‎src/Symfony/Bridge/Doctrine/Tests/Logger/DbalLoggerTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Doctrine/Tests/Logger/DbalLoggerTest.php
+1-4Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -132,9 +132,6 @@ public function testLogLongString()
132132
));
133133
}
134134

135-
/**
136-
* @requires extension mbstring
137-
*/
138135
public function testLogUTF8LongString()
139136
{
140137
$logger = $this->getMock('Psr\\Log\\LoggerInterface');
@@ -160,7 +157,7 @@ public function testLogUTF8LongString()
160157
$dbalLogger
161158
->expects($this->once())
162159
->method('log')
163-
->with('SQL', array('short' => $shortString, 'long' => mb_substr($longString, 0, DbalLogger::MAX_STRING_LENGTH - 6, mb_detect_encoding($longString)).' [...]'))
160+
->with('SQL', array('short' => $shortString, 'long' => mb_substr($longString, 0, DbalLogger::MAX_STRING_LENGTH - 6, 'UTF-8').' [...]'))
164161
;
165162

166163
$dbalLogger->startQuery('SQL', array(

‎src/Symfony/Bridge/PhpUnit/SymfonyTestsListener.php

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/PhpUnit/SymfonyTestsListener.php
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ class SymfonyTestsListener extends \PHPUnit_Framework_BaseTestListener
2424
private $skippedFile = false;
2525
private $wasSkipped = array();
2626
private $isSkipped = array();
27-
private $testsStack = array();
2827

2928
public function __destruct()
3029
{

‎src/Symfony/Bridge/Twig/composer.json

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Twig/composer.json
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"symfony/finder": "~2.8|~3.0",
2525
"symfony/form": "~2.8|~3.0",
2626
"symfony/http-kernel": "~2.8|~3.0",
27-
"symfony/intl": "~2.8|~3.0",
27+
"symfony/polyfill-intl-icu": "~1.0",
2828
"symfony/routing": "~2.8|~3.0",
2929
"symfony/templating": "~2.8|~3.0",
3030
"symfony/translation": "~2.8|~3.0",

‎src/Symfony/Bundle/FrameworkBundle/CacheWarmer/ClassCacheCacheWarmer.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/CacheWarmer/ClassCacheCacheWarmer.php
+4Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,10 @@ public function warmUp($cacheDir)
3434
return;
3535
}
3636

37+
if (file_exists($cacheDir.'/classes.php')) {
38+
return;
39+
}
40+
3741
ClassCollectionLoader::load(include($classmap), $cacheDir, 'classes', false);
3842
}
3943

‎src/Symfony/Bundle/FrameworkBundle/Command/TranslationDebugCommand.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Command/TranslationDebugCommand.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ private function sanitizeString($string, $length = 40)
234234
{
235235
$string = trim(preg_replace('/\s+/', ' ', $string));
236236

237-
if (function_exists('mb_strlen') && false !== $encoding = mb_detect_encoding($string)) {
237+
if (false !== $encoding = mb_detect_encoding($string, null, true)) {
238238
if (mb_strlen($string, $encoding) > $length) {
239239
return mb_substr($string, 0, $length - 3, $encoding).'...';
240240
}

‎src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/Fragment/routing.yml

Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
_fragmenttest_bundle:
2-
resource: @TestBundle/Resources/config/routing.yml
2+
resource: '@TestBundle/Resources/config/routing.yml'

‎src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/Profiler/routing.yml

Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
_sessiontest_bundle:
2-
resource: @TestBundle/Resources/config/routing.yml
2+
resource: '@TestBundle/Resources/config/routing.yml'

‎src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/Session/routing.yml

Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
_sessiontest_bundle:
2-
resource: @TestBundle/Resources/config/routing.yml
2+
resource: '@TestBundle/Resources/config/routing.yml'

‎src/Symfony/Bundle/FrameworkBundle/composer.json

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/composer.json
+2-1Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
"symfony/event-dispatcher": "~2.8|~3.0",
2525
"symfony/http-foundation": "~2.8|~3.0",
2626
"symfony/http-kernel": "~2.8|~3.0",
27+
"symfony/polyfill-mbstring": "~1.0",
2728
"symfony/filesystem": "~2.8|~3.0",
2829
"symfony/routing": "~3.0",
2930
"symfony/security-core": "~2.8|~3.0",
@@ -40,7 +41,7 @@
4041
"symfony/css-selector": "~2.8|~3.0",
4142
"symfony/dom-crawler": "~2.8|~3.0",
4243
"symfony/finder": "~2.8|~3.0",
43-
"symfony/intl": "~2.8|~3.0",
44+
"symfony/polyfill-intl-icu": "~1.0",
4445
"symfony/security": "~2.8|~3.0",
4546
"symfony/form": "~2.8|~3.0",
4647
"symfony/expression-language": "~2.8|~3.0",

‎src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/CsrfFormLogin/config.yml

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/CsrfFormLogin/config.yml
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ services:
55
csrf_form_login.form.type:
66
class: Symfony\Bundle\SecurityBundle\Tests\Functional\Bundle\CsrfFormLoginBundle\Form\UserLoginType
77
arguments:
8-
- @request_stack
8+
- '@request_stack'
99
tags:
1010
- { name: form.type }
1111

‎src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/CsrfFormLogin/routing.yml

Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
_csrf_form_login_bundle:
2-
resource: @CsrfFormLoginBundle/Resources/config/routing.yml
2+
resource: '@CsrfFormLoginBundle/Resources/config/routing.yml'

‎src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/StandardFormLogin/routing.yml

Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
_form_login_bundle:
2-
resource: @FormLoginBundle/Resources/config/routing.yml
2+
resource: '@FormLoginBundle/Resources/config/routing.yml'
33

44
_form_login_localized:
5-
resource: @FormLoginBundle/Resources/config/localized_routing.yml
5+
resource: '@FormLoginBundle/Resources/config/localized_routing.yml'

‎src/Symfony/Bundle/SecurityBundle/composer.json

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/SecurityBundle/composer.json
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@
1919
"php": ">=5.5.9",
2020
"symfony/security": "~2.8|~3.0",
2121
"symfony/security-acl": "~2.8|~3.0",
22-
"symfony/http-kernel": "~2.8|~3.0"
22+
"symfony/http-kernel": "~2.8|~3.0",
23+
"symfony/polyfill-php70": "~1.0"
2324
},
2425
"require-dev": {
2526
"symfony/browser-kit": "~2.8|~3.0",
26-
"symfony/config": "~2.8|~3.0",
2727
"symfony/console": "~2.8|~3.0",
2828
"symfony/css-selector": "~2.8|~3.0",
2929
"symfony/dom-crawler": "~2.8|~3.0",

‎src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php
+10-7Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,7 @@ public function toolbarAction(Request $request, $token)
186186
}
187187

188188
return new Response($this->twig->render('@WebProfiler/Profiler/toolbar.html.twig', array(
189+
'request' => $request,
189190
'position' => $position,
190191
'profile' => $profile,
191192
'templates' => $this->getTemplateManager()->getTemplates($profile),
@@ -221,13 +222,13 @@ public function searchBarAction(Request $request)
221222
$limit =
222223
$token = null;
223224
} else {
224-
$ip = $session->get('_profiler_search_ip');
225-
$method = $session->get('_profiler_search_method');
226-
$url = $session->get('_profiler_search_url');
227-
$start = $session->get('_profiler_search_start');
228-
$end = $session->get('_profiler_search_end');
229-
$limit = $session->get('_profiler_search_limit');
230-
$token = $session->get('_profiler_search_token');
225+
$ip = $request->query->get('ip', $session->get('_profiler_search_ip'));
226+
$method = $request->query->get('method', $session->get('_profiler_search_method'));
227+
$url = $request->query->get('url', $session->get('_profiler_search_url'));
228+
$start = $request->query->get('start', $session->get('_profiler_search_start'));
229+
$end = $request->query->get('end', $session->get('_profiler_search_end'));
230+
$limit = $request->query->get('limit', $session->get('_profiler_search_limit'));
231+
$token = $request->query->get('token', $session->get('_profiler_search_token'));
231232
}
232233

233234
return new Response(
@@ -274,6 +275,7 @@ public function searchResultsAction(Request $request, $token)
274275
$limit = $request->query->get('limit');
275276

276277
return new Response($this->twig->render('@WebProfiler/Profiler/results.html.twig', array(
278+
'request' => $request,
277279
'token' => $token,
278280
'profile' => $profile,
279281
'tokens' => $this->profiler->find($ip, $url, $limit, $method, $start, $end),
@@ -330,6 +332,7 @@ public function searchAction(Request $request)
330332
$tokens = $this->profiler->find($ip, $url, $limit, $method, $start, $end);
331333

332334
return new RedirectResponse($this->generator->generate('_profiler_search_results', array(
335+
'request' => $request,
333336
'token' => $tokens ? $tokens[0]['token'] : 'empty',
334337
'ip' => $ip,
335338
'method' => $method,

‎src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/base_js.html.twig

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/base_js.html.twig
+2Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,8 @@
171171
var text = requestStack.length + ' AJAX request' + (requestStack.length > 1 ? 's' : '');
172172
infoSpan.textContent = text;
173173
}
174+
175+
ajaxToolbarPanel.style.display = 'block';
174176
} else {
175177
ajaxToolbarPanel.style.display = 'none';
176178
}

‎src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/layout.html.twig

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/layout.html.twig
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
{{ include('@WebProfiler/Icon/search.svg') }} <span class="hidden-small">Search</span>
6565
</a>
6666

67-
{{ render(path('_profiler_search_bar')) }}
67+
{{ render(path('_profiler_search_bar', request.query.all)) }}
6868
</div>
6969
</div>
7070

‎src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/profiler.css.twig

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/profiler.css.twig
+34Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -365,6 +365,32 @@ tr.status-warning td {
365365
.highlight .number { color: #F5871F; font-weight: bold; }
366366
.highlight .error { color: #C82829; }
367367

368+
{# Icons
369+
========================================================================= #}
370+
.sf-icon {
371+
vertical-align: middle;
372+
background-repeat: no-repeat;
373+
background-size: contain;
374+
width: 16px;
375+
height: 16px;
376+
display: inline-block;
377+
}
378+
.sf-icon svg {
379+
width: 16px;
380+
height: 16px;
381+
}
382+
.sf-icon.sf-medium,
383+
.sf-icon.sf-medium svg {
384+
width: 24px;
385+
height: 24px;
386+
}
387+
.sf-icon.sf-large,
388+
.sf-icon.sf-large svg {
389+
width: 32px;
390+
height: 32px;
391+
}
392+
393+
368394
{# Layout
369395
========================================================================= #}
370396
.container {
@@ -849,6 +875,14 @@ table.logs .metadata strong {
849875
vertical-align: middle;
850876
}
851877

878+
#search-results .sf-search {
879+
visibility: hidden;
880+
margin-left: 2px;
881+
}
882+
#search-results tr:hover .sf-search {
883+
visibility: visible;
884+
}
885+
852886
{# Small screens
853887
========================================================================= #}
854888

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.