Skip to content

Commit 509043e

Browse files
weaverryanweaverryan
committed
[symfony#2053] Backporting XML changes that were applied to 2.1 - thanks to @l3l0 
1 parent 3c837d2 commit 509043e

14 files changed

+148
-1
lines changed

‎reference/constraints/All.rst

+16
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,22 @@ entry in that array:
5050
protected $favoriteColors = array();
5151
}
5252
53+
.. code-block:: xml
54+
55+
<!-- src/Acme/UserBundle/Resources/config/validation.xml -->
56+
<class name="Acme\UserBundle\Entity\User">
57+
<property name="favoriteColors">
58+
<constraint name="All">
59+
<option name="constraints">
60+
<constraint name="NotBlank" />
61+
<constraint name="Length">
62+
<option name="min">5</option>
63+
</constraint>
64+
</option>
65+
</constraint>
66+
</property>
67+
</class>
68+
5369
Now, each entry in the ``favoriteColors`` array will be validated to not
5470
be blank and to be at least 5 characters long.
5571

‎reference/constraints/Choice.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ If your valid choice list is simple, you can pass them in directly via the
4949
.. code-block:: xml
5050
5151
<!-- src/Acme/BlogBundle/Resources/config/validation.xml -->
52-
<class name="Acme\BlogBundle\EntityAuthor">
52+
<class name="Acme\BlogBundle\Entity\Author">
5353
<property name="gender">
5454
<constraint name="Choice">
5555
<option name="choices">

‎reference/constraints/Country.rst

+9
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,15 @@ Basic Usage
4141
protected $country;
4242
}
4343
44+
.. code-block:: xml
45+
46+
<!-- src/Acme/UserBundle/Resources/config/validation.xml -->
47+
<class name="Acme\UserBundle\Entity\User">
48+
<property name="country">
49+
<constraint name="Country" />
50+
</property>
51+
</class>
52+
4453
Options
4554
-------
4655

‎reference/constraints/Date.rst

+9
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,15 @@ Basic Usage
4141
protected $birthday;
4242
}
4343
44+
.. code-block:: xml
45+
46+
<!-- src/Acme/BlogBundle/Resources/config/validation.xml -->
47+
<class name="Acme\BlogBundle\Entity\Author">
48+
<property name="birthday">
49+
<constraint name="Date" />
50+
</property>
51+
</class>
52+
4453
Options
4554
-------
4655

‎reference/constraints/DateTime.rst

+9
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,15 @@ Basic Usage
4343
protected $createdAt;
4444
}
4545
46+
.. code-block:: xml
47+
48+
<!-- src/Acme/UserBundle/Resources/config/validation.xml -->
49+
<class name="Acme\BlogBundle\Entity\Author">
50+
<property name="createdAt">
51+
<constraint name="DateTime" />
52+
</property>
53+
</class>
54+
4655
Options
4756
-------
4857

‎reference/constraints/False.rst

+11
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,17 @@ method returns **false**:
4848
- "False":
4949
message: You've entered an invalid state.
5050
51+
.. code-block:: xml
52+
53+
<!-- src/Acme/BlogBundle/Resources/config/validation.xml -->
54+
<class name="Acme\BlogBundle\Entity\Author">
55+
<getter property="stateInvalid">
56+
<constraint name="False">
57+
<option name="message">You've entered an invalid state.</option>
58+
</constraint>
59+
</getter>
60+
</class>
61+
5162
.. code-block:: php-annotations
5263
5364
// src/Acme/BlogBundle/Entity/Author.php

‎reference/constraints/Ip.rst

+9
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,15 @@ Basic Usage
4444
protected $ipAddress;
4545
}
4646
47+
.. code-block:: xml
48+
49+
<!-- src/Acme/BlogBundle/Resources/config/validation.xml -->
50+
<class name="Acme\BlogBundle\Entity\Author">
51+
<property name="ipAddress">
52+
<constraint name="Ip" />
53+
</property>
54+
</class>
55+
4756
Options
4857
-------
4958

‎reference/constraints/Language.rst

