perf(Validator): load base rules from call parent method

Use static:: replace self:: in Validator::loadValidatorMetadata() to load rules which created in Validator::rules()
Rhilip · Feb 8, 2019 · 9d7191b · 9d7191b
1 parent 58b86ac
commit 9d7191b
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 16 deletions.
diff --git a/apps/models/form/TorrentUploadForm.php b/apps/models/form/TorrentUploadForm.php
@@ -61,10 +61,7 @@ public static function rules()
 
     public static function loadValidatorMetadata(ClassMetadata $metadata)
     {
-        $rules = self::rules();
-        foreach ($rules as $property => $constraints) {
-            $metadata->addPropertyConstraints($property, $constraints);
-        }
+        parent::loadValidatorMetadata($metadata);
         $metadata->addConstraint(new Assert\Callback([
             'callback' => 'isValidTorrent',
             'payload' => ['name' => 'file', 'maxSize' => app()->config->get("torrent.max_file_size"), 'mimeTypes' => 'application/x-bittorrent']

diff --git a/apps/models/form/UserLoginForm.php b/apps/models/form/UserLoginForm.php
@@ -69,11 +69,7 @@ public static function rules()
 
     public static function loadValidatorMetadata(ClassMetadata $metadata)
     {
-        // FIXME It will not add the rule in self::rule() when use parent::loadValidatorMetadata()
-        $rules = self::rules();
-        foreach ($rules as $property => $constraints) {
-            $metadata->addPropertyConstraints($property, $constraints);
-        }
+        parent::loadValidatorMetadata($metadata);
         $metadata->addConstraint(new Assert\Callback('validateCaptcha'));
         $metadata->addConstraint(new Assert\Callback('loadUserFromPdo'));
         $metadata->addConstraint(new Assert\Callback('isMaxLoginIpReached'));

diff --git a/apps/models/form/UserRegisterForm.php b/apps/models/form/UserRegisterForm.php
@@ -97,12 +97,7 @@ public static function rules()
 
     public static function loadValidatorMetadata(ClassMetadata $metadata)
     {
-        // FIXME It will not add the rule in self::rule() when use parent::loadValidatorMetadata()
-        $rules = self::rules();
-        foreach ($rules as $property => $constraints) {
-            $metadata->addPropertyConstraints($property, $constraints);
-        }
-
+        parent::loadValidatorMetadata($metadata);
         $metadata->addConstraint(new Assert\Callback('isRegisterSystemOpen'));
         $metadata->addConstraint(new Assert\Callback('isMaxUserReached'));
         $metadata->addConstraint(new Assert\Callback('isMaxRegisterIpReached'));

diff --git a/framework/Validators/Validator.php b/framework/Validators/Validator.php
@@ -25,7 +25,7 @@ public static function rules()
 
     public static function loadValidatorMetadata(ClassMetadata $metadata)
     {
-        $rules = self::rules();
+        $rules = static::rules();
         foreach ($rules as $property => $constraints) {
             $metadata->addPropertyConstraints($property, $constraints);
         }