Reuse negation character (#746)

* Revert "Revert "Change type of `$escape` argument in `Error::getValuePath()` from `bool|string|null` to `string|null`""

This reverts commit c5a2b49.

* Use negation character constant from network utilities package in `IpHandler`

* Update CHANGELOG.md [skip ci]

* Update CHANGELOG.md

Co-authored-by: Sergei Predvoditelev <sergei@predvoditelev.ru>

---------

Co-authored-by: Sergei Predvoditelev <sergei@predvoditelev.ru>

Author: arogachev

CHANGELOG.md

@@ -3,7 +3,9 @@
 ## 2.1.0 under development
 
 - Enh #740: Use `Yiisoft\NetworkUtilities\IpRanges` in `Ip` rule: add `getIpRanges()` method and deprecate
-  `getRanges()`, `getNetworks()`, `isAllowed()` methods (@vjik) 
+  `getRanges()`, `getNetworks()`, `isAllowed()` methods (@vjik)
+- Enh #746: Use `NEGATION_CHARACTER` constant from `network-utilities` package in `IpHandler` instead of declaring its own 
+  constant (@arogachev)
 
 ## 2.0.0 August 02, 2024
 

composer.json

@@ -33,7 +33,7 @@
         "psr/http-message": "^1.0|^2.0",
         "yiisoft/arrays": "^2.1|^3.0",
         "yiisoft/friendly-exception": "^1.0",
-        "yiisoft/network-utilities": "^1.1",
+        "yiisoft/network-utilities": "^1.2",
         "yiisoft/strings": "^2.1",
         "yiisoft/translator": "^2.1|^3.0"
     },

src/Rule/IpHandler.php

@@ -6,6 +6,7 @@
 
 use InvalidArgumentException;
 use Yiisoft\NetworkUtilities\IpHelper;
+use Yiisoft\NetworkUtilities\IpRanges;
 use Yiisoft\Validator\Exception\UnexpectedRuleException;
 use Yiisoft\Validator\Result;
 use Yiisoft\Validator\RuleHandlerInterface;
@@ -21,14 +22,6 @@
  */
 final class IpHandler implements RuleHandlerInterface
 {
-    /**
-     * Negation character.
-     *
-     * Used to negate {@see $ranges} or {@see $network} or to negate value validated when {@see $allowNegation}
-     * is used.
-     */
-    private const NEGATION_CHARACTER = '!';
-
     public function validate(mixed $value, RuleInterface $rule, ValidationContext $context): Result
     {
         if (!$rule instanceof Ip) {
@@ -82,7 +75,7 @@ public function validate(mixed $value, RuleInterface $rule, ValidationContext $c
     private static function getIpParsePattern(): string
     {
         return '/^(?<not>' .
-            self::NEGATION_CHARACTER .
+            IpRanges::NEGATION_CHARACTER .
             ')?(?<ipCidr>(?<ip>(?:' . IpHelper::IPV4_PATTERN . ')|(?:' . IpHelper::IPV6_PATTERN . '))(?:\/(?<cidr>-?\d+))?)$/';
     }