+9
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,15 @@ Basic Usage
4141
protected $preferredLanguage;
4242
}
4343
44+
.. code-block:: xml
45+
46+
<!-- src/Acme/UserBundle/Resources/config/validation.xml -->
47+
<class name="Acme\UserBundle\Entity\User">
48+
<property name="preferredLanguage">
49+
<constraint name="Language" />
50+
</property>
51+
</class>
52+
4453
Options
4554
-------
4655

‎reference/constraints/Locale.rst

+9
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,15 @@ Basic Usage
4545
protected $locale;
4646
}
4747
48+
.. code-block:: xml
49+
50+
<!-- src/Acme/UserBundle/Resources/config/validation.xml -->
51+
<class name="Acme\UserBundle\Entity\User">
52+
<property name="locale">
53+
<constraint name="Locale" />
54+
</property>
55+
</class>
56+
4857
Options
4958
-------
5059

‎reference/constraints/Max.rst

+12
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,18 @@ add the following:
4444
protected $age;
4545
}
4646
47+
.. code-block:: xml
48+
49+
<!-- src/Acme/EventBundle/Resources/config/validation.yml -->
50+
<class name="Acme\EventBundle\Entity\Participant">
51+
<property name="age">
52+
<constraint name="Max">
53+
<option name="limit">50</option>
54+
<option name="message">You must be 50 or under to enter.</option>
55+
</constraint>
56+
</property>
57+
</class>
58+
4759
Options
4860
-------
4961

‎reference/constraints/Regex.rst

+24
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,17 @@ characters at the beginning of your string:
4848
protected $description;
4949
}
5050
51+
.. code-block:: xml
52+
53+
<!-- src/Acme/BlogBundle/Resources/config/validation.xml -->
54+
<class name="Acme\BlogBundle\Entity\Author">
55+
<property name="description">
56+
<constraint name="Regex">
57+
<option name="pattern">/^\w+/</option>
58+
</constraint>
59+
</property>
60+
</class>
61+
5162
Alternatively, you can set the `match`_ option to ``false`` in order to assert
5263
that a given string does *not* match. In the following example, you'll assert
5364
that the ``firstName`` field does not contain any numbers and give it a custom
@@ -85,6 +96,19 @@ message:
8596
protected $firstName;
8697
}
8798
99+
.. code-block:: xml
100+
101+
<!-- src/Acme/BlogBundle/Resources/config/validation.xml -->
102+
<class name="Acme\BlogBundle\Entity\Author">
103+
<property name="firstName">
104+
<constraint name="Regex">
105+
<option name="pattern">/\d/</option>
106+
<option name="match">false</option>
107+
<option name="message">Your name cannot contain a number</option>
108+
</constraint>
109+
</property>
110+
</class>
111+
88112
Options
89113
-------
90114

‎reference/constraints/Time.rst

+9
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,15 @@ of the day when the event starts:
4646
protected $startsAt;
4747
}
4848
49+
.. code-block:: xml
50+
51+
<!-- src/Acme/EventBundle/Resources/config/validation.xml -->
52+
<class name="Acme\EventBundle\Entity\Event">
53+
<property name="startsAt">
54+
<constraint name="Time" />
55+
</property>
56+
</class>
57+
4958
Options
5059
-------
5160

‎reference/constraints/Type.rst

+12
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,18 @@ Basic Usage
4646
protected $age;
4747
}
4848
49+
.. code-block:: xml
50+
51+
<!-- src/Acme/BlogBundle/Resources/config/validation.xml -->
52+
<class name="Acme\BlogBundle\Entity\Author">
53+
<property name="age">
54+
<constraint name="Type">
55+
<option name="type">integer</option>
56+
<option name="message">The value {{ value }} is not a valid {{ type }}.</option>
57+
</constraint>
58+
</property>
59+
</class>
60+
4961
Options
5062
-------
5163

‎reference/constraints/Url.rst

+9
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,15 @@ Basic Usage
4242
protected $bioUrl;
4343
}
4444
45+
.. code-block:: xml
46+
47+
<!-- src/Acme/BlogBundle/Resources/config/validation.xml -->
48+
<class name="Acme\BlogBundle\Entity\Author">
49+
<property name="bioUrl">
50+
<constraint name="Url" />
51+
</property>
52+
</class>
53+
4554
Options
4655
-------
4756

0 commit comments

Comments
 (0)