Merge branch '3.4' into 4.4

nicolas-grekas · nicolas-grekas · commit 66bb33a7cd81 · 2020-05-04T17:32:48.000+02:00
* 3.4:
  Fix exception messages containing exception messages
diff --git a/Templating/Loader/TemplateLocator.php b/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);
         }
     }
 }
diff --git a/Tests/Functional/CachePoolsTest.php b/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());
diff --git a/Tests/Functional/DebugAutowiringCommandTest.php b/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());
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ public function locate($template, $currentPath = null, $first = true)`
`82`	`82`	`try {`
`83`	`83`	`return $this->cacheHits[$key] = $this->locator->locate($template->getPath(), $currentPath);`
`84`	`84`	`} catch (\InvalidArgumentException $e) {`
`85`		`- throw new \InvalidArgumentException(sprintf('Unable to find template "%s" : "%s".', $template, $e->getMessage()), 0, $e);`
	`85`	`+ throw new \InvalidArgumentException(sprintf('Unable to find template "%s": ', $template).$e->getMessage(), 0, $e);`
`86`	`86`	`}`
`87`	`87`	`}`
`88`	`88`	`}`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ public function testRedisCachePools()`
`45`	`45`	`}`
`46`	`46`	`$this->markTestSkipped($e->getMessage());`
`47`	`47`	`} catch (InvalidArgumentException $e) {`
`48`		`- if (0 !== strpos($e->getMessage(), 'Redis connection failed')) {`
	`48`	`+ if (0 !== strpos($e->getMessage(), 'Redis connection ')) {`
`49`	`49`	`throw $e;`
`50`	`50`	`}`
`51`	`51`	`$this->markTestSkipped($e->getMessage());`
Original file line number	Diff line number	Diff line change
`@@ -107,6 +107,6 @@ public function testNotConfusedByClassAliases()`
`107`	`107`
`108`	`108`	`$tester = new ApplicationTester($application);`
`109`	`109`	`$tester->run(['command' => 'debug:autowiring', 'search' => 'ClassAlias']);`
`110`		`- $this->assertStringContainsString('Symfony\Bundle\FrameworkBundle\Tests\Fixtures\ClassAliasExampleClass (public)', $tester->getDisplay());`
	`110`	`+ $this->assertStringContainsString('Symfony\Bundle\FrameworkBundle\Tests\Fixtures\ClassAliasExampleClass', $tester->getDisplay());`
`111`	`111`	`}`
`112`	`112`	`}`