From e6007575e1dd5d8ccc0d7f805ebe8c8898854569 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 5a55f0fc9..bab4c87f2 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 9767a814a62aa6ed80b05e6155a2fb9b5334ad88 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 d8dfa1b56..6a5bd97c3 100644 --- a/tests/Doctrine/Tests/ORM/Tools/EntityGeneratorTest.php +++ b/tests/Doctrine/Tests/ORM/Tools/EntityGeneratorTest.php @@ -516,9 +516,9 @@ class EntityGeneratorTest extends \Doctrine\Tests\OrmTestCase )), array(array( 'fieldName' => 'decimal', - 'phpType' => 'float', + 'phpType' => 'string', 'dbType' => 'decimal', - 'value' => 33.33 + 'value' => '33.33' ), )); } From ff34aaaa2c6852a1d8ff812449aacbc23f68c6ed 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 6a5bd97c3..651424c22 100644 --- a/tests/Doctrine/Tests/ORM/Tools/EntityGeneratorTest.php +++ b/tests/Doctrine/Tests/ORM/Tools/EntityGeneratorTest.php @@ -518,7 +518,7 @@ class EntityGeneratorTest extends \Doctrine\Tests\OrmTestCase 'fieldName' => 'decimal', 'phpType' => 'string', 'dbType' => 'decimal', - 'value' => '33.33' + 'value' => '12.34' ), )); }