Merge pull request #2933 from holantomas/patch-1

Added test case for resource as parameter

lib/Doctrine/DBAL/DBALException.php

@@ -190,6 +190,10 @@ class DBALException extends \Exception
     private static function formatParameters(array $params)
     {
         return '[' . implode(', ', array_map(function ($param) {
+            if (is_resource($param)) {
+                return (string) $param;
+            }
+            
             $json = @json_encode($param);
 
             if (! is_string($json) || $json == 'null' && is_string($param)) {

tests/Doctrine/Tests/DBAL/DBALExceptionTest.php

@@ -18,6 +18,14 @@ class DBALExceptionTest extends DbalTestCase
         self::assertContains('with params ["ABC", "\x80"]', $e->getMessage());
     }
     
+    public function testDriverExceptionDuringQueryAcceptsResource()
+    {
+        /* @var $driver Driver */
+        $driver = $this->createMock(Driver::class);
+        $e = \Doctrine\DBAL\DBALException::driverExceptionDuringQuery($driver, new \Exception, "INSERT INTO file (`content`) VALUES (?)", [1 => fopen(__FILE__, 'r')]);
+        self::assertContains('Resource', $e->getMessage());
+    }
+
     public function testAvoidOverWrappingOnDriverException()
     {
         /* @var $driver Driver */