From ad0a8c53fa9596e9bbd77bb690e9929df427a475 Mon Sep 17 00:00:00 2001 From: JKapitein Date: Tue, 14 Nov 2017 14:51:55 +0100 Subject: [PATCH] Add Type::GUID to $typeAlias list in EntityGenerator Right now, when generating entities, a column of type 'guid' will generate the following PHPDoc: ``` /** * Get id * * @return guid */ public function getId() {...} ``` Since guid is not a valid PHP type, this throws a warning in PHPStorm, and I assume most IDEs. Adding the type to the type alias list fixes the problem. --- lib/Doctrine/ORM/Tools/EntityGenerator.php | 1 + tests/Doctrine/Tests/ORM/Tools/EntityGeneratorTest.php | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/lib/Doctrine/ORM/Tools/EntityGenerator.php b/lib/Doctrine/ORM/Tools/EntityGenerator.php index c5977eb88..cdca27e3b 100644 --- a/lib/Doctrine/ORM/Tools/EntityGenerator.php +++ b/lib/Doctrine/ORM/Tools/EntityGenerator.php @@ -164,6 +164,7 @@ class EntityGenerator Type::TEXT => 'string', Type::BLOB => 'string', Type::DECIMAL => 'string', + Type::GUID => 'string', Type::JSON_ARRAY => 'array', Type::SIMPLE_ARRAY => 'array', Type::BOOLEAN => 'bool', diff --git a/tests/Doctrine/Tests/ORM/Tools/EntityGeneratorTest.php b/tests/Doctrine/Tests/ORM/Tools/EntityGeneratorTest.php index 8f6c35a52..438cf9323 100644 --- a/tests/Doctrine/Tests/ORM/Tools/EntityGeneratorTest.php +++ b/tests/Doctrine/Tests/ORM/Tools/EntityGeneratorTest.php @@ -1084,6 +1084,14 @@ class EntityGeneratorTest extends OrmTestCase 'value' => 'blob' ] ], + [ + [ + 'fieldName' => 'guid', + 'phpType' => 'string', + 'dbType' => 'guid', + 'value' => '00000000-0000-0000-0000-000000000001' + ] + ], [ [ 'fieldName' => 'decimal',