Merge branch '2.8' into 3.1

nicolas-grekas · nicolas-grekas · commit 7fa7aeba0c9a · 2017-01-24T14:02:38.000+01:00
* 2.8:
  fix test
diff --git a/src/Symfony/Component/VarDumper/Tests/CliDumperTest.php b/src/Symfony/Component/VarDumper/Tests/CliDumperTest.php
@@ -316,7 +316,7 @@ public function testThrowingCaster()
           %sTemplate.php:%d: """
             try {\\n
                 \$this->display(\$context);\\n
-            } catch (Exception \$e) {\\n
+            } catch (%s \$e) {\\n
             """
         }
       }

Original file line number	Diff line number	Diff line change
`@@ -316,7 +316,7 @@ public function testThrowingCaster()`
`316`	`316`	`%sTemplate.php:%d: """`
`317`	`317`	`try {\\n`
`318`	`318`	`\$this->display(\$context);\\n`
`319`		`- } catch (Exception \$e) {\\n`
	`319`	`+ } catch (%s \$e) {\\n`
`320`	`320`	`"""`
`321`	`321`	`}`
`322`	`322`	`}`