Merge pull request #237 from symfony-cmf/sonata-compat

lsmith77 · lsmith77 · commit 8bb902226ca1 · 2015-12-12T18:20:40.000+01:00
Fix SonataAdminBundle 2.4 compatibility
diff --git a/Admin/MenuNodeAdmin.php b/Admin/MenuNodeAdmin.php
@@ -82,9 +82,9 @@ protected function configureFormFields(FormMapper $formMapper)
     /**
      * {@inheritdoc}
      */
-    public function defineFormBuilder(FormBuilder $formBuilder)
+    public function getFormBuilder()
     {
-        parent::defineFormBuilder($formBuilder);
+        $formBuilder = parent::getFormBuilder();
 
         $formBuilder->addEventListener(FormEvents::POST_SET_DATA, function (FormEvent $event) {
             if (!$event->getForm()->has('link')) {
@@ -146,6 +146,8 @@ public function defineFormBuilder(FormBuilder $formBuilder)
                     break;
             }
         });
+        
+        return $formBuilder;
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -82,9 +82,9 @@ protected function configureFormFields(FormMapper $formMapper)`
`82`	`82`	`/**`
`83`	`83`	`* {@inheritdoc}`
`84`	`84`	`*/`
`85`		`- public function defineFormBuilder(FormBuilder $formBuilder)`
	`85`	`+ public function getFormBuilder()`
`86`	`86`	`{`
`87`		`- parent::defineFormBuilder($formBuilder);`
	`87`	`+ $formBuilder = parent::getFormBuilder();`
`88`	`88`
`89`	`89`	`$formBuilder->addEventListener(FormEvents::POST_SET_DATA, function (FormEvent $event) {`
`90`	`90`	`if (!$event->getForm()->has('link')) {`
`@@ -146,6 +146,8 @@ public function defineFormBuilder(FormBuilder $formBuilder)`
`146`	`146`	`break;`
`147`	`147`	`}`
`148`	`148`	`});`
	`149`	`+`
	`150`	`+ return $formBuilder;`
`149`	`151`	`}`
`150`	`152`
`151`	`153`	`/**`