Skip to content

Commit

Permalink
code style standardization on form type options
Browse files Browse the repository at this point in the history
Conflicts:
	reference/configuration/framework.rst
	reference/forms/types/variables/check_or_radio_table.rst.inc
  • Loading branch information
Adam Szaraniec authored and wouterj committed Jun 7, 2015
1 parent 96ae20f commit b389f03
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion reference/forms/types/collection.rst
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ well as :ref:`cookbook-form-collections-new-prototype`.
prototype_name
~~~~~~~~~~~~~~

**type**: ``String`` **default**: ``__name__``
**type**: ``string`` **default**: ``__name__``

If you have several collections in your form, or worse, nested collections
you may want to change the placeholder so that unrelated placeholders are
Expand Down
2 changes: 1 addition & 1 deletion reference/forms/types/entity.rst
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ directly.
choices
~~~~~~~

**type**: array | ``\Traversable`` **default**: ``null``
**type**: ``array`` | ``\Traversable`` **default**: ``null``

Instead of allowing the `class`_ and `query_builder`_ options to fetch the
entities to include for you, you can pass the ``choices`` option directly.
Expand Down
2 changes: 1 addition & 1 deletion reference/forms/types/options/attr.rst.inc
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
attr
~~~~

**type**: array **default**: Empty array
**type**: ``array`` **default**: ``array()``

If you want to add extra attributes to an HTML field representation
you can use the ``attr`` option. It's an associative array with HTML attributes
Expand Down
2 changes: 1 addition & 1 deletion reference/forms/types/options/button_attr.rst.inc
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
attr
~~~~

**type**: array **default**: Empty array
**type**: ``array`` **default**: ``array()``

If you want to add extra attributes to the HTML representation of the button,
you can use ``attr`` option. It's an associative array with HTML attribute
Expand Down
2 changes: 1 addition & 1 deletion reference/forms/types/options/constraints.rst.inc
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
constraints
~~~~~~~~~~~

**type**: array or :class:`Symfony\\Component\\Validator\\Constraint` **default**: ``null``
**type**: ``array`` or :class:`Symfony\\Component\\Validator\\Constraint` **default**: ``null``

Allows you to attach one or more validation constraints to a specific field.
For more information, see :ref:`Adding Validation<form-option-constraints>`.
Expand Down
2 changes: 1 addition & 1 deletion reference/forms/types/options/error_mapping.rst.inc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ error_mapping
.. versionadded:: 2.1
The ``error_mapping`` option was introduced in Symfony 2.1.

**type**: ``array`` **default**: ``empty``
**type**: ``array`` **default**: ``array()``

This option allows you to modify the target of a validation error.

Expand Down

0 comments on commit b389f03

Please sign in to comment.