New way to add validation rules to form elements and combine it with …

…old method

src/SleepingOwl/Admin/Models/Form/Form.php

@@ -149,4 +149,14 @@ public function addItem($item)
 		$this->items[] = $item;
 	}
 
+	public function getValidationRules()
+	{
+		$rules = [];
+		foreach ($this->items as $item)
+		{
+			$rules[$item->getName()] = $item->getValidationRules();
+		}
+		return $rules;
+	}
+
 }

src/SleepingOwl/Admin/Models/Form/FormItem/BaseFormItem.php

@@ -16,9 +16,23 @@ abstract class BaseFormItem implements FormItemInterface
 	 * @var Form
 	 */
 	protected $form;
+	/**
+	 * @var string
+	 */
 	protected $name;
+	/**
+	 * @var string
+	 */
 	protected $label;
+	/**
+	 * @var array
+	 */
+	protected $validation = [];
 
+	/**
+	 * @param null $name
+	 * @param null $label
+	 */
 	function __construct($name = null, $label = null)
 	{
 		$this->formBuilder = Admin::instance()->formBuilder;
@@ -30,9 +44,53 @@ function __construct($name = null, $label = null)
 		}
 	}
 
+	/**
+	 * @return string
+	 */
+	public function getName()
+	{
+		return $this->name;
+	}
+
+	/**
+	 * @return mixed
+	 */
 	protected function getValueFromForm()
 	{
 		return $this->form->getValueForName($this->name);
 	}
 
+	public function required($onlyOnCreate = false)
+	{
+		if ($onlyOnCreate)
+		{
+			$this->validationRule('required_only_on_create');
+		} else
+		{
+			$this->validationRule('required');
+		}
+		return $this;
+	}
+
+	public function unique()
+	{
+		$table = ModelItem::$current->getModelTable();
+		return $this->validationRule('unique:' . $table . ',' . $this->name);
+	}
+
+	public function validationRule($rule)
+	{
+		$rules = explode('|', $rule);
+		foreach ($rules as $rule)
+		{
+			$this->validation[] = $rule;
+		}
+		return $this;
+	}
+
+	public function getValidationRules()
+	{
+		return $this->validation;
+	}
+
 }

src/SleepingOwl/Admin/Models/Form/FormItem/Image.php

@@ -7,4 +7,11 @@ public function render()
 		return $this->formBuilder->imageGroup($this->name, $this->label, $this->form->getInstance());
 	}
 
+	public function getValidationRules()
+	{
+		$rules = parent::getValidationRules();
+		$rules[] = 'image';
+		return $rules;
+	}
+
 } 

src/SleepingOwl/Admin/Models/Form/Interfaces/FormItemInterface.php

@@ -8,4 +8,14 @@ interface FormItemInterface
 	 */
 	public function render();
 
+	/**
+	 * @return string
+	 */
+	public function getName();
+
+	/**
+	 * @return array|null
+	 */
+	public function getValidationRules();
+
 } 

src/SleepingOwl/Admin/Models/ModelItem.php

@@ -199,6 +199,12 @@ public function getModelClass()
 		return $this->modelClass;
 	}
 
+	public function getModelTable()
+	{
+		$instance = new $this->modelClass;
+		return $instance->getTable();
+	}
+
 	/**
 	 * @return array
 	 */
@@ -356,4 +362,5 @@ public function __call($method, $param)
 		}
 		throw new MethodNotFoundException(get_class($this), $method);
 	}
+
 }

src/SleepingOwl/Admin/Repositories/ModelRepository.php

@@ -94,7 +94,8 @@ public function update($id)
 	 */
 	protected function save()
 	{
-		$this->instance->validate($data = $this->request->all());
+		$rules = $this->modelItem->getForm()->getValidationRules();
+		$this->instance->validate($data = $this->request->all(), $rules);
 		foreach ($data as &$value)
 		{
 			if ( ! is_string($value)) continue;

src/SleepingOwl/Models/Interfaces/ValidationModelInterface.php

@@ -4,10 +4,11 @@ interface ValidationModelInterface
 {
 	/**
 	 * @param $data
+	 * @param array $rules
 	 * @throws \SleepingOwl\Admin\Exceptions\ValidationException
 	 * @return void
 	 */
-	public function validate($data);
+	public function validate($data, $rules = []);
 
 	/**
 	 * @return array

src/SleepingOwl/Models/Traits/ValidationModelTrait.php

@@ -13,17 +13,41 @@ trait ValidationModelTrait
 {
 	/**
 	 * @param $data
-	 * @return bool
+	 * @param array $rules
 	 * @throws ValidationException
+	 * @return bool
 	 */
-	public function validate($data)
+	public function validate($data, $rules = [])
 	{
-		$validator = Validator::make($data, $this->getValidationRules(), Lang::get('admin::validation'), ['id' => $this->id]);
+		$rules = $this->mergeValidationRules($rules);
+		$validator = Validator::make($data, $rules, Lang::get('admin::validation'), ['id' => $this->id]);
 
 		if ($validator->fails())
 		{
 			throw new ValidationException($validator->errors());
 		}
 		return true;
 	}
+
+	/**
+	 * @param $rules
+	 * @return array
+	 */
+	protected function mergeValidationRules($rules)
+	{
+		foreach ($this->getValidationRules() as $field => $rule)
+		{
+			if (!is_array($rule))
+			{
+				$rule = explode('|', $rule);
+			}
+			$rules[$field] = array_merge($rules[$field], $rule);
+		}
+		return $rules;
+	}
+
+	public function getValidationRules()
+	{
+		return [];
+	}
 }