Form name parameter for Form::setValidation method fix bgultekin#7

Author: Bilal Gültekin

README.md

@@ -82,14 +82,14 @@ The package uses laravel Form Builder to make validation rules work for both sid
     Form::text('birthdate');
     Form::close(); // don't forget to close form, it reset validation rules
 ```
-Also if you don't want to struggle with $rules at view files, you can set it in Controller or route by using Form::setValidation . This sets rules for first Form::open
+Also if you don't want to struggle with $rules at view files, you can set it in Controller or route with or without form name by using Form::setValidation($rules, $formName). If you don't give form name, this sets rules for first Form::open
 ```php    
     // in controller or route
     $rules = ['name' => 'required|max:100', 'email' => 'required|email', 'birthdate' => 'date'];
-    Form::setValidation($rules);
+    Form::setValidation($rules, 'firstForm'); // you can also use without giving form name Form::setValidation($rules) because there is just one.
 
     // in view
-    Form::open(array('url' => 'foo/bar', 'method' => 'put'), $rules);
+    Form::open(array('url' => 'foo/bar', 'method' => 'put', 'name' => 'firstForm'), $rules);
     // some form inputs
     Form::close();
 ```

src/Bllim/Laravalid/Converter/Base/Converter.php

@@ -42,6 +42,13 @@ abstract class Converter {
 	 */
 	protected $validationRules = [];
 
+	/**
+	 * Current form name
+	 *
+	 * @var string
+	 */
+	protected $currentFormName = null;
+
 
 	/**
 	 * Rules which specify input type is numeric
@@ -78,10 +85,11 @@ public function route()
 	 * @param array $rules 		Laravel validation rules
 	 *
 	 */
-	public function set($rules)
+	public function set($rules, $formName = null)
 	{
 		if($rules === null) return;
-		$this->validationRules = $rules;
+
+		$this->validationRules[$formName] = $rules;
 	}
 
 	/**
@@ -90,7 +98,25 @@ public function set($rules)
 	 */
 	public function reset()
 	{
-		$this->validationRules = [];
+		if(isset($this->validationRules[$this->currentFormName]))
+		{
+			unset($this->validationRules[$this->currentFormName]);
+		}
+		else if(isset($this->validationRules[null]))
+		{
+			unset($this->validationRules[null]);
+		}
+	}
+
+	/**
+	 * Set form name in order to get related validation rules
+	 *
+	 * @param array $formName 		Form name
+	 *
+	 */
+	public function setFormName($formName)
+	{
+		$this->currentFormName = $formName;
 	}
 
 
@@ -102,7 +128,16 @@ public function reset()
 	 */
 	public function getValidationRules()
 	{
-		return $this->validationRules;
+		if(isset($this->validationRules[$this->currentFormName]))
+		{
+			return $this->validationRules[$this->currentFormName];
+		}
+		else if(isset($this->validationRules[null]))
+		{
+			return $this->validationRules[null];			
+		}
+
+		return null;
 	}
 
 	/**
@@ -112,9 +147,9 @@ public function getValidationRules()
 	 */
 	protected function getValidationRule($inputName)
 	{
-		return is_array($this->validationRules[$inputName])
-		 ? $this->validationRules[$inputName]
-		 : explode('|', $this->validationRules[$inputName]);
+		return is_array($this->getValidationRules()[$inputName])
+		 ? $this->getValidationRules()[$inputName]
+		 : explode('|', $this->getValidationRules()[$inputName]);
 	}
 
 	/**
@@ -124,7 +159,7 @@ protected function getValidationRule($inputName)
 	 */
 	protected function checkValidationRule($inputName)
 	{
-		return isset($this->validationRules[$inputName]);
+		return isset($this->getValidationRules()[$inputName]);
 	}
 
 

src/Bllim/Laravalid/FormBuilder.php

@@ -38,9 +38,9 @@ public function __construct(\Illuminate\Html\HtmlBuilder $html, \Illuminate\Rout
 	 * @param array $rules 		Laravel validation rules
 	 *
 	 */
-	public function setValidation($rules)
+	public function setValidation($rules, $formName = null)
 	{
-		$this->converter()->set($rules);
+		$this->converter()->set($rules, $formName);
 	}
 
 	/**
@@ -73,6 +73,15 @@ public function resetValidation()
 	public function open(array $options = array(), $rules = null)
 	{
 		$this->setValidation($rules);
+
+		if(isset($options['name']))
+		{
+			$this->converter->setFormName($options['name']);
+		}
+		else
+		{
+			$this->converter->setFormName(null);
+		}
 
 		return parent::open($options);
 	}