Merge branch '2.2' into 2.3

* 2.2:
  Fixing singular form for kisses, accesses and addresses.
  fixed some circular references
  [Security] fixed a leak in ExceptionListener
  [Security] fixed a leak in the ContextListener
  Ignore posix_istatty warnings
  typos
  [HttpKernel] fixed route parameters storage in the Request data collector (closes #8867)
  Return BC compatibility for `@Route` parameters and default values

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/Templating/Helper/FormHelper.php
	src/Symfony/Component/Console/Application.php

Author: fabpot

DataCollector/RequestDataCollector.php

@@ -51,10 +51,14 @@ public function collect(Request $request, Response $response, \Exception $except
         $attributes = array();
         foreach ($request->attributes->all() as $key => $value) {
             if ('_route' == $key && is_object($value)) {
-                $value = $value->getPath();
+                $attributes['_route'] = $this->varToString($value->getPath());
+            } elseif ('_route_params' == $key) {
+                foreach ($value as $key => $v) {
+                    $attributes['_route_params'][$key] = $this->varToString($v);
+                }
+            } else {
+                $attributes[$key] = $this->varToString($value);
             }
-
-            $attributes[$key] = $this->varToString($value);
         }
 
         $content = null;

DataCollector/RouterDataCollector.php

@@ -50,6 +50,8 @@ public function collect(Request $request, Response $response, \Exception $except
                 $this->data['route'] = $this->guessRoute($request, $this->controllers[$request]);
             }
         }
+
+        unset($this->controllers[$request]);
     }
 
     protected function guessRoute(Request $request, $controller)

EventListener/ProfilerListener.php

@@ -135,6 +135,8 @@ public function onKernelResponse(FilterResponseEvent $event)
 
         if ($master) {
             $this->saveProfiles($profile);
+
+            unset($this->children);
         }
     }