Skip to content

Commit 127e871

Browse files
committed
Merge branch '2.7' into 2.8
* 2.7: [Form] refactor CheckboxListMapper and RadioListMapper Revert "[Form] refactor `RadioListMapper::mapDataToForm()`"
2 parents aefeceb + f293d47 commit 127e871

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Tests/Form/Type/EntityTypeTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ public function testSubmitSingleExpandedNull()
287287
$field->submit(null);
288288

289289
$this->assertNull($field->getData());
290-
$this->assertNull($field->getViewData());
290+
$this->assertSame('', $field->getViewData(), 'View data is always a string');
291291
}
292292

293293
public function testSubmitSingleNonExpandedNull()

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"require-dev": {
2424
"symfony/stopwatch": "~2.2|~3.0.0",
2525
"symfony/dependency-injection": "~2.2|~3.0.0",
26-
"symfony/form": "~2.8|~3.0.0",
26+
"symfony/form": "~2.8.5|~3.0.5",
2727
"symfony/http-kernel": "~2.2|~3.0.0",
2828
"symfony/property-access": "~2.3|~3.0.0",
2929
"symfony/property-info": "~2.8|3.0",

0 commit comments

Comments
 (0)