Merge branch '2.7' into 2.8

* 2.7:
  Fix errors not rethrown even if not handled by console.error listeners
  [VarDumper] Fix dumping of non-nested stubs
  [Security] Avoid unnecessary route lookup for empty logout path

src/Symfony/Component/Console/Application.php

@@ -132,7 +132,7 @@ public function run(InputInterface $input = null, OutputInterface $output = null
         }
 
         if (null !== $e) {
-            if (!$this->catchExceptions) {
+            if (!$this->catchExceptions || !$x instanceof \Exception) {
                 throw $x;
             }
 

src/Symfony/Component/Console/Tests/ApplicationTest.php

@@ -1231,6 +1231,29 @@ protected function getDispatcher($skipCommand = false)
 
         return $dispatcher;
     }
+
+    /**
+     * @requires PHP 7
+     */
+    public function testErrorIsRethrownIfNotHandledByConsoleErrorEventWithCatchingEnabled()
+    {
+        $application = new Application();
+        $application->setAutoExit(false);
+        $application->setDispatcher(new EventDispatcher());
+
+        $application->register('dym')->setCode(function (InputInterface $input, OutputInterface $output) {
+            new \UnknownClass();
+        });
+
+        $tester = new ApplicationTester($application);
+
+        try {
+            $tester->run(array('command' => 'dym'));
+            $this->fail('->run() should rethrow PHP errors if not handled via ConsoleErrorEvent.');
+        } catch (\Error $e) {
+            $this->assertSame($e->getMessage(), 'Class \'UnknownClass\' not found');
+        }
+    }
 }
 
 class CustomApplication extends Application

src/Symfony/Component/Security/Http/Firewall/LogoutListener.php

@@ -146,6 +146,6 @@ public function handle(GetResponseEvent $event)
      */
     protected function requiresLogout(Request $request)
     {
-        return $this->httpUtils->checkRequestPath($request, $this->options['logout_path']);
+        return isset($this->options['logout_path']) && $this->httpUtils->checkRequestPath($request, $this->options['logout_path']);
     }
 }

src/Symfony/Component/Security/Http/Logout/LogoutUrlGenerator.php

@@ -112,6 +112,10 @@ private function generateLogoutUrl($key, $referenceType)
 
         list($logoutPath, $csrfTokenId, $csrfParameter, $csrfTokenManager) = $this->listeners[$key];
 
+        if (null === $logoutPath) {
+            throw new \LogicException('Unable to generate the logout URL without a path.');
+        }
+
         $parameters = null !== $csrfTokenManager ? array($csrfParameter => (string) $csrfTokenManager->getToken($csrfTokenId)) : array();
 
         if ('/' === $logoutPath[0]) {

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

@@ -29,8 +29,10 @@ public static function castStub(Stub $c, array $a, Stub $stub, $isNested)
             $stub->handle = $c->handle;
             $stub->cut = $c->cut;
 
-            return array();
+            $a = array();
         }
+
+        return $a;
     }
 
     public static function castCutArray(CutArrayStub $c, array $a, Stub $stub, $isNested)

src/Symfony/Component/VarDumper/Tests/CliDumperTest.php

@@ -230,7 +230,6 @@ public function testThrowingCaster()
                 }
             };'),
         ));
-        $line = __LINE__ - 2;
         $ref = (int) $out;
 
         $data = $cloner->cloneVar($out);
@@ -295,7 +294,7 @@ public function testThrowingCaster()
       }
       %d. %slosure%s() ==> Twig_Template->render(): {
         src: {
-          %sCliDumperTest.php:{$line}: """
+          %sCliDumperTest.php:%d: """
 %A
             """
         }