symfony
diff --git a/‎src/Symfony/Bridge/Doctrine/PropertyInfo/DoctrineExtractor.php
Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Doctrine/PropertyInfo/DoctrineExtractor.php
+1-1Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Bridge/Doctrine/PropertyInfo/DoctrineExtractor.php
Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Doctrine/PropertyInfo/DoctrineExtractor.php
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/DoctrineExtractorTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/DoctrineExtractorTest.php
+4Lines changed: 4 additions & 0 deletions b/‎src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/DoctrineExtractorTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/DoctrineExtractorTest.php
+4Lines changed: 4 additions & 0 deletions
diff --git a/‎src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/Fixtures/DoctrineDummy.php
Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/Fixtures/DoctrineDummy.php
+10Lines changed: 10 additions & 0 deletions b/‎src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/Fixtures/DoctrineDummy.php
Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/Fixtures/DoctrineDummy.php
+10Lines changed: 10 additions & 0 deletions
@@ -178,12 +178,12 @@ private function getPhpType($doctrineType)
                 return Type::BUILTIN_TYPE_INT;
 
             case DBALType::FLOAT:
-            case DBALType::DECIMAL:
                 return Type::BUILTIN_TYPE_FLOAT;
 
             case DBALType::STRING:
             case DBALType::TEXT:
             case DBALType::GUID:
+            case DBALType::DECIMAL:
                 return Type::BUILTIN_TYPE_STRING;
 
             case DBALType::BOOLEAN:
 
@@ -49,6 +49,8 @@ public function testGetProperties()
                 'time',
                 'json',
                 'simpleArray',
+                'float',
+                'decimal',
                 'bool',
                 'binary',
                 'customFoo',
@@ -73,6 +75,8 @@ public function typesProvider()
         return array(
             array('id', array(new Type(Type::BUILTIN_TYPE_INT))),
             array('guid', array(new Type(Type::BUILTIN_TYPE_STRING))),
+            array('float', array(new Type(Type::BUILTIN_TYPE_FLOAT))),
+            array('decimal', array(new Type(Type::BUILTIN_TYPE_STRING))),
             array('bool', array(new Type(Type::BUILTIN_TYPE_BOOL))),
             array('binary', array(new Type(Type::BUILTIN_TYPE_RESOURCE))),
             array('json', array(new Type(Type::BUILTIN_TYPE_ARRAY, false, null, true))),
 
@@ -65,6 +65,16 @@ class DoctrineDummy
      */
     private $simpleArray;
 
+    /**
+     * @Column(type="float")
+     */
+    private $float;
+
+    /**
+     * @Column(type="decimal", precision=10, scale=2)
+     */
+    private $decimal;
+
     /**
      * @Column(type="boolean")
      */