withValidator

laravel · Oct 15, 2016 · bf8a36a · bf8a36a
2 parents 093cf02 + 87f9761
commit bf8a36a
Showing 1 changed file with 11 additions and 5 deletions.
diff --git a/src/Illuminate/Foundation/Http/FormRequest.php b/src/Illuminate/Foundation/Http/FormRequest.php
@@ -77,13 +77,19 @@ protected function getValidatorInstance()
         $factory = $this->container->make(ValidationFactory::class);
 
         if (method_exists($this, 'validator')) {
-            return $this->container->call([$this, 'validator'], compact('factory'));
+            $validator = $this->container->call([$this, 'validator'], compact('factory'));
+        } else {
+            $validator = $factory->make(
+                $this->validationData(), $this->container->call([$this, 'rules']),
+                $this->messages(), $this->attributes()
+            );
         }
 
-        return $factory->make(
-            $this->validationData(), $this->container->call([$this, 'rules']),
-            $this->messages(), $this->attributes()
-        );
+        if (method_exists($this, 'withValidator')) {
+            $this->withValidator($validator);
+        }
+
+        return $validator;
     }
 
     /**