[Validator] Small fixes

symfony · Ninos · Sep 28, 2023 · Sep 28, 2023 · Sep 28, 2023 · Sep 28, 2023
commit 0d12319cd3faea080cc1b4d78a79514ec2ce12af
diff --git a/src/Symfony/Component/Validator/CHANGELOG.md b/src/Symfony/Component/Validator/CHANGELOG.md
@@ -19,11 +19,15 @@ CHANGELOG
  * Remove `ValidatorBuilder::disableAnnotationMapping()`, use `ValidatorBuilder::disableAttributeMapping()` instead
  * Remove `AnnotationLoader`, use `AttributeLoader` instead
 
+7.1
+---
+
+* Add `*_NO_PUBLIC`, `*_ONLY_PRIVATE` and `*_ONLY_RESERVED` versions to `Ip` constraint
+* Possibility to use all `Ip` constraint versions for `Cidr` constraint
+
 6.4
 ---
 
- * Add `*_NO_PUBLIC`, `*_ONLY_PRIVATE` and `*_ONLY_RESERVED` versions to `Ip` constraint
- * Possibility to use all `Ip` constraint versions for `Cidr` constraint
  * Add `is_valid` function to the `Expression` constraint, its behavior is the same as `ValidatorInterface::validate`
  * Allow single integer for the `versions` option of the `Uuid` constraint
  * Allow single constraint to be passed to the `constraints` option of the `When` constraint

diff --git a/src/Symfony/Component/Validator/Constraints/Cidr.php b/src/Symfony/Component/Validator/Constraints/Cidr.php
@@ -73,25 +73,25 @@ public function __construct(
         int $netmaskMin = null,
         int $netmaskMax = null,
         string $message = null,
-        callable $normalizer = null,
         array $groups = null,
-        $payload = null
+        $payload = null,
+        callable $normalizer = null
     ) {
         $this->version = $version ?? $options['version'] ?? $this->version;
 
-        if (!\in_array($this->version, array_keys(self::NET_MAXES))) {
-            throw new ConstraintDefinitionException(sprintf('The option "version" must be one of "%s".', implode('", "', array_keys(self::NET_MAXES))));
+        if (!\array_key_exists($this->version, self::NET_MAXES)) {
+            throw new ConstraintDefinitionException(sprintf('The option "version" must be one of "%s".', implode('", "', array_keys(static::NET_MAXES))));
         }
 
         $this->netmaskMin = $netmaskMin ?? $options['netmaskMin'] ?? $this->netmaskMin;
-        $this->netmaskMax = $netmaskMax ?? $options['netmaskMax'] ?? self::NET_MAXES[$this->version];
+        $this->netmaskMax = $netmaskMax ?? $options['netmaskMax'] ?? static::NET_MAXES[$this->version];
         $this->message = $message ?? $this->message;
         $this->normalizer = $normalizer ?? $this->normalizer;
 
         unset($options['ne
8000
tmaskMin'], $options['netmaskMax'], $options['version']);
 
-        if ($this->netmaskMin < 0 || $this->netmaskMax > self::NET_MAXES[$this->version] || $this->netmaskMin > $this->netmaskMax) {
-            throw new ConstraintDefinitionException(sprintf('The netmask range must be between 0 and %d.', self::NET_MAXES[$this->version]));
+        if ($this->netmaskMin < 0 || $this->netmaskMax > static::NET_MAXES[$this->version] || $this->netmaskMin > $this->netmaskMax) {
+            throw new ConstraintDefinitionException(sprintf('The netmask range must be between 0 and %d.', static::NET_MAXES[$this->version]));
         }
 
         if (null !== $this->normalizer && !\is_callable($this->normalizer)) {

diff --git a/src/Symfony/Component/Validator/Constraints/Ip.php b/src/Symfony/Component/Validator/Constraints/Ip.php
@@ -61,32 +61,15 @@ class Ip extends Constraint
 
     public const INVALID_IP_ERROR = 'b1b427ae-9f6f-41b0-aa9b-84511fbb3c5b';
 
-    /**
-     * @deprecated since Symfony 6.4, use const V4_NO_PRIVATE instead
-     */
+    // BC: Aliases
     public const V4_NO_PRIV = '4_no_priv';
-    /**
-     * @deprecated since Symfony 6.4, use const V6_NO_PRIVATE instead
-     */
     public const V6_NO_PRIV = '6_no_priv';
-    /**
-     * @deprecated since Symfony 6.4, use const ALL_NO_PRIVATE instead
-     */
     public const ALL_NO_PRIV = 'all_no_priv';
-    /**
-     * @deprecated since Symfony 6.4, use const 4_NO_RESERVED instead
-     */
     public const V4_NO_RES = '4_no_res';
-    /**
-     * @deprecated since Symfony 6.4, use const 6_NO_RESERVED instead
-     */
     public const V6_NO_RES = '6_no_res';
-    /**
-     * @deprecated since Symfony 6.4, use const ALL_NO_RESERVED instead
-     */
     public const ALL_NO_RES = 'all_no_res';
 
-    protected const DEPRECATED_VERSIONS = [
+    protected const ALIAS_VERSIONS = [
         self::V4_NO_PRIV => self::V4_NO_PRIVATE,
         self::V6_NO_PRIV => self::V6_NO_PRIVATE,
         self::ALL_NO_PRIV => self::ALL_NO_PRIVATE,
@@ -149,8 +132,8 @@ public function __construct(
         $this->message = $message ?? $this->message;
         $this->normalizer = $normalizer ?? $this->normalizer;
 
-        if (isset(self::DEPRECATED_VERSIONS[$this->version])) {
-            $this->version = self::DEPRECATED_VERSIONS[$this->version];
+        if (isset(static::ALIAS_VERSIONS[$this->version])) {
+            $this->version = static::ALIAS_VERSIONS[$this->version];
         }
 
         if (!\in_array($this->version, static::VERSIONS, true)) {

diff --git a/src/Symfony/Component/Validator/Constraints/IpValidator.php b/src/Symfony/Component/Validator/Constraints/IpValidator.php
@@ -82,7 +82,7 @@ public function validate(mixed $value, Constraint $constraint): void
             throw new UnexpectedValueException($value, 'string');
         }
 
-        $value = (string)$value;
+        $value = (string) $value;
 
         if (null !== $constraint->normalizer) {
             $value = ($constraint->normalizer)($value);