Fixes thanks to Stof!

symfony · Feb 27, 2018 · c79b73c · c79b73c
1 parent 6c914fa
commit c79b73c
Show file tree

Hide file tree

Showing 7 changed files with 68 additions and 32 deletions.
diff --git a/src/Doctrine/DoctrineMetadataFactory.php b/src/Doctrine/DoctrineMetadataFactory.php
@@ -19,6 +19,7 @@
  * Simpler version of DoctrineBundle's DisconnectedMetadataFactory, to
  * avoid PSR-4 issues.
  *
+ * @internal
  * @author Fabien Potencier <fabien@symfony.com>
  * @author Ryan Weaver <ryan@knpuniversity.com>
  */

diff --git a/src/Maker/MakeEntity.php b/src/Maker/MakeEntity.php
@@ -14,6 +14,7 @@
 use Doctrine\Bundle\DoctrineBundle\DoctrineBundle;
 use Doctrine\Common\Persistence\ManagerRegistry;
 use Doctrine\DBAL\Types\Type;
+use Doctrine\ORM\Mapping\Column;
 use Psr\Container\ContainerInterface;
 use Symfony\Bundle\MakerBundle\ConsoleStyle;
 use Symfony\Bundle\MakerBundle\DependencyBuilder;
@@ -262,10 +263,17 @@ public function generate(InputInterface $input, ConsoleStyle $io, Generator $gen
 
     public function configureDependencies(DependencyBuilder $dependencies)
     {
+        // guarantee DoctrineBundle
         $dependencies->addClassDependency(
             DoctrineBundle::class,
             'orm'
         );
+
+        // guarantee ORM
+        $dependencies->addClassDependency(
+            Column::class,
+            'orm'
+        );
     }
 
     private function askForNextField(ConsoleStyle $io, array $fields, string $entityClass)
@@ -290,15 +298,15 @@ private function askForNextField(ConsoleStyle $io, array $fields, string $entity
 
         $defaultType = 'string';
         // try to guess the type by the field name prefix/suffix
-        // convert to camel case for simplicity
-        $camelCasedField = Str::snakeCase($fieldName);
-        if ('_at' == substr($camelCasedField, -3)) {
+        // convert to snake case for simplicity
+        $snakeCasedField = Str::asSnakeCase($fieldName);
+        if ('_at' == substr($snakeCasedField, -3)) {
             $defaultType = 'datetime';
-        } elseif ('_id' == substr($camelCasedField, -3)) {
+        } elseif ('_id' == substr($snakeCasedField, -3)) {
             $defaultType = 'integer';
-        } elseif ('is_' == substr($camelCasedField, 0, 3)) {
+        } elseif ('is_' == substr($snakeCasedField, 0, 3)) {
             $defaultType = 'boolean';
-        } elseif ('has_' == substr($camelCasedField, 0, 4)) {
+        } elseif ('has_' == substr($snakeCasedField, 0, 4)) {
             $defaultType = 'boolean';
         }
 
@@ -514,20 +522,21 @@ function ($name) use ($targetClass) {
 
         $askOrphanRemoval = function (string $owningClass, string $inverseClass) use ($io) {
             $io->text([
+                'Do you want to activate <comment>orphanRemoval</comment> on your relationship?',
                 sprintf(
-                    'A <comment>%s</comment> becomes "orphaned" if it is removed from its related <comment>%s</comment>.',
+                    'A <comment>%s</comment> is "orphaned" when it is removed from its related <comment>%s</comment>.',
                     Str::getShortClassName($owningClass),
                     Str::getShortClassName($inverseClass)
                 ),
                 sprintf(
-                    'For example: <comment>$%s->remove%s($%s)</comment>',
+                    'e.g. <comment>$%s->remove%s($%s)</comment>',
                     Str::asLowerCamelCase(Str::getShortClassName($inverseClass)),
                     Str::asCamelCase(Str::getShortClassName($owningClass)),
                     Str::asLowerCamelCase(Str::getShortClassName($owningClass))
                 ),
                 '',
                 sprintf(
-                    'NOTE: If a <comment>%s</comment> should be allowed to *change* from one <comment>%s</comment> to another, answer "no".',
+                    'NOTE: If a <comment>%s</comment> may *change* from one <comment>%s</comment> to another, answer "no".',
                     Str::getShortClassName($owningClass),
                     Str::getShortClassName($inverseClass)
                 ),

diff --git a/src/Resources/skeleton/doctrine/Repository.tpl.php b/src/Resources/skeleton/doctrine/Repository.tpl.php
@@ -31,13 +31,13 @@ public function findByExampleField($value)
             ->orderBy('<?= $entity_alias; ?>.id', 'ASC')
             ->setMaxResults(10)
             ->getQuery()
-            ->execute()
+            ->getResult()
         ;
     }
     */
 
     /*
-    public function findOneBySomeField($value): <?= $entity_class_name."\n" ?>
+    public function findOneBySomeField($value): ?<?= $entity_class_name."\n" ?>
     {
         return $this->createQueryBuilder('<?= $entity_alias ?>')
             ->andWhere('<?= $entity_alias ?>.exampleField = :val')

diff --git a/src/Str.php b/src/Str.php
@@ -87,7 +87,7 @@ public static function asLowerCamelCase(string $str): string
 
     public static function asCamelCase(string $str): string
     {
-        return strtr(ucwords(strtr($str, ['_' => ' ', '.' => '_ ', '\\' => '_ '])), [' ' => '']);
+        return strtr(ucwords(strtr($str, ['_' => ' ', '.' => ' ', '\\' => ' '])), [' ' => '']);
     }
 
     public static function asRoutePath(string $value): string
@@ -100,7 +100,7 @@ public static function asRouteName(string $value): string
         return self::asTwigVariable($value);
     }
 
-    public static function snakeCase(string $value): string
+    public static function asSnakeCase(string $value): string
     {
         return self::asTwigVariable($value);
     }
@@ -145,7 +145,7 @@ public static function getNamespace(string $fullClassName): string
 
     public static function singularCamelCaseToPluralCamelCase(string $camelCase): string
     {
-        $snake = self::snakeCase($camelCase);
+        $snake = self::asSnakeCase($camelCase);
         $words = explode('_', $snake);
         $words[count($words) - 1] = Inflector::pluralize($words[count($words) - 1]);
         $reSnaked = implode('_', $words);
@@ -155,7 +155,7 @@ public static function singularCamelCaseToPluralCamelCase(string $camelCase): st
 
     public static function pluralCamelCaseToSingular(string $camelCase): string
     {
-        $snake = self::snakeCase($camelCase);
+        $snake = self::asSnakeCase($camelCase);
         $words = explode('_', $snake);
         $words[count($words) - 1] = Inflector::singularize($words[count($words) - 1]);
         $reSnaked = implode('_', $words);

diff --git a/src/Util/ClassSourceManipulator.php b/src/Util/ClassSourceManipulator.php
@@ -199,33 +199,44 @@ private function createSetterNodeBuilder(string $propertyName, ?string $type, bo
     private function buildAnnotationLine(string $annotationClass, array $options)
     {
         $formattedOptions = array_map(function ($option, $value) {
-            $quoteValue = !(is_bool($value) || is_int($value) || is_array($value));
-
-            if (is_bool($value)) {
-                $value = $value ? 'true' : 'false';
-            }
-
             if (is_array($value)) {
                 if (!isset($value[0])) {
                     // associative array: we'll add this if/when we need it
                     throw new \Exception('Not currently supported');
                 }
 
-                $value = sprintf('{%s}', implode(', ', array_map(function ($val) {
-                    return sprintf('"%s"', $val);
+                return sprintf('%s={%s}', $option, implode(', ', array_map(function ($val) {
+                    return $this->quoteAnnotationValue($val);
                 }, $value)));
             }
 
-            if ($quoteValue) {
-                return sprintf('%s="%s"', $option, $value);
-            }
-
-            return sprintf('%s=%s', $option, $value);
+            return sprintf('%s=%s', $option, $this->quoteAnnotationValue($value));
         }, array_keys($options), array_values($options));
 
         return sprintf('%s(%s)', $annotationClass, implode(', ', $formattedOptions));
     }
 
+    private function quoteAnnotationValue($value)
+    {
+        if (is_bool($value)) {
+            return $value ? 'true' : 'false';
+        }
+
+        if (null === $value) {
+            return 'null';
+        }
+
+        if (is_int($value)) {
+            return $value;
+        }
+
+        if (is_array($value)) {
+            throw new \Exception('Invalid value: loop before quoting.');
+        }
+
+        return sprintf('"%s"', $value);
+    }
+
     private function addSingularRelation(BaseRelation $relation)
     {
         $typeHint = $this->addUseStatementIfNecessary($relation->getTargetClassName());
@@ -774,8 +785,6 @@ private function getEntityTypeHint($doctrineType)
 
             case 'array':
             case 'simple_array':
-            case 'json_array':
-            case 'json':
                 return 'array';
 
             case 'boolean':
@@ -804,6 +813,8 @@ private function getEntityTypeHint($doctrineType)
             case 'dateinterval':
                 return '\DateInterval';
 
+            case 'json_array':
+            case 'json':
             case 'object':
             case 'decimal':
             case 'binary':

diff --git a/tests/Doctrine/fixtures/expected_xml/src/Repository/UserRepository.php b/tests/Doctrine/fixtures/expected_xml/src/Repository/UserRepository.php
@@ -25,13 +25,13 @@ public function findByExampleField($value)
             ->orderBy('u.id', 'ASC')
             ->setMaxResults(10)
             ->getQuery()
-            ->execute()
+            ->getResult()
         ;
     }
     */
 
     /*
-    public function findOneBySomeField($value): User
+    public function findOneBySomeField($value): ?User
     {
         return $this->createQueryBuilder('u')
             ->andWhere('u.exampleField = :val')

diff --git a/tests/StrTest.php b/tests/StrTest.php
@@ -146,4 +146,19 @@ public function getNamespaceTests()
         yield ['App\\Entity\\Foo', 'App\\Entity'];
         yield ['DateTime', ''];
     }
+
+    /**
+     * @dataProvider getAsCamelCaseTests
+     */
+    public function testAsCamelCase(string $original, string $expected)
+    {
+        $this->assertSame($expected, Str::asCamelCase($original));
+    }
+
+    public function getAsCamelCaseTests()
+    {
+        yield ['foo', 'Foo'];
+
+        yield ['foo_bar.baz\\pizza', 'FooBarBazPizza'];
+    }
 }