Commit 634079b3 authored by 梁俊杰's avatar 梁俊杰
Browse files

自动生成，验证器更新规则调整操作

parent 3635d0c1

src/Command/MakeModelCommand.php

+6 −3
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ class MakeModelCommand extends HyperfCommand 
            if (!Str::contains($v, "_to_") && ($this->input->getOption('model') || $this->input->getOption('all'))) {

                $this->makeModel();

            }

            if (!Str::contains($v, "_to_") && $this->input->getOption('controller') || $this->input->getOption('all')) {

            if (!Str::contains($v, "_to_") && ($this->input->getOption('controller') || $this->input->getOption('all'))) {

                $this->makeValidator();

                $this->makeRepositoryInterface();

                $this->makeRepository();
@@ -563,8 +563,11 @@ class MakeModelCommand extends HyperfCommand 
            $rules .= "\t\t\t'" . $name . "' => '" . implode("|", $rs) . "'," . ($comment ? "// " . $comment . "-" . $type : "//" . $type) . "\n";

        }

        $messages = join(",\n", $messages);

        $patterns = ["%ModelClass%", '%rules%', '%attributes%', '%messages%'];

        $replacements = [$modelClass, $rules, $attributes, $messages];

        $patterns = ["%ModelClass%", '%createRules%', '%updateRules%', '%attributes%', '%messages%'];

        $createRules = $rules;

        $updateRules = str_replace("nullable", "sometimes", $rules);

        $updateRules = str_replace("required", "sometimes", $updateRules);

        $replacements = [$modelClass, $createRules, $updateRules, $attributes, $messages];

        $content = $this->buildField($patterns, $replacements, $content);

        $this->writeToFile($file, $content);

    }

src/Command/stubs/validator.stub

+2 −2
Original line number Diff line number Diff line
@@ -18,10 +18,10 @@ class %ModelClass%Validator extends HyperfValidator 
{

    protected $rules = [

        ValidatorInterface::RULE_CREATE => [

%rules%

%createRules%

        ],

        ValidatorInterface::RULE_UPDATE => [

%rules%

%updateRules%

        ],

    ];