From 894490c2a04f398730b4429f0a9bfa8219e4d8b7 Mon Sep 17 00:00:00 2001
From: Marco Pivetta <ocramius@gmail.com>
Date: Wed, 16 Aug 2017 19:57:26 +0200
Subject: [PATCH] #6593 #5864 removing incorrect `null` return value in API
 marked as `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 63b53089d..391732dd0 100644
--- a/lib/Doctrine/ORM/Tools/EntityGenerator.php
+++ b/lib/Doctrine/ORM/Tools/EntityGenerator.php
@@ -1414,7 +1414,7 @@ public function __construct(<params>)
     protected function generateLifecycleCallbackMethod($name, $methodName, ClassMetadataInfo $metadata)
     {
         if ($this->hasMethod($methodName, $metadata)) {
-            return null;
+            return '';
         }
 
         $this->staticReflection[$metadata->name]['methods'][] = $methodName;