minor #28871 [Validator] use constraint options instead of properties (xabbuh)

fabpot · fabpot · commit 2b34f2b8e2db · 2018-10-15T15:13:03.000+02:00
This PR was merged into the 4.2-dev branch. Discussion ---------- [Validator] use constraint options instead of properties | Q | A | ------------- | --- | Branch? | master | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | | License | MIT | Doc PR | For other constraints we always talk about "options" and that's how we name them in the documentation too. I think we should be consistent about the terminology being used here. What do you think? Commits ------- f642355 use constraint options instead of properties
diff --git a/UPGRADE-4.2.md b/UPGRADE-4.2.md
@@ -261,7 +261,7 @@ TwigBundle
 Validator
 ---------
 
- * The `checkMX` and `checkHost` properties of the Email constraint are deprecated
+ * The `checkMX` and `checkHost` options of the `Email` constraint are deprecated
  * The component is now decoupled from `symfony/translation` and uses `Symfony\Contracts\Translation\TranslatorInterface` instead
  * The `ValidatorBuilderInterface` has been deprecated and `ValidatorBuilder` made final
  * Deprecated validating instances of `\DateTimeInterface` in `DateTimeValidator`, `DateValidator` and `TimeValidator`. Use `Type` instead or remove the constraint if the underlying model is type hinted to `\DateTimeInterface` already.
diff --git a/UPGRADE-5.0.md b/UPGRADE-5.0.md
@@ -254,7 +254,7 @@ TwigBundle
 Validator
 --------
 
- * The `checkMX` and `checkHost` properties of the Email constraint were removed
+ * The `checkMX` and `checkHost` options of the `Email` constraint were removed
  * The `Email::__construct()` 'strict' property has been removed. Use 'mode'=>"strict" instead.
  * Calling `EmailValidator::__construct()` method with a boolean parameter has been removed, use `EmailValidator("strict")` instead.
  * Removed the `checkDNS` and `dnsMessage` options from the `Url` constraint.
diff --git a/src/Symfony/Component/Validator/Constraints/Email.php b/src/Symfony/Component/Validator/Constraints/Email.php
@@ -81,11 +81,11 @@ public function __construct($options = null)
         }
 
         if (\is_array($options) && array_key_exists('checkMX', $options)) {
-            @trigger_error('The "checkMX" property is deprecated since Symfony 4.2.', E_USER_DEPRECATED);
+            @trigger_error('The "checkMX" option is deprecated since Symfony 4.2.', E_USER_DEPRECATED);
         }
 
         if (\is_array($options) && array_key_exists('checkHost', $options)) {
-            @trigger_error('The "checkHost" property is deprecated since Symfony 4.2.', E_USER_DEPRECATED);
+            @trigger_error('The "checkHost" option is deprecated since Symfony 4.2.', E_USER_DEPRECATED);
         }
 
         if (\is_array($options) && array_key_exists('mode', $options) && !\in_array($options['mode'], self::$validationModes, true)) {

Original file line number	Diff line number	Diff line change
`@@ -81,11 +81,11 @@ public function __construct($options = null)`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`if (\is_array($options) && array_key_exists('checkMX', $options)) {`
`84`		`- @trigger_error('The "checkMX" property is deprecated since Symfony 4.2.', E_USER_DEPRECATED);`
	`84`	`+ @trigger_error('The "checkMX" option is deprecated since Symfony 4.2.', E_USER_DEPRECATED);`
`85`	`85`	`}`
`86`	`86`
`87`	`87`	`if (\is_array($options) && array_key_exists('checkHost', $options)) {`
`88`		`- @trigger_error('The "checkHost" property is deprecated since Symfony 4.2.', E_USER_DEPRECATED);`
	`88`	`+ @trigger_error('The "checkHost" option is deprecated since Symfony 4.2.', E_USER_DEPRECATED);`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`if (\is_array($options) && array_key_exists('mode', $options) && !\in_array($options['mode'], self::$validationModes, true)) {`