[Form] Fixed form debugger to work even when no view variables are lo…

…gged (e.g. upon redirects)
symfony · Oct 28, 2013 · 99a4b7e · 99a4b7e
1 parent a9c17c3
commit 99a4b7e
Show file tree

Hide file tree

Showing 3 changed files with 61 additions and 2 deletions.
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/form.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/form.html.twig
@@ -173,7 +173,7 @@
 
 {% macro form_tree_entry(name, data) %}
     <li>
-        <a href="#details_{{ data.view_vars.id|default("") }}">{{ name }}</a>
+        <a href="#details_{{ data.id }}">{{ name }}</a>
 
         {% if data.children is not empty %}
             <ul>
@@ -186,7 +186,7 @@
 {% endmacro %}
 
 {% macro form_tree_details(name, data) %}
-    <div class="tree-details" id="details_{{ data.view_vars.id|default("") }}">
+    <div class="tree-details" id="details_{{ data.id }}">
         <h2>
             {{ name }}
             {% if data.type_class is defined %}
@@ -323,6 +323,7 @@
         </table>
         {% endif %}
 
+        {% if data.view_vars is defined %}
         <h3>View Variables</h3>
 
         <table>
@@ -337,6 +338,7 @@
             </tr>
             {% endfor %}
         </table>
+        {% endif %}
     </div>
 
     {% for childName, childData in data.children %}

diff --git a/src/Symfony/Component/Form/Extension/DataCollector/FormDataExtractor.php b/src/Symfony/Component/Form/Extension/DataCollector/FormDataExtractor.php
@@ -42,6 +42,7 @@ public function __construct(ValueExporter $valueExporter = null)
     public function extractConfiguration(FormInterface $form)
     {
         $data = array(
+            'id' => $this->buildId($form),
             'type' => $form->getConfig()->getType()->getName(),
             'type_class' => get_class($form->getConfig()->getType()->getInnerType()),
             'synchronized' => $this->valueExporter->exportValue($form->isSynchronized()),
@@ -132,4 +133,22 @@ public function extractViewVariables(FormView $view)
 
         return $data;
     }
+
+    /**
+     * Recursively builds an HTML ID for a form.
+     *
+     * @param FormInterface $form The form
+     *
+     * @return string The HTML ID
+     */
+    private function buildId(FormInterface $form)
+    {
+        $id = $form->getName();
+
+        if (null !== $form->getParent()) {
+            $id = $this->buildId($form->getParent()).'_'.$id;
+        }
+
+        return $id;
+    }
 }
diff --git a/src/Symfony/Component/Form/Tests/Extension/DataCollector/FormDataExtractorTest.php b/src/Symfony/Component/Form/Tests/Extension/DataCollector/FormDataExtractorTest.php
@@ -79,6 +79,7 @@ public function testExtractConfiguration()
             ->getForm();
 
         $this->assertSame(array(
+            'id' => 'name',
             'type' => 'type_name',
             'type_class' => 'stdClass',
             'synchronized' => 'true',
@@ -111,6 +112,7 @@ public function testExtractConfigurationSortsPassedOptions()
             ->getForm();
 
         $this->assertSame(array(
+            'id' => 'name',
             'type' => 'type_name',
             'type_class' => 'stdClass',
             'synchronized' => 'true',
@@ -144,6 +146,7 @@ public function testExtractConfigurationSortsResolvedOptions()
             ->getForm();
 
         $this->assertSame(array(
+            'id' => 'name',
             'type' => 'type_name',
             'type_class' => 'stdClass',
             'synchronized' => 'true',
@@ -156,6 +159,41 @@ public function testExtractConfigurationSortsResolvedOptions()
         ), $this->dataExtractor->extractConfiguration($form));
     }
 
+    public function testExtractConfigurationBuildsIdRecursively()
+    {
+        $type = $this->getMock('Symfony\Component\Form\ResolvedFormTypeInterface');
+        $type->expects($this->any())
+            ->method('getName')
+            ->will($this->returnValue('type_name'));
+        $type->expects($this->any())
+            ->method('getInnerType')
+            ->will($this->returnValue(new \stdClass()));
+
+        $grandParent = $this->createBuilder('grandParent')
+            ->setCompound(true)
+            ->setDataMapper($this->getMock('Symfony\Component\Form\DataMapperInterface'))
+            ->getForm();
+        $parent = $this->createBuilder('parent')
+            ->setCompound(true)
+            ->setDataMapper($this->getMock('Symfony\Component\Form\DataMapperInterface'))
+            ->getForm();
+        $form = $this->createBuilder('name')
+            ->setType($type)
+            ->getForm();
+
+        $grandParent->add($parent);
+        $parent->add($form);
+
+        $this->assertSame(array(
+            'id' => 'grandParent_parent_name',
+            'type' => 'type_name',
+            'type_class' => 'stdClass',
+            'synchronized' => 'true',
+            'passed_options' => array(),
+            'resolved_options' => array(),
+        ), $this->dataExtractor->extractConfiguration($form));
+    }
+
     public function testExtractDefaultData()
     {
         $form = $this->createBuilder('name')->getForm();