Skip to content

Commit a4b7846

Browse files
committed
Fixes profiler Twig errors
1 parent be6d814 commit a4b7846

3 files changed

Lines changed: 42 additions & 40 deletions

File tree

Resources/config/propel.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
</service>
2929

3030
<service id="propel.data_collector" class="%propel.data_collector.class%" public="false">
31-
<tag name="data_collector" template="PropelBundle:Collector:propel" id="propel" />
31+
<tag name="data_collector" template="@Propel/Collector/propel" id="propel" />
3232
<argument type="service" id="propel.logger" />
3333
<argument type="service" id="propel.configuration" />
3434
</service>

Resources/views/Collector/propel.html.twig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{% extends 'WebProfilerBundle:Profiler:layout.html.twig' %}
1+
{% extends '@WebProfiler/Profiler/layout.html.twig' %}
22

33
{% block toolbar %}
44
{% if collector.querycount %}
@@ -14,7 +14,7 @@
1414

1515
{% set text %}{% endset %}
1616

17-
{% include 'WebProfilerBundle:Profiler:toolbar_item.html.twig' with { link: profiler_url } %}
17+
{% include '@WebProfiler/Profiler/toolbar_item.html.twig' with { link: profiler_url } %}
1818
{% endif %}
1919
{% endblock %}
2020

Resources/views/Panel/configuration.html.twig

Lines changed: 39 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -36,42 +36,44 @@
3636
</tr>
3737
</thead>
3838
<tbody>
39-
{% for name, config in configuration.datasources if config is iterable %}
40-
<tr>
41-
<th rowspan="5" style="vertical-align: top;">
42-
{{ name }}
43-
</th>
44-
<th>Adapter</th>
45-
<td>{{ config.adapter }}</td>
46-
</tr>
47-
<tr>
48-
<th>DSN</th>
49-
<td>{{ config.connection.dsn }}</td>
50-
</tr>
51-
<tr>
52-
<th>Class</th>
53-
<td>{{ config.connection.classname }}</td>
54-
</tr>
55-
<tr>
56-
<th>Options</th>
57-
<td>
58-
<ul>
59-
{% for key, value in config.connection.options %}
60-
<li>{{ key }} : {{ value }}</li>
61-
{% endfor %}
62-
</ul>
63-
</td>
64-
</tr>
65-
<tr>
66-
<th>Attributes</th>
67-
<td>
68-
<ul>
69-
{% for key, value in config.connection.attributes %}
70-
<li>{{ key }} : {{ value }}</li>
71-
{% endfor %}
72-
</ul>
73-
</td>
74-
</tr>
75-
{% endfor %}
39+
{% for name, config in configuration.datasources %}
40+
{% if config is iterable %}
41+
<tr>
42+
<th rowspan="5" style="vertical-align: top;">
43+
{{ name }}
44+
</th>
45+
<th>Adapter</th>
46+
<td>{{ config.adapter }}</td>
47+
</tr>
48+
<tr>
49+
<th>DSN</th>
50+
<td>{{ config.connection.dsn }}</td>
51+
</tr>
52+
<tr>
53+
<th>Class</th>
54+
<td>{{ config.connection.classname }}</td>
55+
</tr>
56+
<tr>
57+
<th>Options</th>
58+
<td>
59+
<ul>
60+
{% for key, value in config.connection.options %}
61+
<li>{{ key }} : {{ value }}</li>
62+
{% endfor %}
63+
</ul>
64+
</td>
65+
</tr>
66+
<tr>
67+
<th>Attributes</th>
68+
<td>
69+
<ul>
70+
{% for key, value in config.connection.attributes %}
71+
<li>{{ key }} : {{ value }}</li>
72+
{% endfor %}
73+
</ul>
74+
</td>
75+
</tr>
76+
{% endif %}
77+
{% endfor %}
7678
</tbody>
7779
</table>

0 commit comments

Comments
 (0)