Merge branch 'master' of https://github.com/sadikoff/maker-bundle

Author: sadikoff

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

@@ -29,19 +29,6 @@ public function index()
         return $this->render('<?= $route_name; ?>/index.html.twig', ['<?= $entity_var_plural; ?>' => $<?= $entity_var_plural; ?>]);
     }
 
-    /**
-     * @Route("/{<?= $entity_identifier; ?>}", name="show")
-     * @Method("GET")
-     */
-    public function show(<?= $entity_class_name; ?> $<?= $entity_var_singular; ?>)
-    {
-        $deleteForm = $this->createDeleteForm($<?= $entity_var_singular; ?>);
-
-        return $this->render('<?= $route_name; ?>/show.html.twig', [
-            '<?= $entity_var_singular; ?>' => $<?= $entity_var_singular; ?>,
-        ]);
-    }
-
     /**
      * @Route("/new", name="new")
      * @Method({"GET", "POST"})
@@ -66,6 +53,19 @@ public function new(Request $request)
         ]);
     }
 
+    /**
+     * @Route("/{<?= $entity_identifier; ?>}", name="show")
+     * @Method("GET")
+     */
+    public function show(<?= $entity_class_name; ?> $<?= $entity_var_singular; ?>)
+    {
+        $deleteForm = $this->createDeleteForm($<?= $entity_var_singular; ?>);
+
+        return $this->render('<?= $route_name; ?>/show.html.twig', [
+            '<?= $entity_var_singular; ?>' => $<?= $entity_var_singular; ?>,
+        ]);
+    }
+
     /**
      * @Route("/{<?= $entity_identifier; ?>}/edit", name="edit")
      * @Method({"GET", "POST"})
@@ -95,7 +95,7 @@ public function edit(Request $request, <?= $entity_class_name; ?> $<?= $entity_v
      */
     public function delete(Request $request, <?= $entity_class_name; ?> $<?= $entity_var_singular; ?>)
     {
-        if (!$this->isCsrfTokenValid('delete'.$<?= $entity_var_singular; ?>->get<?= ucfirst($entity_identifier); ?>(), $request->request->get('token'))) {
+        if (!$this->isCsrfTokenValid('delete'.$<?= $entity_var_singular; ?>->get<?= ucfirst($entity_identifier); ?>(), $request->request->get('_token'))) {
             return $this->redirectToRoute('<?= $route_name; ?>_index');
         }