#869 - DBAL-1293 - basic coverage for the conversion exception

lib/Doctrine/DBAL/Types/ConversionException.php

@@ -77,22 +77,23 @@ class ConversionException extends \Doctrine\DBAL\DBALException
      */
     static public function conversionFailedInvalidType($value, $toType, array $possibleTypes)
     {
-        $actualType = gettype($value);
-        if ($actualType === 'object') {
-            $actualType .= ' (' . get_class($value) . ')';
-            if (!method_exists($value, '__toString')) {
-                $value = 'object';
-            }
-        }
-        $value = (string)$value;
-        $value = (strlen($value) > 32) ? substr($value, 0, 20) . "..." : $value;
+        $actualType = is_object($value) ? get_class($value) : gettype($value);
 
+        if (is_scalar($value)) {
             return new self(sprintf(
-            "Could not convert PHP value '%s' of type '%s' to type '%s'. Expected one of the following: %s",
+                "Could not convert PHP value '%s' of type '%s' to type '%s'. Expected one of the following types: %s",
                 $value,
                 $actualType,
                 $toType,
                 implode(', ', $possibleTypes)
             ));
         }
+
+        return new self(sprintf(
+            "Could not convert PHP value of type '%s' to type '%s'. Expected one of the following types: %s",
+            $actualType,
+            $toType,
+            implode(', ', $possibleTypes)
+        ));
+    }
 }

tests/Doctrine/Tests/DBAL/Types/ConversionExceptionTest.php

+<?php
+
+namespace Doctrine\Tests\DBAL\Types;
+
+use Doctrine\DBAL\Types\ConversionException;
+use PHPUnit_Framework_TestCase;
+
+class ConversionExceptionTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @dataProvider scalarsProvider
+     *
+     * @param mixed $scalarValue
+     */
+    public function testConversionFailedInvalidTypeWithScalar($scalarValue)
+    {
+        $exception = ConversionException::conversionFailedInvalidType($scalarValue, 'foo', ['bar', 'baz']);
+
+        $this->assertInstanceOf('Doctrine\DBAL\Types\ConversionException', $exception);
+        $this->assertRegExp(
+            '/^Could not convert PHP value \'.*\' of type \'(string|boolean|float|double|integer)\' to type \'foo\'. '
+            . 'Expected one of the following types: bar, baz$/',
+            $exception->getMessage()
+        );
+    }
+
+    public function scalarsProvider()
+    {
+        return [
+            [''],
+            ['foo'],
+            [123],
+            [-123],
+            [12.34],
+            [true],
+            [false],
+        ];
+    }
+}