From b5cf337c9c1deea1f54a596cd2e1f4fdcc4d710a Mon Sep 17 00:00:00 2001
From: Bart van den Burg <bart@samson-it.nl>
Date: Tue, 12 Jun 2012 15:56:59 +0200
Subject: [PATCH] [Form] Enhanced the form error message

The error message on type mismatch is a bit obscure:

The form's view data is expected to be an instance of class Samson\Bundle\TRSBundle\Entity\Labour, but has the type object. You can avoid this error by setting the "data_class" option to null or by adding a view transformer that transforms object to Samson\Bundle\TRSBundle\Entity\Labour.

This commit changes it to:

The form's view data is expected to be an instance of class Samson\Bundle\TRSBundle\Entity\Labour, but is an instance of Closure. You can avoid this error by setting the "data_class" option to null or by adding a view transformer that transforms an instance of Closure to an instance of Samson\Bundle\TRSBundle\Entity\Labour.
---
 src/Symfony/Component/Form/Form.php | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/Symfony/Component/Form/Form.php b/src/Symfony/Component/Form/Form.php
index cc6bedccaf..e40b4f8932 100644
--- a/src/Symfony/Component/Form/Form.php
+++ b/src/Symfony/Component/Form/Form.php
@@ -348,25 +348,27 @@ class Form implements \IteratorAggregate, FormInterface
         if (!empty($viewData)) {
             $dataClass = $this->config->getDataClass();
 
+            $actualType = is_object($viewData) ? 'an instance of class ' . get_class($viewData) : ' a(n) ' . gettype($viewData);
+
             if (null === $dataClass && is_object($viewData) && !$viewData instanceof \ArrayAccess) {
                 $expectedType = 'scalar, array or an instance of \ArrayAccess';
 
                 throw new FormException(
                     'The form\'s view data is expected to be of type ' . $expectedType . ', ' .
-                    'but is an instance of class ' . get_class($viewData) . '. You ' .
+                    'but is ' . $actualType . '. You ' .
                     'can avoid this error by setting the "data_class" option to ' .
                     '"' . get_class($viewData) . '" or by adding a view transformer ' .
-                    'that transforms ' . get_class($viewData) . ' to ' . $expectedType . '.'
+                    'that transforms ' . $actualType . ' to ' . $expectedType . '.'
                 );
             }
 
             if (null !== $dataClass && !$viewData instanceof $dataClass) {
                 throw new FormException(
                     'The form\'s view data is expected to be an instance of class ' .
-                    $dataClass . ', but has the type ' . gettype($viewData) . '. You ' .
-                    'can avoid this error by setting the "data_class" option to ' .
-                    'null or by adding a view transformer that transforms ' .
-                    gettype($viewData) . ' to ' . $dataClass . '.'
+                    $dataClass . ', but is '. $actualType . '. You can avoid this error ' .
+                    'by setting the "data_class" option to null or by adding a view ' .
+                    'transformer that transforms ' . $actualType . ' to an instance of ' .
+                    $dataClass . '.'
                 );
             }
         }