[DoctrineBundle] fixed doctrine:generate:entity command when the entity to generate has sub-namespaces

fabpot · fabpot · commit 3854d34c1441 · 2011-05-10T08:20:57.000+02:00
diff --git a/src/Symfony/Bundle/DoctrineBundle/Command/GenerateEntityDoctrineCommand.php b/src/Symfony/Bundle/DoctrineBundle/Command/GenerateEntityDoctrineCommand.php
@@ -59,7 +59,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
     {
         $bundle = $this->getApplication()->getKernel()->getBundle($input->getArgument('bundle'));
 
-        $entity = $input->getArgument('entity');
+        $entity = str_replace('/', '\\', $input->getArgument('entity'));
         $fullEntityClassName = $bundle->getNamespace().'\\Entity\\'.$entity;
         $mappingType = $input->getOption('mapping-type');
 
@@ -92,7 +92,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $cme = new ClassMetadataExporter();
         $exporter = $cme->getExporter($mappingType);
 
-        $entityPath = $bundle->getPath().'/Entity/'.$entity.'.php';
+        $entityPath = $bundle->getPath().'/Entity/'.str_replace('\\', '/', $entity).'.php';
         if (file_exists($entityPath)) {
             throw new \RuntimeException(sprintf("Entity %s already exists.", $class->name));
         }
@@ -130,6 +130,5 @@ protected function execute(InputInterface $input, OutputInterface $output)
             }
             file_put_contents($mappingPath, $mappingCode);
         }
-
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ protected function execute(InputInterface $input, OutputInterface $output)`
`59`	`59`	`{`
`60`	`60`	`$bundle = $this->getApplication()->getKernel()->getBundle($input->getArgument('bundle'));`
`61`	`61`
`62`		`- $entity = $input->getArgument('entity');`
	`62`	`+ $entity = str_replace('/', '\\', $input->getArgument('entity'));`
`63`	`63`	`$fullEntityClassName = $bundle->getNamespace().'\\Entity\\'.$entity;`
`64`	`64`	`$mappingType = $input->getOption('mapping-type');`
`65`	`65`
`@@ -92,7 +92,7 @@ protected function execute(InputInterface $input, OutputInterface $output)`
`92`	`92`	`$cme = new ClassMetadataExporter();`
`93`	`93`	`$exporter = $cme->getExporter($mappingType);`
`94`	`94`
`95`		`- $entityPath = $bundle->getPath().'/Entity/'.$entity.'.php';`
	`95`	`+ $entityPath = $bundle->getPath().'/Entity/'.str_replace('\\', '/', $entity).'.php';`
`96`	`96`	`if (file_exists($entityPath)) {`
`97`	`97`	`throw new \RuntimeException(sprintf("Entity %s already exists.", $class->name));`
`98`	`98`	`}`
`@@ -130,6 +130,5 @@ protected function execute(InputInterface $input, OutputInterface $output)`
`130`	`130`	`}`
`131`	`131`	`file_put_contents($mappingPath, $mappingCode);`
`132`	`132`	`}`
`133`		`-`
`134`	`133`	`}`
`135`	`134`	`}`