bug #186 fix crud template - entity field with underscore (LeJeanbono)

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

Discussion
----------

fix crud template - entity field with underscore

#176

Commits
-------

3c956d4 fix crud template - cs fixer
bc14d02 fix crud template - entity field with underscore
5bcf6c7 fix crud template - entity field with underscore

Author: weaverryan

src/GeneratorTwigHelper.php

@@ -25,7 +25,10 @@ public function __construct(FileManager $fileManager)
 
     public function getEntityFieldPrintCode($entity, $field): string
     {
-        $printCode = $entity.'.'.$field['fieldName'];
+        $twigField = preg_replace_callback('/(?!^)_([a-z0-9])/', function ($s) {
+            return strtoupper($s[1]);
+        }, $field['fieldName']);
+        $printCode = $entity.'.'.str_replace('_', '', $twigField);
 
         switch ($field['type']) {
             case 'datetime':

tests/GeneratorTwigHelperTest.php

@@ -0,0 +1,103 @@
+<?php
+
+namespace Symfony\Bundle\MakerBundle\Tests;
+
+use Symfony\Bundle\MakerBundle\FileManager;
+use Symfony\Bundle\MakerBundle\GeneratorTwigHelper;
+use PHPUnit\Framework\TestCase;
+
+class GeneratorTwigHelperTest extends TestCase
+{
+
+    /**
+     * @dataProvider getEntityFieldPrintCodeTests
+     * @param string $entity
+     * @param string $fieldName
+     * @param string $fieldType
+     * @param string $expect
+     */
+    public function testGetEntityFieldPrintCode(string $entity, string $fieldName, string $fieldType, string $expect)
+    {
+        $generator = new GeneratorTwigHelper($this->createMock(FileManager::class));
+        $field = [];
+        $field['fieldName'] = $fieldName;
+        $field['type'] = $fieldType;
+
+        $result = $generator->getEntityFieldPrintCode($entity, $field);
+
+        $this->assertSame($expect, $result);
+    }
+
+    public function getEntityFieldPrintCodeTests()
+    {
+        yield 'normal' => [
+            'entity',
+            'normal',
+            'string',
+            'entity.normal'
+        ];
+
+        yield 'normal_upper' => [
+            'entity',
+            'normalUpper',
+            'string',
+            'entity.normalUpper'
+        ];
+
+        yield 'underscore' => [
+            'entity',
+            'with_underscore',
+            'string',
+            'entity.withUnderscore'
+        ];
+
+        yield 'underscore_number' => [
+            'entity',
+            'field_100',
+            'string',
+            'entity.field100'
+        ];
+
+        yield 'underscore_first' => [
+            'entity',
+            '_field',
+            'string',
+            'entity.field'
+        ];
+
+        yield 'normal_datetime' => [
+            'entity',
+            'normal',
+            'datetime',
+            'entity.normal ? entity.normal|date(\'Y-m-d H:i:s\') : \'\''
+        ];
+
+        yield 'normal_date' => [
+            'entity',
+            'normal',
+            'date',
+            'entity.normal ? entity.normal|date(\'Y-m-d\') : \'\''
+        ];
+
+        yield 'normal_time' => [
+            'entity',
+            'normal',
+            'time',
+            'entity.normal ? entity.normal|date(\'H:i:s\') : \'\''
+        ];
+
+        yield 'normal_array' => [
+            'entity',
+            'normal',
+            'array',
+            'entity.normal ? entity.normal|join(\', \') : \'\''
+        ];
+
+        yield 'normal_boolean' => [
+            'entity',
+            'normal',
+            'boolean',
+            'entity.normal ? \'Yes\' : \'No\''
+        ];
+    }
+}

tests/fixtures/MakeCrud/src/Entity/SweetFood.php

@@ -41,4 +41,5 @@ public function setTitle($title)
     {
         $this->title = $title;
     }
+
 }