merged branch bschussek/dataclassfix (PR #4374)

Commits ------- 82c221a [Form] Fixed strict "data_class" check to work with instances of \ArrayAccess Discussion ---------- [Form] Fixed collection type to work with recent Form changes Bug fix: yes Feature addition: no Backwards compatibility break: no Symfony2 tests pass: yes Fixes the following tickets: - Todo: - --------------------------------------------------------------------------- by tristanbes at 2012-05-22T16:42:36Z Ping @fabpot Could you please merge it ASAP, because this bugs breaks all forms containing collection type. Thanks --------------------------------------------------------------------------- by travisbot at 2012-05-22T16:54:24Z This pull request [passes](http://travis-ci.org/symfony/symfony/builds/1401580) (merged 82c221a into 1a1403f).
symfony · May 22, 2012 · e023807 · e023807
2 parents 1a1403f + 82c221a
commit e023807
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 6 deletions.
diff --git a/src/Symfony/Component/Form/Form.php b/src/Symfony/Component/Form/Form.php
@@ -340,12 +340,8 @@ public function setData($appData)
         if (!empty($clientData)) {
             $dataClass = $this->config->getDataClass();
 
-            if (null === $dataClass && is_object($clientData)) {
-                $expectedType = 'scalar';
-
-                if (count($this->children) > 0 && $this->config->getDataMapper()) {
-                    $expectedType = 'array';
-                }
+            if (null === $dataClass && is_object($clientData) && !$clientData instanceof \ArrayAccess) {
+                $expectedType = 'scalar, array or an instance of \ArrayAccess';
 
                 throw new FormException(
                     'The form\'s client data is expected to be of type ' . $expectedType . ', ' .

diff --git a/src/Symfony/Component/Form/Tests/FormTest.php b/src/Symfony/Component/Form/Tests/FormTest.php
@@ -1249,6 +1249,21 @@ public function testClientDataMustNotBeObjectIfDataClassIsNull()
         $form->setData('foo');
     }
 
+    public function testClientDataMayBeArrayAccessIfDataClassIsNull()
+    {
+        $arrayAccess = $this->getMock('\ArrayAccess');
+        $config = new FormConfig('name', null, $this->dispatcher);
+        $config->appendClientTransformer(new FixedDataTransformer(array(
+            '' => '',
+            'foo' => $arrayAccess,
+        )));
+        $form = new Form($config);
+
+        $form->setData('foo');
+
+        $this->assertSame($arrayAccess, $form->getClientData());
+    }
+
     /**
      * @expectedException Symfony\Component\Form\Exception\FormException
      */