Merge branch '3.2'
* 3.2: Fix double escaping of the decision attributes in the profiler [Serializer] Add missing conflict for property-info<3.1
This commit is contained in:
commit
3ec8a33936
@ -257,7 +257,13 @@
|
||||
: '<span class="label status-error same-width">DENIED</span>'
|
||||
}}
|
||||
</td>
|
||||
<td>{{ decision.attributes|length == 1 ? decision.attributes|first : profiler_dump(decision.attributes) }}</td>
|
||||
<td>
|
||||
{% if decision.attributes|length == 1 %}
|
||||
{{ decision.attributes|first }}
|
||||
{% else %}
|
||||
{{ profiler_dump(decision.attributes) }}
|
||||
{% endif %}
|
||||
</td>
|
||||
<td>{{ profiler_dump(decision.object) }}</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
|
@ -31,6 +31,7 @@
|
||||
},
|
||||
"conflict": {
|
||||
"symfony/property-access": ">=3.0,<3.0.4|>=2.8,<2.8.4",
|
||||
"symfony/property-info": "<3.1",
|
||||
"symfony/yaml": "<3.1"
|
||||
},
|
||||
"suggest": {
|
||||
|
@ -289,7 +289,7 @@ stream resource {@{$ref}
|
||||
%sTemplate.php:%d: {
|
||||
: try {
|
||||
: \$this->display(\$context);
|
||||
: } catch (Exception \$e) {
|
||||
: } catch (%s \$e) {
|
||||
}
|
||||
%sCliDumperTest.php:{$line}: {
|
||||
: }
|
||||
|
Reference in New Issue
Block a user