Merge branch '2.8' into 3.1

* 2.8: fix test
2017-01-24 14:02:38 +01:00 · 2017-01-24 14:02:38 +01:00 · 7fa7aeba0c
parent dd42d72eb5 c56f547c7d
commit 7fa7aeba0c
1 changed files with 1 additions and 1 deletions
--- a/src/Symfony/Component/VarDumper/Tests/CliDumperTest.php
+++ b/src/Symfony/Component/VarDumper/Tests/CliDumperTest.php
@ -316,7 +316,7 @@ stream resource {@{$ref}
          %sTemplate.php:%d: """
            try {\\n
                \$this->display(\$context);\\n
-            } catch (Exception \$e) {\\n
+            } catch (%s \$e) {\\n
            """
        }
      }