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 6eeb61e

Browse filesBrowse files
committed
Merge branch '2.8' into 3.0
2 parents 64f8a1e + 889db17 commit 6eeb61e
Copy full SHA for 6eeb61e

File tree

Expand file treeCollapse file tree

3 files changed

+7
-5
lines changed
Filter options
Expand file treeCollapse file tree

3 files changed

+7
-5
lines changed

‎book/forms.rst

Copy file name to clipboardExpand all lines: book/forms.rst
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1168,7 +1168,7 @@ Defining your Forms as Services
11681168
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
11691169

11701170
Your form type might have some external dependencies. You can define your form
1171-
type as a service, and inject inject all dependencies you need.
1171+
type as a service, and inject all dependencies you need.
11721172

11731173
.. note::
11741174

‎contributing/code/core_team.rst

Copy file name to clipboardExpand all lines: contributing/code/core_team.rst
+5-3Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,12 +67,13 @@ Active Core Members
6767

6868
* **Jakub Zalas** (`jakzal`_) can merge into the DomCrawler_ component.
6969

70+
* **Christian Flothmann** (`xabbuh`_) can merge into the Yaml_ component.
71+
7072
* **Deciders** (``@symfony/deciders`` on GitHub):
7173

7274
* **Jordi Boggiano** (`seldaek`_);
7375
* **Lukas Kahwe Smith** (`lsmith77`_);
74-
* **Ryan Weaver** (`weaverryan`_);
75-
* **Christian Flothmann** (`xabbuh`_).
76+
* **Ryan Weaver** (`weaverryan`_).
7677

7778
Core Membership Application
7879
~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -153,6 +154,7 @@ discretion of the **Project Leader**.
153154
.. _Config: https://github.com/symfony/config
154155
.. _Console: https://github.com/symfony/console
155156
.. _Debug: https://github.com/symfony/debug
157+
.. _DebugBundle: https://github.com/symfony/debug-bundle
156158
.. _DependencyInjection: https://github.com/symfony/dependency-injection
157159
.. _DoctrineBridge: https://github.com/symfony/doctrine-bridge
158160
.. _EventDispatcher: https://github.com/symfony/event-dispatcher
@@ -174,7 +176,7 @@ discretion of the **Project Leader**.
174176
.. _TwigBridge: https://github.com/symfony/twig-bridge
175177
.. _Validator: https://github.com/symfony/validator
176178
.. _VarDumper: https://github.com/symfony/var-dumper
177-
.. _DebugBundle: https://github.com/symfony/debug-bundle
179+
.. _Yaml: https://github.com/symfony/yaml
178180
.. _`fabpot`: https://github.com/fabpot/
179181
.. _`webmozart`: https://github.com/webmozart/
180182
.. _`Tobion`: https://github.com/Tobion/

‎reference/forms/types/collection.rst

Copy file name to clipboardExpand all lines: reference/forms/types/collection.rst
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ entry_type
312312
~~~~~~~~~~
313313

314314
.. versionadded:: 2.8
315-
The ``entry_type`` option was introduced in Symfony 2.8 in favor of
315+
The ``entry_type`` option was introduced in Symfony 2.8 and replaces
316316
``type``, which is available prior to 2.8.
317317

318318
**type**: ``string`` or :class:`Symfony\\Component\\Form\\FormTypeInterface` **required**

0 commit comments

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