From 3c613b9c023e64fb398e335071d2ecfead08b8dd Mon Sep 17 00:00:00 2001 From: J Bruni Date: Sat, 3 Aug 2013 05:44:15 -0300 Subject: [PATCH 1/3] Corrected PHP type for "decimal" mapping type "Basic Mapping" documentation says: "decimal: Type that maps a SQL DECIMAL to a PHP string." --- lib/Doctrine/ORM/Tools/EntityGenerator.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Doctrine/ORM/Tools/EntityGenerator.php b/lib/Doctrine/ORM/Tools/EntityGenerator.php index c1e1c771e..a9e34d727 100644 --- a/lib/Doctrine/ORM/Tools/EntityGenerator.php +++ b/lib/Doctrine/ORM/Tools/EntityGenerator.php @@ -152,7 +152,7 @@ class EntityGenerator Type::SMALLINT => 'integer', Type::TEXT => 'string', Type::BLOB => 'string', - Type::DECIMAL => 'float', + Type::DECIMAL => 'string', Type::JSON_ARRAY => 'array', Type::SIMPLE_ARRAY => 'array', ); From 15c2c4dd23f4140bc579d660b9396722cbc4694a Mon Sep 17 00:00:00 2001 From: "J. Bruni" Date: Sat, 3 Aug 2013 10:44:02 -0300 Subject: [PATCH 2/3] Updated EntityGeneratorTest::testEntityTypeAlias --- tests/Doctrine/Tests/ORM/Tools/EntityGeneratorTest.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/Doctrine/Tests/ORM/Tools/EntityGeneratorTest.php b/tests/Doctrine/Tests/ORM/Tools/EntityGeneratorTest.php index b49125cdc..831379ad5 100644 --- a/tests/Doctrine/Tests/ORM/Tools/EntityGeneratorTest.php +++ b/tests/Doctrine/Tests/ORM/Tools/EntityGeneratorTest.php @@ -548,9 +548,9 @@ class EntityGeneratorTest extends \Doctrine\Tests\OrmTestCase )), array(array( 'fieldName' => 'decimal', - 'phpType' => 'float', + 'phpType' => 'string', 'dbType' => 'decimal', - 'value' => 33.33 + 'value' => '33.33' ), )); } From 14bc65bae7b41302d7bf94a5ff8197c61abd79f8 Mon Sep 17 00:00:00 2001 From: "J. Bruni" Date: Tue, 6 Aug 2013 11:23:15 -0300 Subject: [PATCH 3/3] Updated EntityGeneratorTest::testEntityTypeAlias --- tests/Doctrine/Tests/ORM/Tools/EntityGeneratorTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Doctrine/Tests/ORM/Tools/EntityGeneratorTest.php b/tests/Doctrine/Tests/ORM/Tools/EntityGeneratorTest.php index 831379ad5..338ace221 100644 --- a/tests/Doctrine/Tests/ORM/Tools/EntityGeneratorTest.php +++ b/tests/Doctrine/Tests/ORM/Tools/EntityGeneratorTest.php @@ -550,7 +550,7 @@ class EntityGeneratorTest extends \Doctrine\Tests\OrmTestCase 'fieldName' => 'decimal', 'phpType' => 'string', 'dbType' => 'decimal', - 'value' => '33.33' + 'value' => '12.34' ), )); }