From faa034b3e678dde3d6401c36258fa953f4cb5cb4 Mon Sep 17 00:00:00 2001 From: Eduardo Gulias Davis Date: Sun, 12 Jan 2014 18:58:23 +0100 Subject: [PATCH 1/8] [WIP][Valiadtor] - EmailConstraint reference --- reference/constraints/Email.rst | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/reference/constraints/Email.rst b/reference/constraints/Email.rst index 5eacfbda04b..48cf138b9a9 100644 --- a/reference/constraints/Email.rst +++ b/reference/constraints/Email.rst @@ -7,7 +7,8 @@ cast to a string before being validated. +----------------+---------------------------------------------------------------------+ | Applies to | :ref:`property or method ` | +----------------+---------------------------------------------------------------------+ -| Options | - `message`_ | +| Options | - `strict`_ | +| | - `message`_ | | | - `checkMX`_ | | | - `checkHost`_ | +----------------+---------------------------------------------------------------------+ @@ -89,6 +90,15 @@ Basic Usage Options ------- +strict +~~~~~~~ + +**type**: ``boolean`` **default**: ``false`` + +Will validate the email against a simple RegularExpression. +If true, then the library (`egulias/email-validator`)[https://packagist.org/packages/egulias/email-validator] +is required to perform an RFC compilant validation. + message ~~~~~~~ From e4a0e2f0ff892a3ec5ca9a7d45554b57d6b11fa5 Mon Sep 17 00:00:00 2001 From: Eduardo Gulias Davis Date: Sun, 12 Jan 2014 19:07:33 +0100 Subject: [PATCH 2/8] Use of Sphinx markup --- reference/constraints/Email.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/reference/constraints/Email.rst b/reference/constraints/Email.rst index 48cf138b9a9..caba8cd7fcc 100644 --- a/reference/constraints/Email.rst +++ b/reference/constraints/Email.rst @@ -96,7 +96,7 @@ strict **type**: ``boolean`` **default**: ``false`` Will validate the email against a simple RegularExpression. -If true, then the library (`egulias/email-validator`)[https://packagist.org/packages/egulias/email-validator] +If true, then the `EmailValidator `_ library is required to perform an RFC compilant validation. message From f0b3b85567f0865a983e1ece7a0780416239597e Mon Sep 17 00:00:00 2001 From: Eduardo Gulias Davis Date: Sun, 12 Jan 2014 19:53:58 +0100 Subject: [PATCH 3/8] Version added and clarifications --- reference/constraints/Email.rst | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/reference/constraints/Email.rst b/reference/constraints/Email.rst index caba8cd7fcc..e459115dfa8 100644 --- a/reference/constraints/Email.rst +++ b/reference/constraints/Email.rst @@ -91,11 +91,13 @@ Options ------- strict -~~~~~~~ +~~~~~~ +.. versionadded:: 2.5 + The ``strict`` option was introduced in Symfony 2.5. **type**: ``boolean`` **default**: ``false`` -Will validate the email against a simple RegularExpression. +When false, the email will be validated against a simple RegularExpression. If true, then the `EmailValidator `_ library is required to perform an RFC compilant validation. From 517e4c549372cc81138ca590bf53506817c3402d Mon Sep 17 00:00:00 2001 From: Eduardo Gulias Davis Date: Sun, 12 Jan 2014 20:24:11 +0100 Subject: [PATCH 4/8] Link moved and heading updated --- reference/constraints/Email.rst | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/reference/constraints/Email.rst b/reference/constraints/Email.rst index e459115dfa8..518503f583e 100644 --- a/reference/constraints/Email.rst +++ b/reference/constraints/Email.rst @@ -90,16 +90,16 @@ Basic Usage Options ------- -strict -~~~~~~ .. versionadded:: 2.5 The ``strict`` option was introduced in Symfony 2.5. +strict +~~~~~~ + **type**: ``boolean`` **default**: ``false`` -When false, the email will be validated against a simple RegularExpression. -If true, then the `EmailValidator `_ library -is required to perform an RFC compilant validation. +When false, the email will be validated against a simple Regular Expression. +If true, then the `egulias/email-validator`_ library is required to perform an RFC compilant validation. message ~~~~~~~ @@ -124,3 +124,6 @@ checkHost If true, then the :phpfunction:`checkdnsrr` PHP function will be used to check the validity of the MX *or* the A *or* the AAAA record of the host of the given email. + + +.. _EmailValidator: https://packagist.org/packages/egulias/email-validator From aa5aa61593465b80838dd7cc34d5b8d7843fc6e9 Mon Sep 17 00:00:00 2001 From: Eduardo Gulias Davis Date: Sun, 12 Jan 2014 23:47:32 +0100 Subject: [PATCH 5/8] Typo and link label --- reference/constraints/Email.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/reference/constraints/Email.rst b/reference/constraints/Email.rst index 518503f583e..d1be0e43dad 100644 --- a/reference/constraints/Email.rst +++ b/reference/constraints/Email.rst @@ -99,7 +99,7 @@ strict **type**: ``boolean`` **default**: ``false`` When false, the email will be validated against a simple Regular Expression. -If true, then the `egulias/email-validator`_ library is required to perform an RFC compilant validation. +If true, then the `EmailValidator`_ library is required to perform an RFC compliant validation. message ~~~~~~~ From a0dd460633842ef7f3e028786d7f503b18613f91 Mon Sep 17 00:00:00 2001 From: Eduardo Gulias Davis Date: Mon, 13 Jan 2014 23:12:35 +0100 Subject: [PATCH 6/8] Lowercase and link label --- reference/constraints/Email.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/reference/constraints/Email.rst b/reference/constraints/Email.rst index d1be0e43dad..4b64e3c9632 100644 --- a/reference/constraints/Email.rst +++ b/reference/constraints/Email.rst @@ -98,8 +98,8 @@ strict **type**: ``boolean`` **default**: ``false`` -When false, the email will be validated against a simple Regular Expression. -If true, then the `EmailValidator`_ library is required to perform an RFC compliant validation. +When false, the email will be validated against a simple regular expression. +If true, then the `egulias/email-validator`_ library is required to perform an RFC compliant validation. message ~~~~~~~ @@ -126,4 +126,4 @@ check the validity of the MX *or* the A *or* the AAAA record of the host of the given email. -.. _EmailValidator: https://packagist.org/packages/egulias/email-validator +.. _egulias/email-validator: https://packagist.org/packages/egulias/email-validator From c50f0413782ea8d76a785e7aafac90049439a1a9 Mon Sep 17 00:00:00 2001 From: Eduardo Gulias Davis Date: Fri, 17 Jan 2014 00:11:14 +0100 Subject: [PATCH 7/8] CS --- reference/constraints/Email.rst | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/reference/constraints/Email.rst b/reference/constraints/Email.rst index 4b64e3c9632..02c736bc6e5 100644 --- a/reference/constraints/Email.rst +++ b/reference/constraints/Email.rst @@ -99,7 +99,8 @@ strict **type**: ``boolean`` **default**: ``false`` When false, the email will be validated against a simple regular expression. -If true, then the `egulias/email-validator`_ library is required to perform an RFC compliant validation. +If true, then the `egulias/email-validator`_ library is required to perform +an RFC compliant validation. message ~~~~~~~ @@ -124,6 +125,4 @@ checkHost If true, then the :phpfunction:`checkdnsrr` PHP function will be used to check the validity of the MX *or* the A *or* the AAAA record of the host of the given email. - - .. _egulias/email-validator: https://packagist.org/packages/egulias/email-validator From 257c48348c51a9b5361bb4ea800d643afa3f140f Mon Sep 17 00:00:00 2001 From: Eduardo Gulias Davis Date: Sat, 18 Jan 2014 20:03:36 +0100 Subject: [PATCH 8/8] Blank line restored --- reference/constraints/Email.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/reference/constraints/Email.rst b/reference/constraints/Email.rst index 02c736bc6e5..112620da68b 100644 --- a/reference/constraints/Email.rst +++ b/reference/constraints/Email.rst @@ -125,4 +125,5 @@ checkHost If true, then the :phpfunction:`checkdnsrr` PHP function will be used to check the validity of the MX *or* the A *or* the AAAA record of the host of the given email. + .. _egulias/email-validator: https://packagist.org/packages/egulias/email-validator