RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-02-09 00:39:25 +03:00
Code Issues Projects Releases Wiki Activity

Merge branch 'DDC-2587' into 2.4

Browse Source
This commit is contained in:
Benjamin Eberlei 2013-08-10 16:25:04 +02:00
commit b324a21abf
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Doctrine/ORM/Tools/EntityGenerator.php
View File

@ -152,7 +152,7 @@ class EntityGenerator
Type::SMALLINT => 'integer', Type::SMALLINT => 'integer',
Type::TEXT => 'string', Type::TEXT => 'string',
Type::BLOB => 'string', Type::BLOB => 'string',
Type::DECIMAL => 'float', Type::DECIMAL => 'string',
Type::JSON_ARRAY => 'array', Type::JSON_ARRAY => 'array',
Type::SIMPLE_ARRAY => 'array', Type::SIMPLE_ARRAY => 'array',
); );

4
tests/Doctrine/Tests/ORM/Tools/EntityGeneratorTest.php
View File

@ -516,9 +516,9 @@ class EntityGeneratorTest extends \Doctrine\Tests\OrmTestCase
)), )),
array(array( array(array(
'fieldName' => 'decimal', 'fieldName' => 'decimal',
'phpType' => 'float', 'phpType' => 'string',
'dbType' => 'decimal', 'dbType' => 'decimal',
'value' => 33.33 'value' => '12.34'
), ),
)); ));
} }