moving option validation to the task class

kohana · Feb 28, 2012 · b45a945 · b45a945
1 parent e8dd7bf
commit b45a945
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 35 deletions.
diff --git a/classes/Kohana/Minion/Task.php b/classes/Kohana/Minion/Task.php
@@ -157,7 +157,7 @@ public function build_validation(Validation $validation)
 		// Add a rule to each key making sure it's in the task
 		foreach ($validation->as_array() as $key => $value)
 		{
-			$validation->rule($key, array('Minion_Valid', 'option'), array(':validation', ':field', $this));
+			$validation->rule($key, array($this, 'valid_option'), array(':validation', ':field'));
 		}
 
 		return $validation;
@@ -222,4 +222,13 @@ protected function _help(array $params)
 
 		echo $view;
 	}
+
+
+	public function valid_option(Validation $validation, $option)
+	{
+		if ( ! in_array($option, $this->_accepted_options))
+		{
+			$validation->error($key, 'minion_option');
+		}
+	}
 }
diff --git a/classes/Kohana/Minion/Valid.php b/classes/Kohana/Minion/Valid.php
diff --git a/classes/Minion/Valid.php b/classes/Minion/Valid.php