Skip to content

Commit 587f10e

Browse files
Merge branch '2.6' into 2.7
* 2.6: [2.6] Towards 100% HHVM compat [Security/Http] Fix test [Stopwatch] Fix test Minor fixes Towards 100% HHVM compat unify default AccessDeniedExeption message trigger event with right user (add test) [Security] Initialize SwitchUserEvent::targetUser on attemptExitUser [Form] Fixed: Data mappers always receive forms indexed by their names Conflicts: src/Symfony/Bundle/FrameworkBundle/Controller/Controller.php src/Symfony/Component/VarDumper/Tests/CliDumperTest.php src/Symfony/Component/VarDumper/Tests/HtmlDumperTest.php
2 parents e72c751 + 9aa5bd8 commit 587f10e

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

Form.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -931,7 +931,7 @@ public function add($child, $type = null, array $options = array())
931931
$child->setParent($this);
932932

933933
if (!$this->lockSetData && $this->defaultDataSet && !$this->config->getInheritData()) {
934-
$iterator = new InheritDataAwareIterator(new \ArrayIterator(array($child)));
934+
$iterator = new InheritDataAwareIterator(new \ArrayIterator(array($child->getName() => $child)));
935935
$iterator = new \RecursiveIteratorIterator($iterator);
936936
$this->config->getDataMapper()->mapDataToForms($viewData, $iterator);
937937
}

Tests/CompoundFormTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,7 @@ public function testAddMapsViewDataToFormIfInitialized()
350350
->with('bar', $this->isInstanceOf('\RecursiveIteratorIterator'))
351351
->will($this->returnCallback(function ($data, \RecursiveIteratorIterator $iterator) use ($child, $test) {
352352
$test->assertInstanceOf('Symfony\Component\Form\Util\InheritDataAwareIterator', $iterator->getInnerIterator());
353-
$test->assertSame(array($child), iterator_to_array($iterator));
353+
$test->assertSame(array($child->getName() => $child), iterator_to_array($iterator));
354354
}));
355355

356356
$form->initialize();

Tests/Extension/Core/DataTransformer/DateTimeTestCase.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@ abstract class DateTimeTestCase extends \PHPUnit_Framework_TestCase
1515
{
1616
public static function assertDateTimeEquals(\DateTime $expected, \DateTime $actual)
1717
{
18-
self::assertEquals($expected->format('c'), $actual->format('c'));
18+
self::assertEquals($expected->format('U'), $actual->format('U'));
1919
}
2020
}

0 commit comments

Comments
 (0)