Remove extra arguments

BacLuc · Jan 10, 2017 · 0c625e4 · 0c625e4
1 parent 54ea626
commit 0c625e4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/Controller/CRUDController.php b/Controller/CRUDController.php
@@ -111,7 +111,7 @@ public function listAction()
             'form' => $formView,
             'datagrid' => $datagrid,
             'csrf_token' => $this->getCsrfToken('sonata.batch'),
-        ), null, $request);
+        ), null);
     }
 
     /**
@@ -505,7 +505,7 @@ public function createAction()
             $isFormValid = $form->isValid();
 
             // persist if the form was valid and if in preview mode the preview was approved
-            if ($isFormValid && (!$this->isInPreviewMode($request) || $this->isPreviewApproved($request))) {
+            if ($isFormValid && (!$this->isInPreviewMode() || $this->isPreviewApproved())) {
                 $this->admin->checkAccess('create', $object);
 
                 try {
@@ -646,7 +646,7 @@ public function historyAction($id = null)
             'object' => $object,
             'revisions' => $revisions,
             'currentRevision' => $revisions ? current($revisions) : false,
-        ), null, $request);
+        ), null);
     }
 
     /**
@@ -900,7 +900,7 @@ public function aclAction($id = null)
             'roles' => $aclRoles,
             'aclUsersForm' => $aclUsersForm->createView(),
             'aclRolesForm' => $aclRolesForm->createView(),
-        ), null, $request);
+        ), null);
     }
 
     /**

diff --git a/Controller/HelperController.php b/Controller/HelperController.php
@@ -144,7 +144,7 @@ public function retrieveFormFieldElementAction(Request $request)
 
         $admin->setSubject($subject);
 
-        $formBuilder = $admin->getFormBuilder($subject);
+        $formBuilder = $admin->getFormBuilder();
 
         $form = $formBuilder->getForm();
         $form->handleRequest($request);