fix sonata-project#2499

qsomazzi · Oct 16, 2014 · 201375d · 201375d
1 parent 7f4da51
commit 201375d
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/Form/Extension/Field/Type/FormTypeFieldExtension.php b/Form/Extension/Field/Type/FormTypeFieldExtension.php
@@ -113,7 +113,7 @@ public function buildView(FormView $view, FormInterface $form, array $options)
         /**
          * We have a child, so we need to upgrade block prefix
          */
-        if ($view->parent->vars['sonata_admin_enabled'] && !$sonataAdmin['admin']) {
+        if ($view->parent && $view->parent->vars['sonata_admin_enabled'] && !$sonataAdmin['admin']) {
             $blockPrefixes    = $view->vars['block_prefixes'];
 
             $baseName = str_replace('.', '_', $view->parent->vars['sonata_admin_code']);

diff --git a/Tests/Form/Extension/Field/Type/FormTypeFieldExtensionTest.php b/Tests/Form/Extension/Field/Type/FormTypeFieldExtensionTest.php
@@ -169,4 +169,23 @@ public function testbuildViewWithNestedForm()
         $this->assertEquals($expected, $formView->vars['block_prefixes']);
         $this->assertTrue($formView->vars['sonata_admin_enabled']);
     }
+
+    public function testbuildViewWithNestedFormWithNoParent()
+    {
+        $eventDispatcher = $this->getMock('Symfony\Component\EventDispatcher\EventDispatcherInterface');
+
+        $formView = new FormView();
+        $options = array();
+        $config = new FormConfigBuilder('test', 'stdClass', $eventDispatcher, $options);
+        $form = new Form($config);
+
+        $extension = new FormTypeFieldExtension();
+        $extension->buildView($formView, $form, array(
+            'sonata_help' => 'help text'
+        ));
+
+        $this->assertArrayNotHasKey('block_prefixes', $formView->vars);
+        $this->assertArrayHasKey('sonata_admin_enabled', $formView->vars);
+        $this->assertArrayHasKey('sonata_admin', $formView->vars);
+    }
 }