Merge branch '2.3'

* 2.3:
  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
  removed unused variable
  [Form] fix iterator typehint
  typos
  Button missing getErrorsAsString() fixes #8084 Debug: Not calling undefined method anymore. If the form contained a submit button the call would fail and the debug of the form wasn't possible. Now it will work in all cases. This fixes #8084
  Use isset() instead of array_key_exists() in DIC
  Fixed annotation
  [BrowserKit] fixed method/files/content when redirecting a request
  [BrowserKit] removed some headers when redirecting a request
  [BrowserKit] fixed headers when redirecting if history is set to false (refs #8697)
  [HttpKernel] fixed route parameters storage in the Request data collector (closes #8867)
  [BrowserKit] Pass headers when `followRedirect()` is called
  Return BC compatibility for `@Route` parameters and default values

Conflicts:
	src/Symfony/Component/Security/Http/Firewall/ContextListener.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

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

Kernel.php

@@ -59,7 +59,6 @@ abstract class Kernel implements KernelInterface, TerminableInterface
     protected $name;
     protected $startTime;
     protected $loadClassCache;
-    protected $errorReportingLevel;
 
     const VERSION         = '2.4.0-DEV';
     const VERSION_ID      = '20400';