Movatterモバイル変換

[0]ホーム
URL:

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

 Sign up
Appearance settings

Commit7751358

Browse files
committed
Merge pull requestsymfony#3177 from bicpi/fixing_collection_2_3_only
2.3 only - Collection of minor fixes
2 parentsc87dfec +031c320 commit7751358

13 files changed

+22
-20
lines changed

‎reference/constraints/Collection.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -169,13 +169,13 @@ the above example, the ``allowMissingFields`` option was set to true, meaning
169169
that if either of the ``personal_email`` or ``short_bio`` elements were missing
170170
from the ``$personalData`` property, no validation error would occur.
171171

172+
Required and Optional Field Constraints
173+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
174+
172175
..versionadded::2.3
173176
The ``Required`` and ``Optional`` constraints were moved to the namespace
174177
``Symfony\Component\Validator\Constraints\`` in Symfony 2.3.
175178

176-
Required and Optional Field Constraints
177-
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
178-
179179
Constraints for fields within a collection can be wrapped in the ``Required`` or
180180
``Optional`` constraint to control whether they should always be applied (``Required``)
181181
or only applied when the field is present (``Optional``).

‎reference/constraints/EqualTo.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,6 @@ Options
9595
message
9696
~~~~~~~
9797

98-
**type**: ``string`` **default**: ``This value should be equal to {{ compared_value }}``
98+
**type**: ``string`` **default**: ``This value should be equal to {{ compared_value }}.``
9999

100100
This is the message that will be shown if the value is not equal.

‎reference/constraints/GreaterThan.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ Options
9191
message
9292
~~~~~~~
9393

94-
**type**: ``string`` **default**: ``This value should be greater than {{ compared_value }}``
94+
**type**: ``string`` **default**: ``This value should be greater than {{ compared_value }}.``
9595

9696
This is the message that will be shown if the value is not greater than the
9797
comparison value.

‎reference/constraints/GreaterThanOrEqual.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ Options
9090
message
9191
~~~~~~~
9292

93-
**type**: ``string`` **default**: ``This value should be greater than or equal to {{ compared_value }}``
93+
**type**: ``string`` **default**: ``This value should be greater than or equal to {{ compared_value }}.``
9494

9595
This is the message that will be shown if the value is not greater than or equal
9696
to the comparison value.

‎reference/constraints/IdenticalTo.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,6 @@ Options
9696
message
9797
~~~~~~~
9898

99-
**type**: ``string`` **default**: ``This value should be identical to {{ compared_value_type }} {{ compared_value }}``
99+
**type**: ``string`` **default**: ``This value should be identical to {{ compared_value_type }} {{ compared_value }}.``
100100

101101
This is the message that will be shown if the value is not identical.

‎reference/constraints/Isbn.rst

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ Isbn
44
..versionadded::2.3
55
The Isbn constraint was added in Symfony 2.3.
66

7-
This constraint validates that anISBN (International Standard BookNumbers)
8-
numberis either a valid ISBN-10, a valid ISBN-13 or both.
7+
This constraint validates that an`International Standard BookNumber (ISBN)`_
8+
is either a valid ISBN-10, a valid ISBN-13 or both.
99

1010
+----------------+----------------------------------------------------------------------+
1111
| Applies to|:ref:`property or method<validation-property-target>`|
@@ -98,15 +98,15 @@ Available Options
9898
isbn10
9999
~~~~~~
100100

101-
**type**: ``boolean`` [:ref:`default option<validation-default-option>`]
101+
**type**: ``boolean``
102102

103103
If this required option is set to ``true`` the constraint will check if the
104104
code is a valid ISBN-10 code.
105105

106106
isbn13
107107
~~~~~~
108108

109-
**type**: ``boolean`` [:ref:`default option<validation-default-option>`]
109+
**type**: ``boolean``
110110

111111
If this required option is set to ``true`` the constraint will check if the
112112
code is a valid ISBN-13 code.
@@ -134,3 +134,5 @@ bothIsbnMessage
134134

135135
The message that will be shown if both the `isbn10`_ and `isbn13`_ options
136136
are true and the given value does not pass the ISBN-13 nor the ISBN-13 check.
137+
138+
.. _`International Standard Book Number (ISBN)`:http://en.wikipedia.org/wiki/Isbn

‎reference/constraints/Issn.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ Issn
22
====
33

44
..versionadded::2.3
5-
TheISSN validation is new in Symfony 2.3.
5+
TheIssn constraint was added in Symfony 2.3.
66

7-
Validates that a value is a valid `ISSN`_.
7+
Validates that a value is a valid `International Standard Serial Number (ISSN)`_.
88

99
+----------------+-----------------------------------------------------------------------+
1010
| Applies to|:ref:`property or method<validation-property-target>`|
@@ -97,5 +97,5 @@ requireHyphen
9797
The validator will allow non hyphenated ISSN values by default. When switching
9898
this to ``true``, the validator requires a hyphenated ISSN value.
9999

100-
.. _`ISSN`:http://en.wikipedia.org/wiki/Issn
100+
.. _`International Standard Serial Number (ISSN)`:http://en.wikipedia.org/wiki/Issn
101101

‎reference/constraints/LessThan.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ Options
9191
message
9292
~~~~~~~
9393

94-
**type**: ``string`` **default**: ``This value should be less than {{ compared_value }}``
94+
**type**: ``string`` **default**: ``This value should be less than {{ compared_value }}.``
9595

9696
This is the message that will be shown if the value is not less than the
9797
comparison value.

‎reference/constraints/LessThanOrEqual.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ Options
9090
message
9191
~~~~~~~
9292

93-
**type**: ``string`` **default**: ``This value should be less than or equal to {{ compared_value }}``
93+
**type**: ``string`` **default**: ``This value should be less than or equal to {{ compared_value }}.``
9494

9595
This is the message that will be shown if the value is not less than or equal
9696
to the comparison value.

‎reference/constraints/NotEqualTo.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,6 @@ Options
9696
message
9797
~~~~~~~
9898

99-
**type**: ``string`` **default**: ``This value should not be equal to {{ compared_value }}``
99+
**type**: ``string`` **default**: ``This value should not be equal to {{ compared_value }}.``
100100

101101
This is the message that will be shown if the value is equal.

‎reference/constraints/NotIdenticalTo.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,6 @@ Options
9696
message
9797
~~~~~~~
9898

99-
**type**: ``string`` **default**: ``This value should not be identical to {{ compared_value_type }} {{ compared_value }}``
99+
**type**: ``string`` **default**: ``This value should not be identical to {{ compared_value_type }} {{ compared_value }}.``
100100

101101
This is the message that will be shown if the value is not equal.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
value
22
~~~~~
33

4-
**type**: ``mixed``
4+
**type**: ``mixed`` [:ref:`default option<validation-default-option>`]
55

66
This option is required. It defines the value to compare to. It can be a
77
string, numberor object.

‎reference/forms/twig_reference.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ the other helpers to render individual parts of the form instead:
4848
{{ form_row(form.name) }}
4949
{{ form_row(form.dueDate) }}
5050
51-
<input type="submit" value="Submit me"/>
51+
{{ form_row(form.submit, { 'label': 'Submit me' }) }}
5252
{{ form_end(form) }}
5353
5454
.. _reference-forms-twig-start:

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp