diff --git a/src/Symfony/Bundle/SecurityBundle/Resources/views/Collector/security.html.twig b/src/Symfony/Bundle/SecurityBundle/Resources/views/Collector/security.html.twig
index 3830e924a1..073d0d869d 100644
--- a/src/Symfony/Bundle/SecurityBundle/Resources/views/Collector/security.html.twig
+++ b/src/Symfony/Bundle/SecurityBundle/Resources/views/Collector/security.html.twig
@@ -257,7 +257,13 @@
: 'DENIED'
}}
-
{{ decision.attributes|length == 1 ? decision.attributes|first : profiler_dump(decision.attributes) }} |
+
+ {% if decision.attributes|length == 1 %}
+ {{ decision.attributes|first }}
+ {% else %}
+ {{ profiler_dump(decision.attributes) }}
+ {% endif %}
+ |
{{ profiler_dump(decision.object) }} |
{% endfor %}
diff --git a/src/Symfony/Component/Serializer/composer.json b/src/Symfony/Component/Serializer/composer.json
index 0565a808ec..63569fdd04 100644
--- a/src/Symfony/Component/Serializer/composer.json
+++ b/src/Symfony/Component/Serializer/composer.json
@@ -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": {
diff --git a/src/Symfony/Component/VarDumper/Tests/CliDumperTest.php b/src/Symfony/Component/VarDumper/Tests/CliDumperTest.php
index 13629e9ff8..dd479670ce 100644
--- a/src/Symfony/Component/VarDumper/Tests/CliDumperTest.php
+++ b/src/Symfony/Component/VarDumper/Tests/CliDumperTest.php
@@ -289,7 +289,7 @@ stream resource {@{$ref}
%sTemplate.php:%d: {
: try {
: \$this->display(\$context);
- : } catch (Exception \$e) {
+ : } catch (%s \$e) {
}
%sCliDumperTest.php:{$line}: {
: }