From a6907bed042b09bc84c4cbb4c9ed7bdc3dbb0c9d Mon Sep 17 00:00:00 2001 From: Dimitri Labouesse Date: Tue, 3 Apr 2018 13:36:20 +0200 Subject: [PATCH 1/3] [Form] Removed Integer scale option Scale option is hardcoded for IntegerType. These changes result from the discussion introduced by symfony/symfony#26734. --- reference/forms/types/integer.rst | 3 --- 1 file changed, 3 deletions(-) diff --git a/reference/forms/types/integer.rst b/reference/forms/types/integer.rst index 70c2e1561fa..e68cda9a8e8 100644 --- a/reference/forms/types/integer.rst +++ b/reference/forms/types/integer.rst @@ -17,7 +17,6 @@ integers. By default, all non-integer values (e.g. 6.78) will round down | Rendered as | ``input`` ``number`` field | +-------------+-----------------------------------------------------------------------+ | Options | - `grouping`_ | -| | - `scale`_ | | | - `rounding_mode`_ | +-------------+-----------------------------------------------------------------------+ | Overridden | - `compound`_ | @@ -47,8 +46,6 @@ Field Options .. include:: /reference/forms/types/options/grouping.rst.inc -.. include:: /reference/forms/types/options/scale.rst.inc - rounding_mode ~~~~~~~~~~~~~ From fd9012e64cff5461b6f0264d20264ba5c149d5e0 Mon Sep 17 00:00:00 2001 From: Dimitri Labouesse Date: Thu, 5 Apr 2018 14:25:57 +0200 Subject: [PATCH 2/3] Removed scale.rst.inc because it was included into number.rst only --- reference/forms/types/number.rst | 14 +++++++++++++- reference/forms/types/options/scale.rst.inc | 13 ------------- 2 files changed, 13 insertions(+), 14 deletions(-) delete mode 100644 reference/forms/types/options/scale.rst.inc diff --git a/reference/forms/types/number.rst b/reference/forms/types/number.rst index e85f60743c2..aabaf2a9c09 100644 --- a/reference/forms/types/number.rst +++ b/reference/forms/types/number.rst @@ -42,7 +42,19 @@ Field Options .. include:: /reference/forms/types/options/grouping.rst.inc -.. include:: /reference/forms/types/options/scale.rst.inc +scale +~~~~~ + +.. versionadded:: 2.7 + The ``scale`` option was introduced in Symfony 2.7. Prior to Symfony 2.7, + it was known as ``precision``. + +**type**: ``integer`` **default**: Locale-specific (usually around ``3``) + +This specifies how many decimals will be allowed until the field rounds +the submitted value (via ``rounding_mode``). For example, if ``scale`` is set +to ``2``, a submitted value of ``20.123`` will be rounded to, for example, +``20.12`` (depending on your `rounding_mode`_). rounding_mode ~~~~~~~~~~~~~ diff --git a/reference/forms/types/options/scale.rst.inc b/reference/forms/types/options/scale.rst.inc deleted file mode 100644 index 82df7d60d3c..00000000000 --- a/reference/forms/types/options/scale.rst.inc +++ /dev/null @@ -1,13 +0,0 @@ -scale -~~~~~ - -.. versionadded:: 2.7 - The ``scale`` option was introduced in Symfony 2.7. Prior to Symfony 2.7, - it was known as ``precision``. - -**type**: ``integer`` **default**: Locale-specific (usually around ``3``) - -This specifies how many decimals will be allowed until the field rounds -the submitted value (via ``rounding_mode``). For example, if ``scale`` is set -to ``2``, a submitted value of ``20.123`` will be rounded to, for example, -``20.12`` (depending on your `rounding_mode`_). From 1f820e4e835ad84a10025179cc18107937802729 Mon Sep 17 00:00:00 2001 From: Dimitri Labouesse Date: Mon, 23 Apr 2018 14:32:43 +0200 Subject: [PATCH 3/3] Moved scale option into the overriden section of IntegerType --- reference/forms/types/integer.rst | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/reference/forms/types/integer.rst b/reference/forms/types/integer.rst index e68cda9a8e8..9d7bc9747c4 100644 --- a/reference/forms/types/integer.rst +++ b/reference/forms/types/integer.rst @@ -20,7 +20,7 @@ integers. By default, all non-integer values (e.g. 6.78) will round down | | - `rounding_mode`_ | +-------------+-----------------------------------------------------------------------+ | Overridden | - `compound`_ | -| options | | +| options | - `scale`_ | +-------------+-----------------------------------------------------------------------+ | Inherited | - `data`_ | | options | - `disabled`_ | @@ -80,6 +80,13 @@ Overridden Options .. include:: /reference/forms/types/options/compound_type.rst.inc +scale +~~~~~ + +**type**: ``integer`` **default**: ``0`` + +This specifies how many decimals will be allowed until the field rounds the submitted value (via ``rounding_mode``). This option inherits from :doc:`number ` type and is overriden to ``0`` for ``IntegerType``. + Inherited Options -----------------