Merge branch '1.3'

* 1.3:
  fixed deprecation handler in tests

tests/Silex/Tests/Provider/MonologServiceProviderTest.php

@@ -27,6 +27,19 @@ use Symfony\Component\HttpKernel\Kernel;
  */
 class MonologServiceProviderTest extends \PHPUnit_Framework_TestCase
 {
+    private $currErrorHandler;
+
+    protected function setUp()
+    {
+        $this->currErrorHandler = set_error_handler('var_dump');
+        restore_error_handler();
+    }
+
+    protected function tearDown()
+    {
+        set_error_handler($this->currErrorHandler);
+    }
+
     public function testRequestLogging()
     {
         $app = $this->getApplication();