bug #132 make:crud skeleton optimization (sadikoff)

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

Discussion
----------

make:crud skeleton optimization

Lets start from `Controller::delete` action. I don't think we need 2 return statements here.

Maybe it will be better to add some flash messages?

Commits
-------

97841c1 simplify CrudControllerWebTest (we need only check if index works)
43ce972 added tests for crud generation with entity repository
4d1e2d8 fixing #134
1f4455e skeleton template Controller optimization

Author: weaverryan

src/Resources/skeleton/crud/controller/Controller.tpl.php

@@ -23,7 +23,7 @@ class <?= $class_name ?> extends Controller
 <?php if (isset($repository_full_class_name)): ?>
     public function index(<?= $repository_class_name ?> $<?= $repository_var ?>): Response
     {
-        return $this->render('<?= $route_name ?>/index.html.twig', ['<?= $entity_var_plural ?>' => $<?= $repository_var ?>->findAll()]);
+        return $this->render('<?= $route_name ?>/index.html.twig', ['<?= $entity_twig_var_plural ?>' => $<?= $repository_var ?>->findAll()]);
     }
 <?php else: ?>
     public function index(): Response
@@ -92,14 +92,12 @@ public function edit(Request $request, <?= $entity_class_name ?> $<?= $entity_va
      */
     public function delete(Request $request, <?= $entity_class_name ?> $<?= $entity_var_singular ?>): Response
     {
-        if (!$this->isCsrfTokenValid('delete'.$<?= $entity_var_singular ?>->get<?= ucfirst($entity_identifier) ?>(), $request->request->get('_token'))) {
-            return $this->redirectToRoute('<?= $route_name ?>_index');
+        if ($this->isCsrfTokenValid('delete'.$<?= $entity_var_singular ?>->get<?= ucfirst($entity_identifier) ?>(), $request->request->get('_token'))) {
+            $em = $this->getDoctrine()->getManager();
+            $em->remove($<?= $entity_var_singular ?>);
+            $em->flush();
         }
 
-        $em = $this->getDoctrine()->getManager();
-        $em->remove($<?= $entity_var_singular ?>);
-        $em->flush();
-
         return $this->redirectToRoute('<?= $route_name ?>_index');
     }
 }

tests/Maker/FunctionalTest.php

@@ -344,6 +344,35 @@ public function getCommandTests()
             })
         ];
 
+        yield 'crud_repository' => [MakerTestDetails::createTest(
+            $this->getMakerInstance(MakeCrud::class),
+            [
+                // entity class name
+                'SweetFood',
+            ])
+            ->setFixtureFilesPath(__DIR__.'/../fixtures/MakeCrudRepository')
+            // need for crud web tests
+            ->addExtraDependencies('symfony/css-selector')
+            ->addReplacement(
+                'phpunit.xml.dist',
+                'mysql://db_user:db_password@127.0.0.1:3306/db_name',
+                'sqlite:///%kernel.project_dir%/var/app.db'
+            )
+            ->addReplacement(
+                '.env',
+                'mysql://db_user:db_password@127.0.0.1:3306/db_name',
+                'sqlite:///%kernel.project_dir%/var/app.db'
+            )
+            ->addPreMakeCommand('php bin/console doctrine:schema:create --env=test')
+            ->assert(function(string $output, string $directory) {
+                 $this->assertFileExists($directory.'/src/Controller/SweetFoodController.php');
+                 $this->assertFileExists($directory.'/src/Form/SweetFoodType.php');
+
+                 $this->assertContains('created: src/Controller/SweetFoodController.php', $output);
+                 $this->assertContains('created: src/Form/SweetFoodType.php', $output);
+            })
+        ];
+
         yield 'crud_with_no_base' => [MakerTestDetails::createTest(
             $this->getMakerInstance(MakeCrud::class),
             [

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

@@ -0,0 +1,44 @@
+<?php
+
+namespace App\Entity;
+
+use Doctrine\ORM\Mapping as ORM;
+
+/**
+ * @ORM\Entity(repositoryClass="App\Repository\SweetFoodRepository")
+ */
+class SweetFood
+{
+    /**
+     * @ORM\Column(name="id", type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue(strategy="AUTO")
+     */
+    private $id;
+
+    /**
+     * @ORM\Column(name="title", type="string", length=255)
+     */
+    private $title;
+
+    public function getId()
+    {
+        return $this->id;
+    }
+
+    /**
+     * @return string
+     */
+    public function getTitle()
+    {
+        return $this->title;
+    }
+
+    /**
+     * @param string $title
+     */
+    public function setTitle($title)
+    {
+        $this->title = $title;
+    }
+}

tests/fixtures/MakeCrudRepository/src/Repository/SweetFoodRepository.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace App\Repository;
+
+use App\Entity\SweetFood;
+use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
+use Symfony\Bridge\Doctrine\RegistryInterface;
+
+/**
+ * @method SweetFood|null find($id, $lockMode = null, $lockVersion = null)
+ * @method SweetFood|null findOneBy(array $criteria, array $orderBy = null)
+ * @method SweetFood[]    findAll()
+ * @method SweetFood[]    findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null)
+ */
+class SweetFoodRepository extends ServiceEntityRepository
+{
+    public function __construct(RegistryInterface $registry)
+    {
+        parent::__construct($registry, SweetFood::class);
+    }
+
+    /*
+    public function findBySomething($value)
+    {
+        return $this->createQueryBuilder('t')
+            ->where('t.something = :value')->setParameter('value', $value)
+            ->orderBy('t.id', 'ASC')
+            ->setMaxResults(10)
+            ->getQuery()
+            ->getResult()
+        ;
+    }
+    */
+}

tests/fixtures/MakeCrudRepository/tests/GeneratedCrudControllerTest.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace App\Tests;
+
+use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
+
+class GeneratedCrudControllerTest extends WebTestCase
+{
+    public function testIndexAction()
+    {
+        $client = self::createClient();
+        $client->request('GET', '/sweet/food/');
+        $this->assertTrue($client->getResponse()->isSuccessful());
+    }
+}