Skip to content

Commit a43ccb1

Browse files
committed
Merge branch '2.8' into 3.1
* 2.8: DX: replace @link with @see annotation bumped min version of Twig to 1.28
2 parents a813cb7 + 7487ccb commit a43ccb1

File tree

17 files changed

+34
-27
lines changed

17 files changed

+34
-27
lines changed

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"require": {
1919
"php": ">=5.5.9",
2020
"doctrine/common": "~2.4",
21-
"twig/twig": "~1.27|~2.0",
21+
"twig/twig": "~1.28|~2.0",
2222
"psr/cache": "~1.0",
2323
"psr/log": "~1.0",
2424
"symfony/polyfill-intl-icu": "~1.0",

src/Symfony/Bundle/SecurityBundle/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
"symfony/yaml": "~2.8|~3.0",
4040
"symfony/expression-language": "~2.8|~3.0",
4141
"doctrine/doctrine-bundle": "~1.4",
42-
"twig/twig": "~1.27|~2.0"
42+
"twig/twig": "~1.28|~2.0"
4343
},
4444
"suggest": {
4545
"symfony/security-acl": "For using the ACL functionality of this bundle"

src/Symfony/Bundle/TwigBundle/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"symfony/twig-bridge": "~2.8|~3.0",
2222
"symfony/http-foundation": "~2.8|~3.0",
2323
"symfony/http-kernel": "~2.8|~3.0",
24-
"twig/twig": "~1.27|~2.0"
24+
"twig/twig": "~1.28|~2.0"
2525
},
2626
"require-dev": {
2727
"symfony/stopwatch": "~2.8|~3.0",

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ public function panelAction(Request $request, $token)
110110
'panel' => $panel,
111111
'page' => $page,
112112
'request' => $request,
113-
'templates' => $this->getTemplateManager()->getTemplates($profile),
113+
'templates' => $this->getTemplateManager()->getNames($profile),
114114
'is_ajax' => $request->isXmlHttpRequest(),
115115
'profiler_markup_version' => 2, // 1 = original profiler, 2 = Symfony 2.8+ profiler
116116
)), 200, array('Content-Type' => 'text/html'));
@@ -189,7 +189,7 @@ public function toolbarAction(Request $request, $token)
189189
'request' => $request,
190190
'position' => $position,
191191
'profile' => $profile,
192-
'templates' => $this->getTemplateManager()->getTemplates($profile),
192+
'templates' => $this->getTemplateManager()->getNames($profile),
193193
'profiler_url' => $url,
194194
'token' => $token,
195195
'profiler_markup_version' => 2, // 1 = original toolbar, 2 = Symfony 2.8+ toolbar

src/Symfony/Bundle/WebProfilerBundle/Profiler/TemplateManager.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,9 @@ public function getName(Profile $profile, $panel)
6767
*
6868
* @param Profile $profile
6969
*
70-
* @return array
70+
* @return Twig_Template[]
71+
*
72+
* @deprecated not used anymore internally
7173
*/
7274
public function getTemplates(Profile $profile)
7375
{
@@ -89,7 +91,7 @@ public function getTemplates(Profile $profile)
8991
*
9092
* @throws \UnexpectedValueException
9193
*/
92-
protected function getNames(Profile $profile)
94+
public function getNames(Profile $profile)
9395
{
9496
$templates = array();
9597

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,11 @@
112112
{% if templates is defined %}
113113
<ul id="menu-profiler">
114114
{% for name, template in templates %}
115-
{% set menu %}{{ template.renderBlock('menu', { collector: profile.getcollector(name), profiler_markup_version: profiler_markup_version }) }}{% endset %}
115+
{% set menu -%}
116+
{% with { collector: profile.getcollector(name), profiler_markup_version: profiler_markup_version } %}
117+
{{ block('menu', template) }}
118+
{% endwith %}
119+
{%- endset %}
116120
{% if menu is not empty %}
117121
<li class="{{ name }} {{ name == panel ? 'selected' : '' }}">
118122
<a href="{{ path('_profiler', { token: token, panel: name }) }}">{{ menu|raw }}</a>

src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.html.twig

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,15 @@
2626

2727
<div id="sfToolbarMainContent-{{ token }}" class="sf-toolbarreset clear-fix" data-no-turbolink>
2828
{% for name, template in templates %}
29-
{{ template.renderblock('toolbar', {
30-
'collector': profile.getcollector(name),
31-
'profiler_url': profiler_url,
32-
'token': profile.token,
33-
'name': name,
34-
'profiler_markup_version': profiler_markup_version
35-
})
36-
}}
29+
{% with {
30+
collector: profile.getcollector(name),
31+
profiler_url: profiler_url,
32+
token: profile.token,
33+
name: name,
34+
profiler_markup_version: profiler_markup_version
35+
} %}
36+
{{ block('toolbar', template) }}
37+
{% endwith %}
3738
{% endfor %}
3839

3940
{% if 'normal' != position %}

src/Symfony/Component/Console/Logger/ConsoleLogger.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
*
2323
* @author Kévin Dunglas <[email protected]>
2424
*
25-
* @link http://www.php-fig.org/psr/psr-3/
25+
* @see http://www.php-fig.org/psr/psr-3/
2626
*/
2727
class ConsoleLogger extends AbstractLogger
2828
{

src/Symfony/Component/Form/FormTypeGuesserInterface.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public function guessMaxLength($class, $property);
5454
* Example:
5555
* You want a float greater than 5, 4.512313 is not valid but length(4.512314) > length(5)
5656
*
57-
* @link https://github.com/symfony/symfony/pull/3927
57+
* @see https://github.com/symfony/symfony/pull/3927
5858
*
5959
* @param string $class The fully qualified class name
6060
* @param string $property The name of the property to guess for

src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/NumberToLocalizedStringTransformerTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -508,7 +508,7 @@ public function testReverseTransformExpectsValidNumber()
508508
/**
509509
* @expectedException \Symfony\Component\Form\Exception\TransformationFailedException
510510
*
511-
* @link https://github.com/symfony/symfony/issues/3161
511+
* @see https://github.com/symfony/symfony/issues/3161
512512
*/
513513
public function testReverseTransformDisallowsNaN()
514514
{

0 commit comments

Comments
 (0)