From 7e5b7f1f2b63fb7f79359e2812bf90e56093b149 Mon Sep 17 00:00:00 2001 From: Maxime Steinhausser Date: Mon, 14 Dec 2015 18:41:09 +0100 Subject: [PATCH 1/4] [Form] placeholder option: replace "in favor" misuses --- cookbook/form/create_custom_field_type.rst | 2 +- cookbook/form/dynamic_form_modification.rst | 2 +- reference/forms/types/date.rst | 2 +- reference/forms/types/options/placeholder.rst.inc | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cookbook/form/create_custom_field_type.rst b/cookbook/form/create_custom_field_type.rst index 2fa6217c125..95a7fbef935 100644 --- a/cookbook/form/create_custom_field_type.rst +++ b/cookbook/form/create_custom_field_type.rst @@ -257,7 +257,7 @@ the gender codes were stored in configuration or in a database? The next section explains how more complex field types solve this problem. .. versionadded:: 2.6 - The ``placeholder`` option was introduced in Symfony 2.6 in favor of + The ``placeholder`` option was introduced in Symfony 2.6 and replaces ``empty_value``, which is available prior to 2.6. .. _form-cookbook-form-field-service: diff --git a/cookbook/form/dynamic_form_modification.rst b/cookbook/form/dynamic_form_modification.rst index 92ecf27b412..8338134126c 100644 --- a/cookbook/form/dynamic_form_modification.rst +++ b/cookbook/form/dynamic_form_modification.rst @@ -499,7 +499,7 @@ sport like this:: } .. versionadded:: 2.6 - The ``placeholder`` option was introduced in Symfony 2.6 in favor of + The ``placeholder`` option was introduced in Symfony 2.6 and replaces ``empty_value``, which is available prior to 2.6. When you're building this form to display to the user for the first time, diff --git a/reference/forms/types/date.rst b/reference/forms/types/date.rst index 25816551d42..2efa97662ce 100644 --- a/reference/forms/types/date.rst +++ b/reference/forms/types/date.rst @@ -85,7 +85,7 @@ placeholder ~~~~~~~~~~~ .. versionadded:: 2.6 - The ``placeholder`` option was introduced in Symfony 2.6 in favor of + The ``placeholder`` option was introduced in Symfony 2.6 and replaces ``empty_value``, which is available prior to 2.6. **type**: ``string`` or ``array`` diff --git a/reference/forms/types/options/placeholder.rst.inc b/reference/forms/types/options/placeholder.rst.inc index afb649bdd58..ca065be6bbe 100644 --- a/reference/forms/types/options/placeholder.rst.inc +++ b/reference/forms/types/options/placeholder.rst.inc @@ -2,7 +2,7 @@ placeholder ~~~~~~~~~~~ .. versionadded:: 2.6 - The ``placeholder`` option was introduced in Symfony 2.6 in favor of + The ``placeholder`` option was introduced in Symfony 2.6 and replaces ``empty_value``, which is available prior to 2.6. .. versionadded:: 2.3 From 6077f91a4b690c28a71d5795ba31d98ed44d41ff Mon Sep 17 00:00:00 2001 From: Maxime Steinhausser Date: Mon, 14 Dec 2015 18:44:11 +0100 Subject: [PATCH 2/4] [Form] entry_type option: replace "in favor" misuses --- reference/forms/types/collection.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/reference/forms/types/collection.rst b/reference/forms/types/collection.rst index 269f00977d2..422f721ddcc 100644 --- a/reference/forms/types/collection.rst +++ b/reference/forms/types/collection.rst @@ -312,7 +312,7 @@ entry_type ~~~~~~~~~~ .. versionadded:: 2.8 - The ``entry_type`` option was introduced in Symfony 2.8 in favor of + The ``entry_type`` option was introduced in Symfony 2.8 and replaces ``type``, which is available prior to 2.8. **type**: ``string`` or :class:`Symfony\\Component\\Form\\FormTypeInterface` **required** From b73843fbd5c7bc34d62dbc3db9de2671b37c7147 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Mon, 4 Jan 2016 16:00:37 +0100 Subject: [PATCH 3/4] promoted xabbuh as merger on the Yaml component --- contributing/code/core_team.rst | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/contributing/code/core_team.rst b/contributing/code/core_team.rst index 4f4efd9f6e2..01c9db29270 100644 --- a/contributing/code/core_team.rst +++ b/contributing/code/core_team.rst @@ -67,12 +67,13 @@ Active Core Members * **Jakub Zalas** (`jakzal`_) can merge into the DomCrawler_ component. + * **Christian Flothmann** (`xabbuh`_) can merge into the Yaml_ component. + * **Deciders** (``@symfony/deciders`` on GitHub): * **Jordi Boggiano** (`seldaek`_); * **Lukas Kahwe Smith** (`lsmith77`_); - * **Ryan Weaver** (`weaverryan`_); - * **Christian Flothmann** (`xabbuh`_). + * **Ryan Weaver** (`weaverryan`_). Core Membership Application ~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -173,6 +174,7 @@ discretion of the **Project Leader**. .. _Stopwatch: https://github.com/symfony/stopwatch .. _TwigBridge: https://github.com/symfony/twig-bridge .. _Validator: https://github.com/symfony/validator +.. _Yaml: https://github.com/symfony/yaml .. _`fabpot`: https://github.com/fabpot/ .. _`webmozart`: https://github.com/webmozart/ .. _`Tobion`: https://github.com/Tobion/ From fcbcf1cd029e32963745576ed610857667d1e9a6 Mon Sep 17 00:00:00 2001 From: Dominik Hajduk Date: Mon, 4 Jan 2016 21:10:39 +0100 Subject: [PATCH 4/4] Remove repetition in text --- book/forms.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/book/forms.rst b/book/forms.rst index 29d48045f73..2e2830593e3 100644 --- a/book/forms.rst +++ b/book/forms.rst @@ -1170,7 +1170,7 @@ Defining your Forms as Services ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Your form type might have some external dependencies. You can define your form -type as a service, and inject inject all dependencies you need. +type as a service, and inject all dependencies you need. .. note::