fix variables to follow official recommendations

sadikoff · sadikoff · commit f740e2ecb8e4 · 2018-03-06T14:01:49.000+02:00
diff --git a/src/Maker/MakeCrud.php b/src/Maker/MakeCrud.php
@@ -119,6 +119,10 @@ public function generate(InputInterface $input, ConsoleStyle $io, Generator $gen
 
         $entityVarPlural = lcfirst(Inflector::pluralize($entityClassDetails->getShortName()));
         $entityVarSingular = lcfirst(Inflector::singularize($entityClassDetails->getShortName()));
+
+        $entityTwigVarPlural = Str::asTwigVariable($entityVarPlural);
+        $entityTwigVarSingular = Str::asTwigVariable($entityVarSingular);
+
         $routeName = Str::asRouteName($controllerClassDetails->getRelativeNameWithoutSuffix());
 
         $generator->generateClass(
@@ -132,7 +136,9 @@ public function generate(InputInterface $input, ConsoleStyle $io, Generator $gen
                     'route_path' => Str::asRoutePath($controllerClassDetails->getRelativeNameWithoutSuffix()),
                     'route_name' => $routeName,
                     'entity_var_plural' => $entityVarPlural,
+                    'entity_twig_var_plural' => $entityTwigVarPlural,
                     'entity_var_singular' => $entityVarSingular,
+                    'entity_twig_var_singular' => $entityTwigVarSingular,
                     'entity_identifier' => $entityDoctrineDetails->getIdentifier(),
                 ],
                 $repositoryVars
@@ -155,20 +161,20 @@ public function generate(InputInterface $input, ConsoleStyle $io, Generator $gen
         $templates = [
             '_delete_form' => [
                 'route_name' => $routeName,
-                'entity_var_singular' => $entityVarSingular,
+                'entity_twig_var_singular' => $entityTwigVarSingular,
                 'entity_identifier' => $entityDoctrineDetails->getIdentifier(),
             ],
             '_form' => [],
             'edit' => [
                 'entity_class_name' => $entityClassDetails->getShortName(),
-                'entity_var_singular' => $entityVarSingular,
+                'entity_twig_var_singular' => $entityTwigVarSingular,
                 'entity_identifier' => $entityDoctrineDetails->getIdentifier(),
                 'route_name' => $routeName,
             ],
             'index' => [
                 'entity_class_name' => $entityClassDetails->getShortName(),
-                'entity_var_plural' => $entityVarPlural,
-                'entity_var_singular' => $entityVarSingular,
+                'entity_twig_var_plural' => $entityTwigVarPlural,
+                'entity_twig_var_singular' => $entityTwigVarSingular,
                 'entity_identifier' => $entityDoctrineDetails->getIdentifier(),
                 'entity_fields' => $entityDoctrineDetails->getDisplayFields(),
                 'route_name' => $routeName,
@@ -179,7 +185,7 @@ public function generate(InputInterface $input, ConsoleStyle $io, Generator $gen
             ],
             'show' => [
                 'entity_class_name' => $entityClassDetails->getShortName(),
-                'entity_var_singular' => $entityVarSingular,
+                'entity_twig_var_singular' => $entityTwigVarSingular,
                 'entity_identifier' => $entityDoctrineDetails->getIdentifier(),
                 'entity_fields' => $entityDoctrineDetails->getDisplayFields(),
                 'route_name' => $routeName,
diff --git a/src/Resources/skeleton/crud/controller/Controller.tpl.php b/src/Resources/skeleton/crud/controller/Controller.tpl.php
@@ -32,7 +32,7 @@ public function index(): Response
             ->getRepository(<?= $entity_class_name ?>::class)
             ->findAll();
 
-        return $this->render('<?= $route_name ?>/index.html.twig', ['<?= $entity_var_plural ?>' => $<?= $entity_var_plural ?>]);
+        return $this->render('<?= $route_name ?>/index.html.twig', ['<?= $entity_twig_var_plural ?>' => $<?= $entity_var_plural ?>]);
     }
 <?php endif ?>
 
@@ -54,7 +54,7 @@ public function new(Request $request): Response
         }
 
         return $this->render('<?= $route_name ?>/new.html.twig', [
-            '<?= $entity_var_singular ?>' => $<?= $entity_var_singular ?>,
+            '<?= $entity_twig_var_singular ?>' => $<?= $entity_var_singular ?>,
             'form' => $form->createView(),
         ]);
     }
@@ -64,7 +64,7 @@ public function new(Request $request): Response
      */
     public function show(<?= $entity_class_name ?> $<?= $entity_var_singular ?>): Response
     {
-        return $this->render('<?= $route_name ?>/show.html.twig', ['<?= $entity_var_singular ?>' => $<?= $entity_var_singular ?>]);
+        return $this->render('<?= $route_name ?>/show.html.twig', ['<?= $entity_twig_var_singular ?>' => $<?= $entity_var_singular ?>]);
     }
 
     /**
@@ -82,7 +82,7 @@ public function edit(Request $request, <?= $entity_class_name ?> $<?= $entity_va
         }
 
         return $this->render('<?= $route_name ?>/edit.html.twig', [
-            '<?= $entity_var_singular ?>' => $<?= $entity_var_singular ?>,
+            '<?= $entity_twig_var_singular ?>' => $<?= $entity_var_singular ?>,
             'form' => $form->createView(),
         ]);
     }
diff --git a/src/Resources/skeleton/crud/templates/_delete_form.tpl.php b/src/Resources/skeleton/crud/templates/_delete_form.tpl.php
@@ -1,5 +1,5 @@
-<form method="post" action="{{ path('<?= $route_name ?>_delete', {'<?= $entity_identifier ?>': <?= $entity_var_singular ?>.<?= $entity_identifier ?>}) }}" onsubmit="return confirm('Are you sure you want to delete this item?');">
+<form method="post" action="{{ path('<?= $route_name ?>_delete', {'<?= $entity_identifier ?>': <?= $entity_twig_var_singular ?>.<?= $entity_identifier ?>}) }}" onsubmit="return confirm('Are you sure you want to delete this item?');">
     <input type="hidden" name="_method" value="DELETE">
-    <input type="hidden" name="_token" value="{{ csrf_token('delete' ~ <?= $entity_var_singular ?>.<?= $entity_identifier ?>) }}">
+    <input type="hidden" name="_token" value="{{ csrf_token('delete' ~ <?= $entity_twig_var_singular ?>.<?= $entity_identifier ?>) }}">
     <button class="btn">Delete</button>
 </form>
diff --git a/src/Resources/skeleton/crud/templates/index.tpl.php b/src/Resources/skeleton/crud/templates/index.tpl.php
@@ -13,14 +13,14 @@
             </tr>
         </thead>
         <tbody>
-        {% for <?= $entity_var_singular ?> in <?= $entity_var_plural ?> %}
+        {% for <?= $entity_twig_var_singular ?> in <?= $entity_twig_var_plural ?> %}
             <tr>
 <?php foreach ($entity_fields as $field): ?>
-                <td>{{ <?= $helper->getEntityFieldPrintCode($entity_var_singular, $field) ?> }}</td>
+                <td>{{ <?= $helper->getEntityFieldPrintCode($entity_twig_var_singular, $field) ?> }}</td>
 <?php endforeach; ?>
                 <td>
-                    <a href="{{ path('<?= $route_name ?>_show', {'<?= $entity_identifier ?>': <?= $entity_var_singular ?>.<?= $entity_identifier ?>}) }}">show</a>
-                    <a href="{{ path('<?= $route_name ?>_edit', {'<?= $entity_identifier ?>': <?= $entity_var_singular ?>.<?= $entity_identifier ?>}) }}">edit</a>
+                    <a href="{{ path('<?= $route_name ?>_show', {'<?= $entity_identifier ?>': <?= $entity_twig_var_singular ?>.<?= $entity_identifier ?>}) }}">show</a>
+                    <a href="{{ path('<?= $route_name ?>_edit', {'<?= $entity_identifier ?>': <?= $entity_twig_var_singular ?>.<?= $entity_identifier ?>}) }}">edit</a>
                 </td>
             </tr>
         {% else %}
diff --git a/src/Resources/skeleton/crud/templates/show.tpl.php b/src/Resources/skeleton/crud/templates/show.tpl.php
@@ -8,15 +8,15 @@
 <?php foreach ($entity_fields as $field): ?>
             <tr>
                 <th><?= ucfirst($field['fieldName']) ?></th>
-                <td>{{ <?= $helper->getEntityFieldPrintCode($entity_var_singular, $field) ?> }}</td>
+                <td>{{ <?= $helper->getEntityFieldPrintCode($entity_twig_var_singular, $field) ?> }}</td>
             </tr>
 <?php endforeach; ?>
         </tbody>
     </table>
 
     <a href="{{ path('<?= $route_name ?>_index') }}">back to list</a>
 
-    <a href="{{ path('<?= $route_name ?>_edit', {'<?= $entity_identifier ?>': <?= $entity_var_singular ?>.<?= $entity_identifier ?>}) }}">edit</a>
+    <a href="{{ path('<?= $route_name ?>_edit', {'<?= $entity_identifier ?>': <?= $entity_twig_var_singular ?>.<?= $entity_identifier ?>}) }}">edit</a>
 
     {{ include('<?= $route_name ?>/_delete_form.html.twig') }}
 {% endblock %}

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public function index(): Response`
`32`	`32`	`->getRepository(<?= $entity_class_name ?>::class)`
`33`	`33`	`->findAll();`
`34`	`34`
`35`		`- return $this->render('<?= $route_name ?>/index.html.twig', ['<?= $entity_var_plural ?>' => $<?= $entity_var_plural ?>]);`
	`35`	`+ return $this->render('<?= $route_name ?>/index.html.twig', ['<?= $entity_twig_var_plural ?>' => $<?= $entity_var_plural ?>]);`
`36`	`36`	`}`
`37`	`37`	`<?php endif ?>`
`38`	`38`
`@@ -54,7 +54,7 @@ public function new(Request $request): Response`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`return $this->render('<?= $route_name ?>/new.html.twig', [`
`57`		`- '<?= $entity_var_singular ?>' => $<?= $entity_var_singular ?>,`
	`57`	`+ '<?= $entity_twig_var_singular ?>' => $<?= $entity_var_singular ?>,`
`58`	`58`	`'form' => $form->createView(),`
`59`	`59`	`]);`
`60`	`60`	`}`
`@@ -64,7 +64,7 @@ public function new(Request $request): Response`
`64`	`64`	`*/`
`65`	`65`	`public function show(<?= $entity_class_name ?> $<?= $entity_var_singular ?>): Response`
`66`	`66`	`{`
`67`		`- return $this->render('<?= $route_name ?>/show.html.twig', ['<?= $entity_var_singular ?>' => $<?= $entity_var_singular ?>]);`
	`67`	`+ return $this->render('<?= $route_name ?>/show.html.twig', ['<?= $entity_twig_var_singular ?>' => $<?= $entity_var_singular ?>]);`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`/**`
`@@ -82,7 +82,7 @@ public function edit(Request $request, <?= $entity_class_name ?> $<?= $entity_va`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`return $this->render('<?= $route_name ?>/edit.html.twig', [`
`85`		`- '<?= $entity_var_singular ?>' => $<?= $entity_var_singular ?>,`
	`85`	`+ '<?= $entity_twig_var_singular ?>' => $<?= $entity_var_singular ?>,`
`86`	`86`	`'form' => $form->createView(),`
`87`	`87`	`]);`
`88`	`88`	`}`