From 4807c5effc977f84dd8b7d98606b16d4b95156e6 Mon Sep 17 00:00:00 2001 From: Bernhard Schussek Date: Wed, 30 Oct 2013 13:42:39 +0100 Subject: [PATCH] [Form] Fixed failing FormDataExtractorTest --- .../Form/Extension/DataCollector/FormDataExtractor.php | 10 +++++++--- .../Extension/DataCollector/FormDataExtractorTest.php | 3 +++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/Symfony/Component/Form/Extension/DataCollector/FormDataExtractor.php b/src/Symfony/Component/Form/Extension/DataCollector/FormDataExtractor.php index 652232d37a..8765b13ca4 100644 --- a/src/Symfony/Component/Form/Extension/DataCollector/FormDataExtractor.php +++ b/src/Symfony/Component/Form/Extension/DataCollector/FormDataExtractor.php @@ -123,9 +123,13 @@ class FormDataExtractor implements FormDataExtractorInterface */ public function extractViewVariables(FormView $view) { - $data = array( - 'id' => $view->vars['id'] - ); + $data = array(); + + // Set the ID in case no FormInterface object was collected for this + // view + if (isset($view->vars['id'])) { + $data['id'] = $view->vars['id']; + } foreach ($view->vars as $varName => $value) { $data['view_vars'][$varName] = $this->valueExporter->exportValue($value); diff --git a/src/Symfony/Component/Form/Tests/Extension/DataCollector/FormDataExtractorTest.php b/src/Symfony/Component/Form/Tests/Extension/DataCollector/FormDataExtractorTest.php index 70473cc1ba..bf3cd71975 100644 --- a/src/Symfony/Component/Form/Tests/Extension/DataCollector/FormDataExtractorTest.php +++ b/src/Symfony/Component/Form/Tests/Extension/DataCollector/FormDataExtractorTest.php @@ -352,13 +352,16 @@ class FormDataExtractorTest extends \PHPUnit_Framework_TestCase 'b' => 'foo', 'a' => 'bar', 'c' => 'baz', + 'id' => 'foo_bar', ); $this->assertSame(array( + 'id' => 'foo_bar', 'view_vars' => array( 'a' => "'bar'", 'b' => "'foo'", 'c' => "'baz'", + 'id' => "'foo_bar'", ), ), $this->dataExtractor->extractViewVariables($view)); }