bug #545 Make User: availability to chose table's name (nikophil)

This PR was squashed before being merged into the 1.0-dev branch (closes #545).

Discussion
----------

Make User: availability to chose table's name

Hello,

this fixes #485

i may provide a fix for #473 in another PR

Commits
-------

4b42eca check table name using  naming strategy
966c355 MakeUser: availability to chose table's name

Author: weaverryan

src/Doctrine/DoctrineHelper.php

@@ -15,8 +15,11 @@
 use Doctrine\Common\Persistence\Mapping\ClassMetadata as LegacyClassMetadata;
 use Doctrine\Common\Persistence\Mapping\Driver\MappingDriver as LegacyMappingDriver;
 use Doctrine\Common\Persistence\Mapping\MappingException as LegacyPersistenceMappingException;
+use Doctrine\DBAL\Connection;
+use Doctrine\ORM\Configuration;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Mapping\MappingException as ORMMappingException;
+use Doctrine\ORM\Mapping\NamingStrategy;
 use Doctrine\ORM\Tools\DisconnectedClassMetadataFactory;
 use Doctrine\Persistence\ManagerRegistry;
 use Doctrine\Persistence\Mapping\AbstractClassMetadataFactory;
@@ -219,4 +222,26 @@ private function isInstanceOf($object, string $class): bool
 
         return $object instanceof $class || $object instanceof $legacyClass;
     }
+
+    public function getPotentialTableName(string $className): string
+    {
+        $entityManager = $this->registry->getManager();
+
+        if (!$entityManager instanceof EntityManagerInterface) {
+            throw new \RuntimeException('ObjectManager is not an EntityManagerInterface.');
+        }
+
+        /** @var NamingStrategy $namingStrategy */
+        $namingStrategy = $entityManager->getConfiguration()->getNamingStrategy();
+
+        return $namingStrategy->classToTableName($className);
+    }
+
+    public function isKeyword(string $name): bool
+    {
+        /** @var Connection $connection */
+        $connection = $this->getRegistry()->getConnection();
+
+        return $connection->getDatabasePlatform()->getReservedKeywordsList()->isKeyword($name);
+    }
 }

src/Doctrine/EntityClassGenerator.php

@@ -22,10 +22,12 @@
 final class EntityClassGenerator
 {
     private $generator;
+    private $doctrineHelper;
 
-    public function __construct(Generator $generator)
+    public function __construct(Generator $generator, DoctrineHelper $doctrineHelper)
     {
         $this->generator = $generator;
+        $this->doctrineHelper = $doctrineHelper;
     }
 
     public function generateEntityClass(ClassNameDetails $entityClassDetails, bool $apiResource, bool $withPasswordUpgrade = false): string
@@ -36,12 +38,16 @@ public function generateEntityClass(ClassNameDetails $entityClassDetails, bool $
             'Repository'
         );
 
+        $tableName = $this->doctrineHelper->getPotentialTableName($entityClassDetails->getFullName());
+
         $entityPath = $this->generator->generateClass(
             $entityClassDetails->getFullName(),
             'doctrine/Entity.tpl.php',
             [
                 'repository_full_class_name' => $repoClassDetails->getFullName(),
                 'api_resource' => $apiResource,
+                'should_escape_table_name' => $this->doctrineHelper->isKeyword($tableName),
+                'table_name' => $tableName,
             ]
         );
 

src/Maker/MakeEntity.php

@@ -137,7 +137,7 @@ public function generate(InputInterface $input, ConsoleStyle $io, Generator $gen
 
         $classExists = class_exists($entityClassDetails->getFullName());
         if (!$classExists) {
-            $entityClassGenerator = new EntityClassGenerator($generator);
+            $entityClassGenerator = new EntityClassGenerator($generator, $this->doctrineHelper);
             $entityPath = $entityClassGenerator->generateEntityClass(
                 $entityClassDetails,
                 $input->getOption('api-resource')

src/Maker/MakeUser.php

@@ -14,6 +14,7 @@
 use Doctrine\Bundle\DoctrineBundle\DoctrineBundle;
 use Symfony\Bundle\MakerBundle\ConsoleStyle;
 use Symfony\Bundle\MakerBundle\DependencyBuilder;
+use Symfony\Bundle\MakerBundle\Doctrine\DoctrineHelper;
 use Symfony\Bundle\MakerBundle\Doctrine\EntityClassGenerator;
 use Symfony\Bundle\MakerBundle\Doctrine\ORMDependencyBuilder;
 use Symfony\Bundle\MakerBundle\Exception\RuntimeCommandException;
@@ -49,11 +50,14 @@ final class MakeUser extends AbstractMaker
 
     private $configUpdater;
 
-    public function __construct(FileManager $fileManager, UserClassBuilder $userClassBuilder, SecurityConfigUpdater $configUpdater)
+    private $doctrineHelper;
+
+    public function __construct(FileManager $fileManager, UserClassBuilder $userClassBuilder, SecurityConfigUpdater $configUpdater, DoctrineHelper $doctrineHelper)
     {
         $this->fileManager = $fileManager;
         $this->userClassBuilder = $userClassBuilder;
         $this->configUpdater = $configUpdater;
+        $this->doctrineHelper = $doctrineHelper;
     }
 
     public static function getCommandName(): string
@@ -135,7 +139,7 @@ public function generate(InputInterface $input, ConsoleStyle $io, Generator $gen
 
         // A) Generate the User class
         if ($userClassConfiguration->isEntity()) {
-            $entityClassGenerator = new EntityClassGenerator($generator);
+            $entityClassGenerator = new EntityClassGenerator($generator, $this->doctrineHelper);
             $classPath = $entityClassGenerator->generateEntityClass(
                 $userClassNameDetails,
                 false, // api resource
@@ -157,6 +161,7 @@ public function generate(InputInterface $input, ConsoleStyle $io, Generator $gen
             $manipulator,
             $userClassConfiguration
         );
+
         $generator->dumpFile($classPath, $manipulator->getSourceCode());
 
         // C) Generate a custom user provider, if necessary

src/Resources/config/makers.xml

@@ -97,6 +97,7 @@
                 <argument type="service" id="maker.file_manager" />
                 <argument type="service" id="maker.user_class_builder" />
                 <argument type="service" id="maker.security_config_updater" />
+                <argument type="service" id="maker.doctrine_helper" />
                 <tag name="maker.command" />
             </service>
 

src/Resources/skeleton/doctrine/Entity.tpl.php

@@ -10,6 +10,8 @@
 <?php if ($api_resource): ?> * @ApiResource()
 <?php endif ?>
  * @ORM\Entity(repositoryClass="<?= $repository_full_class_name ?>")
+<?php if ($should_escape_table_name): ?> * @ORM\Table(name="`<?= $table_name ?>`")
+<?php endif ?>
  */
 class <?= $class_name."\n" ?>
 {