Make abstraction over Translator

composer.json

@@ -30,8 +30,7 @@
         "yiisoft/arrays": "dev-master",
         "yiisoft/friendly-exception": "^1.0",
         "yiisoft/network-utilities": "dev-master",
-        "yiisoft/strings": "^1.0",
-        "yiisoft/translator": "dev-master"
+        "yiisoft/strings": "^1.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.5",

src/Formatter.php

@@ -0,0 +1,24 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Validator;
+
+class Formatter implements FormatterInterface
+{
+    public function format(string $message, array $parameters = []): string
+    {
+        $replacements = [];
+        foreach ($parameters as $key => $value) {
+            if (is_array($value)) {
+                $value = 'array';
+            } elseif (is_object($value)) {
+                $value = 'object';
+            } elseif (is_resource($value)) {
+                $value = 'resource';
+            }
+            $replacements['{' . $key . '}'] = $value;
+        }
+        return strtr($message, $replacements);
+    }
+}

src/FormatterInterface.php

@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Validator;
+
+interface FormatterInterface
+{
+    public function format(string $message, array $parameters = []): string;
+}

src/Rule.php

@@ -4,14 +4,12 @@
 
 namespace Yiisoft\Validator;
 
-use Yiisoft\Translator\TranslatorInterface;
-
 /**
  * Rule represents a single value validation rule.
  */
 abstract class Rule
 {
-    private ?TranslatorInterface $translator = null;
+    private ?FormatterInterface $formatter = null;
     private ?string $translationDomain = null;
     private ?string $translationLocale = null;
     private bool $skipOnEmpty = false;
@@ -57,38 +55,22 @@ final public function validate($value, DataSetInterface $dataSet = null, bool $p
      */
     abstract protected function validateValue($value, DataSetInterface $dataSet = null): Result;
 
-    public function translator(TranslatorInterface $translator): self
-    {
-        $new = clone $this;
-        $new->translator = $translator;
-        return $new;
-    }
-
-    public function translationDomain(string $translation): self
+    public function formatter(FormatterInterface $formatter): self
     {
         $new = clone $this;
-        $new->translationDomain = $translation;
+        $new->formatter = $formatter;
         return $new;
     }
 
-    public function translationLocale(string $locale): self
+    protected function formatMessage(string $message, array $parameters = []): string
     {
-        $new = clone $this;
-        $new->translationLocale = $locale;
-        return $new;
-    }
-
-    protected function translateMessage(string $message, array $parameters = []): string
-    {
-        if ($this->translator === null) {
-            return $this->formatMessage($message, $parameters);
+        if ($this->formatter === null) {
+            $this->formatter = new Formatter();
         }
 
-        return $this->translator->translate(
+        return $this->formatter->format(
             $message,
-            $parameters,
-            $this->translationDomain ?? 'validators',
-            $this->translationLocale
+            $parameters
         );
     }
 
@@ -138,22 +120,6 @@ public function skipOnEmpty(bool $value): self
         return $new;
     }
 
-    private function formatMessage(string $message, array $arguments = []): string
-    {
-        $replacements = [];
-        foreach ($arguments as $key => $value) {
-            if (is_array($value)) {
-                $value = 'array';
-            } elseif (is_object($value)) {
-                $value = 'object';
-            } elseif (is_resource($value)) {
-                $value = 'resource';
-            }
-            $replacements['{' . $key . '}'] = $value;
-        }
-        return strtr($message, $replacements);
-    }
-
     /**
      * Checks if the given value is empty.
      * A value is considered empty if it is null, an empty array, or an empty string.

src/Rule/AtLeast.php

@@ -54,7 +54,7 @@ protected function validateValue($value, DataSetInterface $dataSet = null): Resu
 
         if ($filledCount < $this->min) {
             $result->addError(
-                $this->translateMessage(
+                $this->formatMessage(
                     $this->message,
                     [
                         'min' => $this->min,
@@ -83,7 +83,7 @@ public function getOptions(): array
         return array_merge(
             parent::getOptions(),
             ['min' => $this->min],
-            ['message' => $this->translateMessage($this->message, ['min' => $this->min])],
+            ['message' => $this->formatMessage($this->message, ['min' => $this->min])],
         );
     }
 }

src/Rule/Boolean.php

@@ -65,7 +65,7 @@ protected function validateValue($value, DataSetInterface $dataSet = null): Resu
 
         if (!$valid) {
             $result->addError(
-                $this->translateMessage(
+                $this->formatMessage(
                     $this->message,
                     [
                         'true' => $this->trueValue === true ? 'true' : $this->trueValue,
@@ -86,7 +86,7 @@ public function getOptions(): array
                 'strict' => $this->strict,
                 'trueValue' => $this->trueValue,
                 'falseValue' => $this->falseValue,
-                'message' => $this->translateMessage(
+                'message' => $this->formatMessage(
                     $this->message,
                     [
                         'true' => $this->trueValue === true ? 'true' : $this->trueValue,

src/Rule/Callback.php

@@ -34,7 +34,7 @@ protected function validateValue($value, DataSetInterface $dataSet = null): Resu
 
         if ($callbackResult->isValid() === false) {
             foreach ($callbackResult->getErrors() as $message) {
-                $result->addError($this->translateMessage($message));
+                $result->addError($this->formatMessage($message));
             }
         }
         return $result;

src/Rule/CompareTo.php

@@ -136,7 +136,7 @@ protected function validateValue($value, DataSetInterface $dataSet = null): Resu
 
         if (!$this->compareValues($this->operator, $this->type, $value, $this->compareValue)) {
             $result->addError(
-                $this->translateMessage(
+                $this->formatMessage(
                     $this->getMessage(),
                     [
                         'value' => $this->compareValue,
@@ -197,7 +197,7 @@ public function getOptions(): array
                 'type' => $this->type,
                 'operator' => $this->operator,
                 'compareValue' => $this->compareValue,
-                'message' => $this->translateMessage($this->getMessage(), ['value' => $this->compareValue]),
+                'message' => $this->formatMessage($this->getMessage(), ['value' => $this->compareValue]),
             ],
         );
     }

src/Rule/Each.php

@@ -40,7 +40,7 @@ protected function validateValue($value, DataSetInterface $dataSet = null): Resu
             if ($itemResult->isValid() === false) {
                 foreach ($itemResult->getErrors() as $error) {
                     $result->addError(
-                        $this->translateMessage(
+                        $this->formatMessage(
                             $this->message,
                             [
                                 'error' => $error,

src/Rule/Email.php

@@ -104,7 +104,7 @@ protected function validateValue($value, DataSetInterface $dataSet = null): Resu
         }
 
         if ($valid === false) {
-            $result->addError($this->translateMessage($this->message));
+            $result->addError($this->formatMessage($this->message));
         }
 
         return $result;
@@ -155,7 +155,7 @@ public function getOptions(): array
                 'allowName' => $this->allowName,
                 'checkDNS' => $this->checkDNS,
                 'enableIDN' => $this->enableIDN,
-                'message' => $this->translateMessage($this->message),
+                'message' => $this->formatMessage($this->message),
             ],
         );
     }

src/Rule/GroupRule.php

@@ -23,7 +23,7 @@ protected function validateValue($value, DataSetInterface $dataSet = null): Resu
     {
         $result = new Result();
         if (!$this->getRules()->validate($value, $dataSet)->isValid()) {
-            $result->addError($this->translateMessage($this->message));
+            $result->addError($this->formatMessage($this->message));
         }
 
         return $result;

src/Rule/HasLength.php

@@ -53,17 +53,17 @@ protected function validateValue($value, DataSetInterface $dataSet = null): Resu
         $result = new Result();
 
         if (!is_string($value)) {
-            $result->addError($this->translateMessage($this->message));
+            $result->addError($this->formatMessage($this->message));
             return $result;
         }
 
         $length = mb_strlen($value, $this->encoding);
 
         if ($this->min !== null && $length < $this->min) {
-            $result->addError($this->translateMessage($this->tooShortMessage, ['min' => $this->min]));
+            $result->addError($this->formatMessage($this->tooShortMessage, ['min' => $this->min]));
         }
         if ($this->max !== null && $length > $this->max) {
-            $result->addError($this->translateMessage($this->tooLongMessage, ['max' => $this->max]));
+            $result->addError($this->formatMessage($this->tooLongMessage, ['max' => $this->max]));
         }
 
         return $result;
@@ -109,11 +109,11 @@ public function getOptions(): array
         return array_merge(
             parent::getOptions(),
             [
-                'message' => $this->translateMessage($this->message),
+                'message' => $this->formatMessage($this->message),
                 'min' => $this->min,
-                'tooShortMessage' => $this->translateMessage($this->tooShortMessage, ['min' => $this->min]),
+                'tooShortMessage' => $this->formatMessage($this->tooShortMessage, ['min' => $this->min]),
                 'max' => $this->max,
-                'tooLongMessage' => $this->translateMessage($this->tooLongMessage, ['max' => $this->max]),
+                'tooLongMessage' => $this->formatMessage($this->tooLongMessage, ['max' => $this->max]),
                 'encoding' => $this->encoding,
             ],
         );

src/Rule/InRange.php

@@ -4,13 +4,12 @@
 
 namespace Yiisoft\Validator\Rule;
 
-use function is_iterable;
 use Yiisoft\Arrays\ArrayHelper;
 use Yiisoft\Validator\DataSetInterface;
 use Yiisoft\Validator\HasValidationErrorMessage;
 use Yiisoft\Validator\Result;
-
 use Yiisoft\Validator\Rule;
+use function is_iterable;
 
 /**
  * In validates that the attribute value is among a list of values.
@@ -62,7 +61,7 @@ protected function validateValue($value, DataSetInterface $dataSet = null): Resu
         $result = new Result();
 
         if ($this->not === $in) {
-            $result->addError($this->translateMessage($this->message));
+            $result->addError($this->formatMessage($this->message));
         }
 
         return $result;
@@ -87,7 +86,7 @@ public function getOptions(): array
         return array_merge(
             parent::getOptions(),
             [
-                'message' => $this->translateMessage($this->message),
+                'message' => $this->formatMessage($this->message),
                 'range' => $this->range,
                 'strict' => $this->strict,
                 'not' => $this->not,

src/Rule/Ip.php

@@ -197,12 +197,12 @@ protected function validateValue($value, DataSetInterface $dataSet = null): Resu
         }
         $result = new Result();
         if (!is_string($value)) {
-            $result->addError($this->translateMessage($this->message));
+            $result->addError($this->formatMessage($this->message));
             return $result;
         }
 
         if (preg_match($this->getIpParsePattern(), $value, $matches) === 0) {
-            $result->addError($this->translateMessage($this->message));
+            $result->addError($this->formatMessage($this->message));
             return $result;
         }
         $negation = !empty($matches['not'] ?? null);
@@ -213,28 +213,28 @@ protected function validateValue($value, DataSetInterface $dataSet = null): Resu
         try {
             $ipVersion = IpHelper::getIpVersion($ip, false);
         } catch (\InvalidArgumentException $e) {
-            $result->addError($this->translateMessage($this->message));
+            $result->addError($this->formatMessage($this->message));
             return $result;
         }
 
         if ($this->requireSubnet === true && $cidr === null) {
-            $result->addError($this->translateMessage($this->noSubnet));
+            $result->addError($this->formatMessage($this->noSubnet));
             return $result;
         }
         if ($this->allowSubnet === false && $cidr !== null) {
-            $result->addError($this->translateMessage($this->hasSubnet));
+            $result->addError($this->formatMessage($this->hasSubnet));
             return $result;
         }
         if ($this->allowNegation === false && $negation) {
-            $result->addError($this->translateMessage($this->message));
+            $result->addError($this->formatMessage($this->message));
             return $result;
         }
         if ($ipVersion === IpHelper::IPV6 && !$this->allowIpv6) {
-            $result->addError($this->translateMessage($this->ipv6NotAllowed));
+            $result->addError($this->formatMessage($this->ipv6NotAllowed));
             return $result;
         }
         if ($ipVersion === IpHelper::IPV4 && !$this->allowIpv4) {
-            $result->addError($this->translateMessage($this->ipv4NotAllowed));
+            $result->addError($this->formatMessage($this->ipv4NotAllowed));
             return $result;
         }
         if (!$result->isValid()) {
@@ -244,12 +244,12 @@ protected function validateValue($value, DataSetInterface $dataSet = null): Resu
             try {
                 IpHelper::getCidrBits($ipCidr);
             } catch (\InvalidArgumentException $e) {
-                $result->addError($this->translateMessage($this->wrongCidr));
+                $result->addError($this->formatMessage($this->wrongCidr));
                 return $result;
             }
         }
         if (!$this->isAllowed($ipCidr)) {
-            $result->addError($this->translateMessage($this->notInRange));
+            $result->addError($this->formatMessage($this->notInRange));
             return $result;
         }
 
@@ -468,19 +468,19 @@ public function getOptions(): array
         return array_merge(
             parent::getOptions(),
             [
-                'message' => $this->translateMessage($this->message),
+                'message' => $this->formatMessage($this->message),
                 'allowIpv4' => $this->allowIpv4,
-                'ipv4NotAllowedMessage' => $this->translateMessage($this->ipv4NotAllowed),
+                'ipv4NotAllowedMessage' => $this->formatMessage($this->ipv4NotAllowed),
                 'allowIpv6' => $this->allowIpv6,
-                'ipv6NotAllowedMessage' => $this->translateMessage($this->ipv6NotAllowed),
+                'ipv6NotAllowedMessage' => $this->formatMessage($this->ipv6NotAllowed),
                 'allowSubnet' => $this->allowSubnet,
-                'hasSubnetMessage' => $this->translateMessage($this->hasSubnet),
+                'hasSubnetMessage' => $this->formatMessage($this->hasSubnet),
                 'requireSubnet' => $this->requireSubnet,
-                'noSubnetMessage' => $this->translateMessage($this->noSubnet),
+                'noSubnetMessage' => $this->formatMessage($this->noSubnet),
                 'allowNegation' => $this->allowNegation,
-                'wrongCidrMessage' => $this->translateMessage($this->wrongCidr),
+                'wrongCidrMessage' => $this->formatMessage($this->wrongCidr),
                 'ranges' => $this->ranges,
-                'notInRangeMessage' => $this->translateMessage($this->notInRange),
+                'notInRangeMessage' => $this->formatMessage($this->notInRange),
             ],
         );
     }