Merge branch '2.6' into 2.7
* 2.6: fixed tests fixed some tests Remove excess whitespace
This commit is contained in:
commit
0165636c89
@ -356,7 +356,7 @@ class Form implements \IteratorAggregate, FormInterface
|
||||
if (!FormUtil::isEmpty($viewData)) {
|
||||
$dataClass = $this->config->getDataClass();
|
||||
|
||||
$actualType = is_object($viewData) ? 'an instance of class '.get_class($viewData) : ' a(n) '.gettype($viewData);
|
||||
$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';
|
||||
|
Reference in New Issue
Block a user