Merge pull request #5 from VladimirBerdnik/master

Resolve "Presence verifier has not been set." issue for **exists** and **in** rules

Author: populov

CHANGES.md

@@ -1,12 +1,16 @@
 # Changes History
 
+1.0.6
+-----
+Resolve "Presence verifier has not been set." issue for **exists** and **in** rules
+
 1.0.5
 -----
-Add ability to use custom declared validation rules 
+Add ability to use custom declared validation rules
 
 1.0.4
 -----
-Add 'sometimes' rule modifier 
+Add 'sometimes' rule modifier
 
 1.0.3
 -----

README.md

@@ -57,7 +57,8 @@ Add the FluentValidationServiceProvider in ``config/app.php``:
 *Note:* You can omit service provider registration, but then you must call
 *->toString()* or *->toArray()* on each builder.
 If service provider is registered, manual casting of rule to string or array
-is not necessary.
+is not necessary and default Laravel's *Illuminate\Validation\ValidationServiceProvider::class* 
+can be removed from *'providers'* array.
 
 
 ## Available classes

src/FluentValidationServiceProvider.php

@@ -2,17 +2,28 @@
 
 namespace Saritasa\Laravel\Validation;
 
-use Illuminate\Support\ServiceProvider;
+use Illuminate\Validation\ValidationServiceProvider;
 use Illuminate\Contracts\Validation\Factory as IValidatorFactory;
 
 /**
  * Service provider substitutes default Laravel's validation factory
  * @see FluentValidatorFactory
  */
-class FluentValidationServiceProvider extends ServiceProvider
+class FluentValidationServiceProvider extends ValidationServiceProvider
 {
-    public function boot()
+    protected function registerValidationFactory()
     {
-        $this->app->bind(IValidatorFactory::class, FluentValidatorFactory::class);
+        $this->app->singleton('validator', function ($app) {
+            $validator = new FluentValidatorFactory($app['translator'], $app);
+
+            // The validation presence verifier is responsible for determining the existence of
+            // values in a given data collection which is typically a relational database or
+            // other persistent data stores. It is used to check for "uniqueness" as well.
+            if (isset($app['db'], $app['validation.presence'])) {
+                $validator->setPresenceVerifier($app['validation.presence']);
+            }
+
+            return $validator;
+        });
     }
 }

src/RuleSet.php

@@ -90,8 +90,7 @@ protected function appendIfNotExists($rule)
     {
         if (in_array($rule, $this->rules)) {
             return $this;
-        }
-        else {
+        } else {
             return new static(array_merge($this->rules, [$rule]));
         }
     }
@@ -108,16 +107,15 @@ protected static function mergeIfNotExists(string $rule, array $rules = []): arr
     {
         if (in_array($rule, $rules)) {
             return $rules;
-        }
-        else {
+        } else {
             return array_merge($rules, [$rule]);
         }
     }
 
     /** Return current rule set as array */
     public function toArray(): array
     {
-        return array_map(function($rule) {
+        return array_map(function ($rule) {
             if ($rule instanceof IRule) {
                 return (string)$rule;
             } else {

tests/RuleTest.php

@@ -64,17 +64,17 @@ public function testSometimes()
      */
     public function testIn()
     {
-        $this->assertEquals('in:male,female', Rule::in('male', 'female'));
-        $this->assertEquals('in:Male,Female', Rule::in(Gender::getConstants()));
+        $this->assertEquals('in:"male","female"', Rule::in('male', 'female'));
+        $this->assertEquals('in:"Male","Female"', Rule::in(Gender::getConstants()));
     }
 
     /**
      * Rule 'notIn' can accept values as list of parameters or as array
      */
     public function testNotIn()
     {
-        $this->assertEquals('not_in:forbidden,deleted', Rule::notIn('forbidden', 'deleted'));
-        $this->assertEquals('not_in:forbidden,deleted', Rule::notIn(['forbidden', 'deleted']));
+        $this->assertEquals('not_in:"forbidden","deleted"', Rule::notIn('forbidden', 'deleted'));
+        $this->assertEquals('not_in:"forbidden","deleted"', Rule::notIn(['forbidden', 'deleted']));
     }
 
     /**