Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 6e83621

Browse filesBrowse files
committed
Merge branch '5.3' into 5.4
* 5.3: Remove double quotes in console.rst Tweak a bit the core team application/revocation paragraphs [Form] Minor fix [Form] Minor fixes
2 parents a579a36 + 9d83457 commit 6e83621
Copy full SHA for 6e83621

File tree

4 files changed

+7
-10
lines changed
Filter options

4 files changed

+7
-10
lines changed

‎console.rst

Copy file name to clipboardExpand all lines: console.rst
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -449,7 +449,7 @@ call ``setAutoExit(false)`` on it to get the command result in ``CommandTester``
449449
.. note::
450450

451451
When using the Console component in a standalone project, use
452-
:class:`Symfony\\Component\\Console\\Application <Symfony\\Component\\Console\\Application>`
452+
:class:`Symfony\\Component\\Console\\Application`
453453
and extend the normal ``\PHPUnit\Framework\TestCase``.
454454

455455
Logging Command Errors

‎contributing/code/core_team.rst

Copy file name to clipboardExpand all lines: contributing/code/core_team.rst
+1-4Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ Symfony contributions:
111111
Core Membership Application
112112
~~~~~~~~~~~~~~~~~~~~~~~~~~~
113113

114-
At present, new Symfony Core membership applications are not accepted.
114+
About once a year, the core team discuss the opportunity to invite new members.
115115

116116
Core Membership Revocation
117117
~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -123,9 +123,6 @@ A Symfony Core membership can be revoked for any of the following reasons:
123123
* Willful negligence or intent to harm the Symfony project;
124124
* Upon decision of the **Project Leader**.
125125

126-
Should new Symfony Core memberships be accepted in the future, revoked
127-
members must wait at least 12 months before re-applying.
128-
129126
Code Development Rules
130127
----------------------
131128

‎form/multiple_buttons.rst

Copy file name to clipboardExpand all lines: form/multiple_buttons.rst
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ How to Submit a Form with Multiple Buttons
66

77
When your form contains more than one submit button, you will want to check
88
which of the buttons was clicked to adapt the program flow in your controller.
9-
To do this, add a second button with the caption "Save and add" to your form::
9+
To do this, add a second button with the caption "Save and Add" to your form::
1010

1111
$form = $this->createFormBuilder($task)
1212
->add('task', TextType::class)
@@ -17,7 +17,7 @@ To do this, add a second button with the caption "Save and add" to your form::
1717

1818
In your controller, use the button's
1919
:method:`Symfony\\Component\\Form\\ClickableInterface::isClicked` method for
20-
querying if the "Save and add" button was clicked::
20+
querying if the "Save and Add" button was clicked::
2121

2222
if ($form->isSubmitted() && $form->isValid()) {
2323
// ... perform some action, such as saving the task to the database

‎form/unit_testing.rst

Copy file name to clipboardExpand all lines: form/unit_testing.rst
+3-3Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ The simplest ``TypeTestCase`` implementation looks like the following::
5555
];
5656

5757
$model = new TestObject();
58-
// $formData will retrieve data from the form submission; pass it as the second argument
58+
// $model will retrieve data from the form submission; pass it as the second argument
5959
$form = $this->factory->create(TestedType::class, $model);
6060

6161
$expected = new TestObject();
@@ -67,7 +67,7 @@ The simplest ``TypeTestCase`` implementation looks like the following::
6767
// This check ensures there are no transformation failures
6868
$this->assertTrue($form->isSynchronized());
6969

70-
// check that $formData was modified as expected when the form was submitted
70+
// check that $model was modified as expected when the form was submitted
7171
$this->assertEquals($expected, $model);
7272
}
7373

@@ -88,7 +88,7 @@ The simplest ``TypeTestCase`` implementation looks like the following::
8888
So, what does it test? Here comes a detailed explanation.
8989

9090
First you verify if the ``FormType`` compiles. This includes basic class
91-
inheritance, the ``buildForm()`` function and options resolution. This should
91+
inheritance, the ``buildForm()`` method and options resolution. This should
9292
be the first test you write::
9393

9494
$form = $this->factory->create(TestedType::class, $formData);

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.