From 1378626937a3d6d1331a136e9514e80d10d0aa3b Mon Sep 17 00:00:00 2001 From: Javier Spagnoletti Date: Fri, 29 Aug 2014 22:49:23 -0300 Subject: [PATCH 1/2] Fixed new line in docblock (247803715bd7e5ded75e25dbbb4eb2c5b7fbd2f2). --- lib/Doctrine/ORM/Tools/EntityGenerator.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/Doctrine/ORM/Tools/EntityGenerator.php b/lib/Doctrine/ORM/Tools/EntityGenerator.php index e04b15801..72b254e58 100644 --- a/lib/Doctrine/ORM/Tools/EntityGenerator.php +++ b/lib/Doctrine/ORM/Tools/EntityGenerator.php @@ -219,6 +219,7 @@ class EntityGenerator '/** * * + * * @return */ public function () @@ -233,6 +234,7 @@ public function () '/** * * + * * @param $ * * @return @@ -251,6 +253,7 @@ public function ($) '/** * * + * * @param $ * * @return @@ -269,6 +272,7 @@ public function ($) '/** * * + * * @param $ */ public function ($) @@ -1173,7 +1177,7 @@ public function __construct() } $replacements = array( - '' => ucfirst($type) . ' ' . $variableName . ".\n", + '' => ucfirst($type) . ' ' . $variableName, '' => $methodTypeHint, '' => $variableType, '' => $variableName, From f731a66e1c8a422fcb76a42ed005feb57de54509 Mon Sep 17 00:00:00 2001 From: Javier Spagnoletti Date: Fri, 29 Aug 2014 23:11:49 -0300 Subject: [PATCH 2/2] Removed extra line breaks for docblocks in set, get, add and remove method templates. --- lib/Doctrine/ORM/Tools/EntityGenerator.php | 4 ---- 1 file changed, 4 deletions(-) diff --git a/lib/Doctrine/ORM/Tools/EntityGenerator.php b/lib/Doctrine/ORM/Tools/EntityGenerator.php index 72b254e58..918e4162b 100644 --- a/lib/Doctrine/ORM/Tools/EntityGenerator.php +++ b/lib/Doctrine/ORM/Tools/EntityGenerator.php @@ -219,7 +219,6 @@ class EntityGenerator '/** * * - * * @return */ public function () @@ -234,7 +233,6 @@ public function () '/** * * - * * @param $ * * @return @@ -253,7 +251,6 @@ public function ($) '/** * * - * * @param $ * * @return @@ -272,7 +269,6 @@ public function ($) '/** * * - * * @param $ */ public function ($)