minor improves

AnourValar · Dec 25, 2019 · baf138d · baf138d
1 parent f0e398d
commit baf138d
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 2 deletions.
diff --git a/src/ModelTrait.php b/src/ModelTrait.php
@@ -140,8 +140,7 @@ public function scopeValidate(\Illuminate\Database\Eloquent\Builder $query, $pre
             $passes = $validator->passes();
 
             if ($passes && $validator->getRules()) {
-                $validator = \Validator::make($this->attributes, $validator->getRules());
-                $validator->setAttributeNames($this->getAttributeNames());
+                $validator = \Validator::make($validator->getData(), $validator->getRules(), [], $validator->customAttributes);
 
                 $passes = $validator->passes();
             }

diff --git a/src/Providers/EloquentValidationServiceProvider.php b/src/Providers/EloquentValidationServiceProvider.php
@@ -46,6 +46,21 @@ public function boot()
         });
 
 
+        // "available_keys" validation
+         \Validator::extend('available_keys', function($attribute, $value, $parameters, $validator)
+        {
+            return ( is_array($value) && !array_diff_key($value, array_combine($parameters, $parameters)) );
+        });
+
+        \Validator::replacer('available_keys', function ($message, $attribute, $rule, $parameters, $validator)
+        {
+            return trans(
+                'eloquent-validation::validation.available_keys',
+                ['attribute' => $validator->getDisplayableAttribute($attribute)]
+            );
+        });
+
+
         // langs
         $this->loadTranslationsFrom(__DIR__.'/../resources/lang/', 'eloquent-validation');
         $this->publishes([__DIR__.'/../resources/lang/' => resource_path('lang/vendor/eloquent-validation')]);

diff --git a/src/resources/lang/en/validation.php b/src/resources/lang/en/validation.php
@@ -3,6 +3,7 @@
 return [
     'scalar' => 'The :attribute must be scalar.',
     'config' => 'The :attribute attribute must contain value from directory.',
+    'available_keys' => 'The :attribute attribute may contain a limited list of keys.',
 
     'calculated' => 'Field :attribute calculated automatically.',
     'unchangeable' => 'Field :attribute cannot be changed.',

diff --git a/src/resources/lang/ru/validation.php b/src/resources/lang/ru/validation.php
@@ -3,6 +3,7 @@
 return [
     'scalar' => 'Поле :attribute должно быть скалярной величиной.',
     'config' => 'Поле :attribute должно содержать значение из справочника.',
+    'available_keys' => 'Поле :attribute может содержать ограниченный список ключей.',
 
     'calculated' => 'Поле :attribute вычисляется автоматически.',
     'unchangeable' => 'Поле :attribute не может быть изменено.',