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

Commit2ea1333

Browse files
committed
Merge branch '2.0' into 2.1
Conflicts:reference/constraints/All.rstreference/constraints/Country.rstreference/constraints/Date.rstreference/constraints/Ip.rstreference/constraints/Language.rstreference/constraints/Locale.rstreference/constraints/Time.rstreference/constraints/Type.rstreference/constraints/Url.rst
2 parents64e720a +509043e commit2ea1333

File tree

9 files changed

+68
-68
lines changed

9 files changed

+68
-68
lines changed

‎reference/constraints/All.rst

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -51,21 +51,21 @@ entry in that array:
5151
protected $favoriteColors = array();
5252
}
5353
54-
..code-block::xml
55-
56-
<!-- src/Acme/UserBundle/Resources/config/validation.xml-->
57-
<classname="Acme\UserBundle\Entity\User">
58-
<propertyname="favoriteColors">
59-
<constraintname="All">
60-
<optionname="constraints">
61-
<constraintname="NotBlank" />
62-
<constraintname="Length">
63-
<optionname="min">5</option>
64-
</constraint>
65-
</option>
66-
</constraint>
67-
</property>
68-
</class>
54+
..code-block::xml
55+
56+
<!-- src/Acme/UserBundle/Resources/config/validation.xml-->
57+
<classname="Acme\UserBundle\Entity\User">
58+
<propertyname="favoriteColors">
59+
<constraintname="All">
60+
<optionname="constraints">
61+
<constraintname="NotBlank" />
62+
<constraintname="Length">
63+
<optionname="min">5</option>
64+
</constraint>
65+
</option>
66+
</constraint>
67+
</property>
68+
</class>
6969
7070
Now, each entry in the ``favoriteColors`` array will be validated to not
7171
be blank and to be at least 5 characters long.

‎reference/constraints/Country.rst

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,14 @@ Basic Usage
4141
protected $country;
4242
}
4343
44-
..code-block::xml
45-
46-
<!-- src/Acme/UserBundle/Resources/config/validation.xml-->
47-
<classname="Acme\UserBundle\Entity\User">
48-
<propertyname="country">
49-
<constraintname="Country" />
50-
</property>
51-
</class>
44+
..code-block::xml
45+
46+
<!-- src/Acme/UserBundle/Resources/config/validation.xml-->
47+
<classname="Acme\UserBundle\Entity\User">
48+
<propertyname="country">
49+
<constraintname="Country" />
50+
</property>
51+
</class>
5252
5353
Options
5454
-------

‎reference/constraints/Date.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ Basic Usage
4646
<!-- src/Acme/BlogBundle/Resources/config/validation.xml-->
4747
<classname="Acme\BlogBundle\Entity\Author">
4848
<propertyname="birthday">
49-
<constraintname="Date" />
49+
<constraintname="Date" />
5050
</property>
5151
</class>
5252

‎reference/constraints/Ip.rst

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,14 @@ Basic Usage
4444
protected $ipAddress;
4545
}
4646
47-
..code-block::xml
48-
49-
<!-- src/Acme/BlogBundle/Resources/config/validation.xml-->
50-
<classname="Acme\BlogBundle\Entity\Author">
51-
<propertyname="ipAddress">
52-
<constraintname="Ip" />
53-
</property>
54-
</class>
47+
..code-block::xml
48+
49+
<!-- src/Acme/BlogBundle/Resources/config/validation.xml-->
50+
<classname="Acme\BlogBundle\Entity\Author">
51+
<propertyname="ipAddress">
52+
<constraintname="Ip" />
53+
</property>
54+
</class>
5555
5656
Options
5757
-------

‎reference/constraints/Language.rst

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,14 @@ Basic Usage
4141
protected $preferredLanguage;
4242
}
4343
44-
..code-block::xml
45-
46-
<!-- src/Acme/UserBundle/Resources/config/validation.xml-->
47-
<classname="Acme\UserBundle\Entity\User">
48-
<propertyname="preferredLanguage">
49-
<constraintname="Language" />
50-
</property>
51-
</class>
44+
..code-block::xml
45+
46+
<!-- src/Acme/UserBundle/Resources/config/validation.xml-->
47+
<classname="Acme\UserBundle\Entity\User">
48+
<propertyname="preferredLanguage">
49+
<constraintname="Language" />
50+
</property>
51+
</class>
5252
5353
Options
5454
-------

‎reference/constraints/Locale.rst

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,14 @@ Basic Usage
4545
protected $locale;
4646
}
4747
48-
..code-block::xml
49-
50-
<!-- src/Acme/UserBundle/Resources/config/validation.xml-->
51-
<classname="Acme\UserBundle\Entity\User">
52-
<propertyname="locale">
53-
<constraintname="Locale" />
54-
</property>
55-
</class>
48+
..code-block::xml
49+
50+
<!-- src/Acme/UserBundle/Resources/config/validation.xml-->
51+
<classname="Acme\UserBundle\Entity\User">
52+
<propertyname="locale">
53+
<constraintname="Locale" />
54+
</property>
55+
</class>
5656
5757
Options
5858
-------

‎reference/constraints/Time.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ of the day when the event starts:
5151
<!-- src/Acme/EventBundle/Resources/config/validation.xml-->
5252
<classname="Acme\EventBundle\Entity\Event">
5353
<propertyname="startsAt">
54-
<constraintname="Time" />
54+
<constraintname="Time" />
5555
</property>
5656
</class>
5757

‎reference/constraints/Type.rst

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -46,17 +46,17 @@ Basic Usage
4646
protected $age;
4747
}
4848
49-
..code-block::xml
50-
51-
<!-- src/Acme/BlogBundle/Resources/config/validation.xml-->
52-
<classname="Acme\BlogBundle\Entity\Author">
53-
<propertyname="age">
54-
<constraintname="Type">
55-
<optionname="type">integer</option>
56-
<optionname="message">The value {{ value }} is not a valid {{ type }}.</option>
57-
</constraint>
58-
</property>
59-
</class>
49+
..code-block::xml
50+
51+
<!-- src/Acme/BlogBundle/Resources/config/validation.xml-->
52+
<classname="Acme\BlogBundle\Entity\Author">
53+
<propertyname="age">
54+
<constraintname="Type">
55+
<optionname="type">integer</option>
56+
<optionname="message">The value {{ value }} is not a valid {{ type }}.</option>
57+
</constraint>
58+
</property>
59+
</class>
6060
6161
Options
6262
-------

‎reference/constraints/Url.rst

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,14 @@ Basic Usage
4242
protected $bioUrl;
4343
}
4444
45-
..code-block::xml
46-
47-
<!-- src/Acme/BlogBundle/Resources/config/validation.xml-->
48-
<classname="Acme\BlogBundle\Entity\Author">
49-
<propertyname="bioUrl">
50-
<constraintname="Url" />
51-
</property>
52-
</class>
45+
..code-block::xml
46+
47+
<!-- src/Acme/BlogBundle/Resources/config/validation.xml-->
48+
<classname="Acme\BlogBundle\Entity\Author">
49+
<propertyname="bioUrl">
50+
<constraintname="Url" />
51+
</property>
52+
</class>
5353
5454
Options
5555
-------

0 commit comments

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