Merge branch '3.4'

* 3.4:
  Minor cleanups

src/Symfony/Component/Debug/Tests/ErrorHandlerTest.php

@@ -98,8 +98,6 @@ class ErrorHandlerTest extends TestCase
     // dummy function to test trace in error handler.
     private static function triggerNotice($that)
     {
-        // dummy variable to check for in error handler.
-        $foobar = 123;
         $that->assertSame('', $foo.$foo.$bar);
     }