Merge branch '4.0'

* 4.0:
  fixed tests

Author: fabpot

src/Symfony/Bundle/WebProfilerBundle/Tests/Controller/ProfilerControllerTest.php

@@ -59,7 +59,7 @@ public function testOpeningDisallowedPaths($path, $isAllowed)
             ->disableOriginalConstructor()
             ->getMock();
 
-        $controller = new ProfilerController($urlGenerator, $profiler, $twig, array(), 'bottom', null, __DIR__.'/../..');
+        $controller = new ProfilerController($urlGenerator, $profiler, $twig, array(), null, __DIR__.'/../..');
 
         try {
             $response = $controller->openAction(Request::create('/_wdt/open', Request::METHOD_GET, array('file' => $path)));