Yiisoft\Validator\ValidatorFactory

Complexity

Total Complexity

9

Size/Duplication

Total Lines	46
Duplicated Lines	0 %

Test Coverage

Coverage

100%

Importance

Changes	1
Bugs	0	Features	0

4 Methods

Rating	Name	Duplication	Size	Complexity
A	normalizeRules()	0	9	3
A	__construct()	0	4	1
A	normalizeRule()	0	17	4
A	create()	0	3	1

<?php

declare(strict_types=1);

namespace Yiisoft\Validator;

use Yiisoft\Validator\Rule\Callback;

final class ValidatorFactory implements ValidatorFactoryInterface
{
    private ?FormatterInterface $formatter;

    public function __construct(
        FormatterInterface $formatter = null
    ) {
        $this->formatter = $formatter;
    }

    public function create(array $rules): ValidatorInterface
    {
        return new Validator($this->normalizeRules($rules));
    }

    private function normalizeRules(array $rules)
    {
        foreach ($rules as $attribute => $ruleSets) {
            foreach ($ruleSets as $index => $rule) {
                $ruleSets[$index] = $this->normalizeRule($rule);
            }
            $rules[$attribute] = $ruleSets;
        }
        return $rules;
    }

    /**
     * @param callable|Rule $rule
     */
    private function normalizeRule($rule): Rule
    {
        if (is_callable($rule)) {
            $rule = new Callback($rule);

It seems like $rule can also be of type Yiisoft\Validator\Rule; however, parameter $callback of Yiisoft\Validator\Rule\Callback::__construct() does only seem to accept callable, maybe add an additional type check?

        }

        if (!$rule instanceof Rule) {
            throw new \InvalidArgumentException(
                'Rule should be either instance of Rule class or a callable'
            );
        }

        if ($this->formatter !== null) {
            $rule = $rule->formatter($this->formatter);
        }

        return $rule;

The expression return $rule could return the type callable which is incompatible with the type-hinted return Yiisoft\Validator\Rule. Consider adding an additional type-check to rule them out.

    }
}