Revert "Fix CRUDController::editAction ignoring its optional parameter" (#3969)

soullivaneuh · web-flow · commit a2567128311d · 2016-06-23T20:22:02.000+02:00
diff --git a/Controller/CRUDController.php b/Controller/CRUDController.php
@@ -221,7 +221,7 @@ public function deleteAction($id)
     /**
      * Edit action.
      *
-     * @param int|string|null $id Optional ID to use instead of globally provided default.
+     * @param int|string|null $id
      *
      * @return Response|RedirectResponse
      *
@@ -234,7 +234,7 @@ public function editAction($id = null)
         // the key used to lookup the template
         $templateKey = 'edit';
 
-        $id = $id ?: $request->get($this->admin->getIdParameter());
+        $id = $request->get($this->admin->getIdParameter());
         $object = $this->admin->getObject($id);
 
         if (!$object) {

Original file line number	Diff line number	Diff line change
`@@ -221,7 +221,7 @@ public function deleteAction($id)`
`221`	`221`	`/**`
`222`	`222`	`* Edit action.`
`223`	`223`	`*`
`224`		`- * @param int\|string\|null $id Optional ID to use instead of globally provided default.`
	`224`	`+ * @param int\|string\|null $id`
`225`	`225`	`*`
`226`	`226`	`* @return Response\|RedirectResponse`
`227`	`227`	`*`
`@@ -234,7 +234,7 @@ public function editAction($id = null)`
`234`	`234`	`// the key used to lookup the template`
`235`	`235`	`$templateKey = 'edit';`
`236`	`236`
`237`		`- $id = $id ?: $request->get($this->admin->getIdParameter());`
	`237`	`+ $id = $request->get($this->admin->getIdParameter());`
`238`	`238`	`$object = $this->admin->getObject($id);`
`239`	`239`
`240`	`240`	`if (!$object) {`