Merge branch '3.4' into 4.4

* 3.4:
  Fix exception messages containing exception messages

Author: nicolas-grekas

Templating/Loader/TemplateLocator.php

@@ -82,7 +82,7 @@ public function locate($template, $currentPath = null, $first = true)
         try {
             return $this->cacheHits[$key] = $this->locator->locate($template->getPath(), $currentPath);
         } catch (\InvalidArgumentException $e) {
-            throw new \InvalidArgumentException(sprintf('Unable to find template "%s" : "%s".', $template, $e->getMessage()), 0, $e);
+            throw new \InvalidArgumentException(sprintf('Unable to find template "%s": ', $template).$e->getMessage(), 0, $e);
         }
     }
 }

Tests/Functional/CachePoolsTest.php

@@ -45,7 +45,7 @@ public function testRedisCachePools()
             }
             $this->markTestSkipped($e->getMessage());
         } catch (InvalidArgumentException $e) {
-            if (0 !== strpos($e->getMessage(), 'Redis connection failed')) {
+            if (0 !== strpos($e->getMessage(), 'Redis connection ')) {
                 throw $e;
             }
             $this->markTestSkipped($e->getMessage());

Tests/Functional/DebugAutowiringCommandTest.php

@@ -107,6 +107,6 @@ public function testNotConfusedByClassAliases()
 
         $tester = new ApplicationTester($application);
         $tester->run(['command' => 'debug:autowiring', 'search' => 'ClassAlias']);
-        $this->assertStringContainsString('Symfony\Bundle\FrameworkBundle\Tests\Fixtures\ClassAliasExampleClass (public)', $tester->getDisplay());
+        $this->assertStringContainsString('Symfony\Bundle\FrameworkBundle\Tests\Fixtures\ClassAliasExampleClass', $tester->getDisplay());
     }
 }