Merge pull request #891 from spolischook/patch-2

Allow to not generate extra use
doctrine · Dec 30, 2013 · 58c57c5 · 58c57c5
2 parents 7360231 + 07f67c5
commit 58c57c5
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/lib/Doctrine/ORM/Tools/EntityGenerator.php b/lib/Doctrine/ORM/Tools/EntityGenerator.php
@@ -202,9 +202,7 @@ class EntityGenerator
 '<?php
 
 <namespace>
-
-use Doctrine\ORM\Mapping as ORM;
-
+<useStatement>
 <entityAnnotation>
 <entityClassName>
 {
@@ -380,13 +378,15 @@ public function generateEntityClass(ClassMetadataInfo $metadata)
     {
         $placeHolders = array(
             '<namespace>',
+            '<useStatement>',
             '<entityAnnotation>',
             '<entityClassName>',
             '<entityBody>'
         );
 
         $replacements = array(
             $this->generateEntityNamespace($metadata),
+            $this->generateEntityUse(),
             $this->generateEntityDocBlock($metadata),
             $this->generateEntityClassName($metadata),
             $this->generateEntityBody($metadata)
@@ -568,6 +568,15 @@ protected function generateEntityNamespace(ClassMetadataInfo $metadata)
             return 'namespace ' . $this->getNamespace($metadata) .';';
         }
     }
+
+    protected function generateEntityUse()
+    {
+        if ($this->generateAnnotations) {
+            return "\n".'use Doctrine\ORM\Mapping as ORM;'."\n";
+        } else {
+            return "";
+        }
+    }
 
     /**
      * @param ClassMetadataInfo $metadata