Skip to content

Commit cfe63ac

Browse files
Merge branch '4.1' into 4.2
* 4.1: [Routing] dont redirect routes with greedy trailing vars with no explicit slash skip native serialize among child and parent serializable objects [Routing] backport tests from 4.1 [MonologBridge] Remove unused local variable Remove unreachable code Add PackageNameTest to ConfigurationTest also add in the changelog the corresponding entry to this PR Support use of hyphen in asset package name Remove gendered pronouns Replace gender by eye color in tests [Security] dont do nested calls to serialize()
2 parents 1a28ba2 + 4bcc0f2 commit cfe63ac

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

FormRenderer.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -163,9 +163,9 @@ public function searchAndRenderBlock(FormView $view, $blockNameSuffix, array $va
163163
// to implement a custom "choice_widget" block (no matter in which theme),
164164
// or to fallback to the block of the parent type, which would be
165165
// "form_widget" in this example (again, no matter in which theme).
166-
// If the designer wants to explicitly fallback to "form_widget" in his
167-
// custom "choice_widget", for example because he only wants to wrap
168-
// a <div> around the original implementation, he can simply call the
166+
// If the designer wants to explicitly fallback to "form_widget" in their
167+
// custom "choice_widget", for example because they only want to wrap
168+
// a <div> around the original implementation, they can simply call the
169169
// widget() function again to render the block for the parent type.
170170
//
171171
// The second kind is implemented in the following blocks.

Tests/AbstractTableLayoutTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -470,7 +470,7 @@ public function testFormEndWithRest()
470470
// Insert the start tag, the end tag should be rendered by the helper
471471
// Unfortunately this is not valid HTML, because the surrounding table
472472
// tag is missing. If someone renders a form with table layout
473-
// manually, she should call form_rest() explicitly within the <table>
473+
// manually, they should call form_rest() explicitly within the <table>
474474
// tag.
475475
$this->assertMatchesXpath('<form>'.$html,
476476
'/form

0 commit comments

Comments
 (0)