Merge pull request #229 from jmolivas/Issue-170

Fix Issue #170
hechoendrupal · Oct 31, 2014 · 5a84526 · 5a84526
2 parents b9771f8 + 7b3d29d
commit 5a84526
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 7 deletions.
diff --git a/composer.json b/composer.json
@@ -25,7 +25,7 @@
         "symfony/console": "2.5.*",
         "symfony/finder": "2.5.*",
         "symfony/dependency-injection": "2.5.*",
-        "twig/twig": "1.15.*",
+        "twig/twig": "1.16.*",
         "composer/installers": "~1.0"
     },
     "require-dev": {

diff --git a/src/Command/ContainerAwareCommand.php b/src/Command/ContainerAwareCommand.php
@@ -97,6 +97,10 @@ public function getConfigStorage(){
     return $this->getContainer()->get('config.storage');
   }
 
+  public function getEntityManager(){
+    return $this->getContainer()->get('entity.manager');
+  }
+
   public function validateModuleExist($module_name)
   {
     return $this->getValidator()->validateModuleExist($module_name, $this->getModules());
@@ -137,7 +141,13 @@ public function validateClassName($class_name)
 
   public function validateMachineName($machine_name)
   {
-    return $this->getValidator()->validateMachineName($machine_name);
+    $machine_name = $this->getValidator()->validateMachineName($machine_name);
+
+    if ($this->getEntityManager()->hasDefinition($machine_name)) {
+      throw new \InvalidArgumentException(sprintf('Machine name "%s" is duplicated.', $machine_name));
+    }
+
+    return $machine_name;
   }
 
   /**

diff --git a/src/Command/GeneratorEntityCommand.php b/src/Command/GeneratorEntityCommand.php
@@ -103,13 +103,18 @@ protected function interact(InputInterface $input, OutputInterface $output)
     // --entity-name option
     $entity_name = $input->getOption('entity-name');
     if (!$entity_name) {
-        $entity_name = $dialog->ask(
-          $output,
-          $dialog->getQuestion('Enter the entity name', $machine_name),
-          $machine_name,
-          null
+      $entity_name = $dialog->askAndValidate(
+        $output,
+        $dialog->getQuestion('Enter the entity name', $machine_name),
+        function ($machine_name) {
+          return $this->validateMachineName($machine_name);
+        },
+        false,
+        $machine_name,
+        null
       );
     }
+
     $input->setOption('entity-name', $entity_name);
   }