Merge branch 'DBAL-121' into 2.0.x

lib/Doctrine/DBAL/Types/DecimalType.php

@@ -40,6 +40,6 @@ class DecimalType extends Type
 
     public function convertToPHPValue($value, AbstractPlatform $platform)
     {
-        return (null === $value) ? null : (double) $value;
+        return (null === $value) ? null : $value;
     }
 }
\ No newline at end of file

tests/Doctrine/Tests/DBAL/Functional/TypeConversionTest.php

@@ -60,7 +60,7 @@ class TypeConversionTest extends \Doctrine\Tests\DbalFunctionalTestCase
             array('array',      array('foo' => 'bar'), 'array'),
             array('object',     $obj, 'object'),
             array('float',      1.5, 'float'),
-            array('decimal',    1.55, 'float'),
+            array('decimal',    1.55, 'string'),
         );
     }
 

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

@@ -21,7 +21,7 @@ class DecimalTest extends \Doctrine\Tests\DbalTestCase
 
     public function testDecimalConvertsToPHPValue()
     {
-        $this->assertType('float', $this->_type->convertToPHPValue('5.5', $this->_platform));
+        $this->assertInternalType('string', $this->_type->convertToPHPValue('5.5', $this->_platform));
     }
 
     public function testDecimalNullConvertsToPHPValue()