Merge branch '3.0' into 3.1

* 3.0:
  [VarDumper] Fix dumping jsons casted as arrays
  PassConfig::getMergePass is not an array
  Revert "bug symfony#19114 [HttpKernel] Dont close the reponse stream in debug (nicolas-grekas)"
  Fix the retrieval of the last username when using forwarding
  [Yaml] Fix PHPDoc of the Yaml class
  [HttpFoundation] Add OPTIONS and TRACE to the list of safe methods
  Update getAbsoluteUri() for query string uris

Conflicts:
	src/Symfony/Component/Yaml/Yaml.php

Author: nicolas-grekas

src/Symfony/Component/BrowserKit/Client.php

@@ -542,9 +542,9 @@ protected function getAbsoluteUri($uri)
             return parse_url($currentUri, PHP_URL_SCHEME).':'.$uri;
         }
 
-        // anchor?
-        if (!$uri || '#' == $uri[0]) {
-            return preg_replace('/#.*?$/', '', $currentUri).$uri;
+        // anchor or query string parameters?
+        if (!$uri || '#' == $uri[0] || '?' == $uri[0]) {
+            return preg_replace('/[#?].*?$/', '', $currentUri).$uri;
         }
 
         if ('/' !== $uri[0]) {

src/Symfony/Component/BrowserKit/Tests/ClientTest.php

@@ -212,6 +212,15 @@ public function testRequestURIConversion()
         $client->request('GET', 'http://www.example.com/');
         $client->request('GET', 'http');
         $this->assertEquals('http://www.example.com/http', $client->getRequest()->getUri(), '->request() uses the previous request for relative URLs');
+
+        $client = new TestClient();
+        $client->request('GET', 'http://www.example.com/foo');
+        $client->request('GET', '?');
+        $this->assertEquals('http://www.example.com/foo?', $client->getRequest()->getUri(), '->request() uses the previous request for ?');
+        $client->request('GET', '?');
+        $this->assertEquals('http://www.example.com/foo?', $client->getRequest()->getUri(), '->request() uses the previous request for ?');
+        $client->request('GET', '?foo=bar');
+        $this->assertEquals('http://www.example.com/foo?foo=bar', $client->getRequest()->getUri(), '->request() uses the previous request for ?');
     }
 
     public function testRequestReferer()

src/Symfony/Component/DependencyInjection/Compiler/PassConfig.php

@@ -153,9 +153,9 @@ public function getRemovingPasses()
     }
 
     /**
-     * Gets all passes for the Merge pass.
+     * Gets the Merge pass.
      *
-     * @return array An array of passes
+     * @return CompilerPassInterface The merge pass
      */
     public function getMergePass()
     {

src/Symfony/Component/HttpFoundation/Request.php

@@ -1479,7 +1479,7 @@ public function isMethod($method)
      */
     public function isMethodSafe()
     {
-        return in_array($this->getMethod(), array('GET', 'HEAD'));
+        return in_array($this->getMethod(), array('GET', 'HEAD', 'OPTIONS', 'TRACE'));
     }
 
     /**

src/Symfony/Component/HttpFoundation/Response.php

@@ -377,6 +377,12 @@ public function send()
         $this->sendHeaders();
         $this->sendContent();
 
+        if (function_exists('fastcgi_finish_request')) {
+            fastcgi_finish_request();
+        } elseif ('cli' !== PHP_SAPI) {
+            static::closeOutputBuffers(0, true);
+        }
+
         return $this;
     }
 

src/Symfony/Component/HttpFoundation/Tests/RequestTest.php

@@ -1951,6 +1951,32 @@ public function getLongHostNames()
             array(str_repeat(':', 101)),
         );
     }
+
+    /**
+     * @dataProvider methodSafeProvider
+     */
+    public function testMethodSafe($method, $safe)
+    {
+        $request = new Request();
+        $request->setMethod($method);
+        $this->assertEquals($safe, $request->isMethodSafe());
+    }
+
+    public function methodSafeProvider()
+    {
+        return array(
+            array('HEAD', true),
+            array('GET', true),
+            array('POST', false),
+            array('PUT', false),
+            array('PATCH', false),
+            array('DELETE', false),
+            array('PURGE', false),
+            array('OPTIONS', true),
+            array('TRACE', true),
+            array('CONNECT', false),
+        );
+    }
 }
 
 class RequestContentProxy extends Request

src/Symfony/Component/HttpKernel/Kernel.php

@@ -134,14 +134,6 @@ public function terminate(Request $request, Response $response)
         }
 
         if ($this->getHttpKernel() instanceof TerminableInterface) {
-            if (!$this->debug) {
-                if (function_exists('fastcgi_finish_request')) {
-                    fastcgi_finish_request();
-                } elseif ('cli' !== PHP_SAPI) {
-                    Response::closeOutputBuffers(0, true);
-                }
-            }
-
             $this->getHttpKernel()->terminate($request, $response);
         }
     }

src/Symfony/Component/Security/Http/Authentication/AuthenticationUtils.php

@@ -65,7 +65,13 @@ public function getLastAuthenticationError($clearSession = true)
      */
     public function getLastUsername()
     {
-        $session = $this->getRequest()->getSession();
+        $request = $this->getRequest();
+
+        if ($request->attributes->has(Security::LAST_USERNAME)) {
+            return $request->attributes->get(Security::LAST_USERNAME);
+        }
+
+        $session = $request->getSession();
 
         return null === $session ? '' : $session->get(Security::LAST_USERNAME);
     }

src/Symfony/Component/VarDumper/Caster/Caster.php

@@ -45,14 +45,16 @@ public static function castObject($obj, \ReflectionClass $reflector)
     {
         if ($reflector->hasMethod('__debugInfo')) {
             $a = $obj->__debugInfo();
+        } elseif ($obj instanceof \Closure) {
+            $a = array();
         } else {
             $a = (array) $obj;
         }
 
         if ($a) {
             $p = array_keys($a);
             foreach ($p as $i => $k) {
-                if (!isset($k[0]) || ("\0" !== $k[0] && !$reflector->hasProperty($k))) {
+                if (isset($k[0]) && "\0" !== $k[0] && !$reflector->hasProperty($k)) {
                     $p[$i] = self::PREFIX_DYNAMIC.$k;
                 } elseif (isset($k[16]) && "\0" === $k[16] && 0 === strpos($k, "\0class@anonymous\0")) {
                     $p[$i] = "\0".$reflector->getParentClass().'@anonymous'.strrchr($k, "\0");

src/Symfony/Component/VarDumper/Caster/ReflectionCaster.php

@@ -58,7 +58,7 @@ public static function castClosure(\Closure $c, array $a, Stub $stub, $isNested)
         }
 
         $prefix = Caster::PREFIX_DYNAMIC;
-        unset($a['name'], $a[$prefix.'0'], $a[$prefix.'this'], $a[$prefix.'parameter'], $a[Caster::PREFIX_VIRTUAL.'extra']);
+        unset($a['name'], $a[$prefix.'this'], $a[$prefix.'parameter'], $a[Caster::PREFIX_VIRTUAL.'extra']);
 
         return $a;
     }