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

src/Symfony/Bundle/SecurityBundle/Resources/views/Collector/security.html.twig

@@ -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 %}

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": {

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}: {
         :         }