From 51baf42d6287f92cd7b1d4947ad02f925b9bbcf8 Mon Sep 17 00:00:00 2001
From: phpnut <phpnut@cakephp.org>
Date: Sat, 22 Dec 2007 21:03:30 +0000
Subject: [PATCH] "Changing Validation class to be a static class"

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6203 3807eeeb-6ff5-0310-8944-8be069107fe0
---
 cake/libs/model/model.php                 |    2 +-
 cake/libs/validation.php                  |  276 ++--
 cake/tests/cases/libs/validation.test.php | 1778 ++++++++++-----------
 3 files changed, 1041 insertions(+), 1015 deletions(-)

diff --git a/cake/libs/model/model.php b/cake/libs/model/model.php
index bbb9269ce..b44600fea 100644
--- a/cake/libs/model/model.php
+++ b/cake/libs/model/model.php
@@ -1869,7 +1869,7 @@ class Model extends Overloadable {
 			$data = $data[$this->alias];
 		}
 
-		$Validation = new Validation();
+		$Validation =& Validation::getInstance();
 		$exists = $this->exists();
 
 		foreach ($this->validate as $fieldName => $ruleSet) {
diff --git a/cake/libs/validation.php b/cake/libs/validation.php
index 833b9f982..809cf0e6c 100644
--- a/cake/libs/validation.php
+++ b/cake/libs/validation.php
@@ -101,10 +101,19 @@ class Validation extends Object {
  */
 	var $errors = array();
 /**
- * Constructor.
+ * Gets a reference to the Validation object instance
+ *
+ * @return object Validation instance
+ * @access public
+ * @static
  */
-	function __construct() {
-		parent::__construct();
+	function &getInstance() {
+		static $instance = array();
+
+		if (!isset($instance[0]) || !$instance[0]) {
+			$instance[0] =& new Validation();
+		}
+		return $instance[0];
 	}
 /**
  * Checks that a string contains only integer or letters
@@ -119,19 +128,20 @@ class Validation extends Object {
  * @access public
  */
 	function alphaNumeric($check) {
-		$this->__reset();
-		$this->check = $check;
+		$_this =& Validation::getInstance();
+		$_this->__reset();
+		$_this->check = $check;
 
 		if (is_array($check)) {
-			$this->_extract($check);
+			$_this->_extract($check);
 		}
 
-		if (empty($this->check) && $this->check != '0') {
+		if (empty($_this->check) && $_this->check != '0') {
 			return false;
 		}
 
-		$this->regex = '/[^\\dA-Z]/i';
-		if ($this->_check() === true) {
+		$_this->regex = '/[^\\dA-Z]/i';
+		if ($_this->_check() === true) {
 			return false;
 		} else {
 			return true;
@@ -169,15 +179,16 @@ class Validation extends Object {
  * @access public
  */
 	function blank($check) {
-		$this->__reset();
-		$this->check = $check;
+		$_this =& Validation::getInstance();
+		$_this->__reset();
+		$_this->check = $check;
 
 		if (is_array($check)) {
-			$this->_extract($check);
+			$_this->_extract($check);
 		}
 
-		$this->regex = '/[^\\s]/';
-		if ($this->_check() === true) {
+		$_this->regex = '/[^\\s]/';
+		if ($_this->_check() === true) {
 			return false;
 		} else {
 			return true;
@@ -198,25 +209,26 @@ class Validation extends Object {
  * @see Validation::_luhn()
  */
 	function cc($check, $type = 'fast', $deep = false, $regex = null) {
-		$this->__reset();
-		$this->check = $check;
-		$this->type = $type;
-		$this->deep = $deep;
-		$this->regex = $regex;
+		$_this =& Validation::getInstance();
+		$_this->__reset();
+		$_this->check = $check;
+		$_this->type = $type;
+		$_this->deep = $deep;
+		$_this->regex = $regex;
 
 		if (is_array($check)) {
-			$this->_extract($check);
+			$_this->_extract($check);
 		}
 
-		$this->check = str_replace(array('-', ' '), '', $this->check);
+		$_this->check = str_replace(array('-', ' '), '', $_this->check);
 
-		if (strlen($this->check) < 13) {
+		if (strlen($_this->check) < 13) {
 			return false;
 		}
 
-		if (!is_null($this->regex)) {
-			if ($this->_check()) {
-				return $this->_luhn();
+		if (!is_null($_this->regex)) {
+			if ($_this->_check()) {
+				return $_this->_luhn();
 			}
 		}
 
@@ -235,29 +247,29 @@ class Validation extends Object {
 												'voyager'  => '/^8699[0-9]{11}$/'),
 							'fast'   => '/^(?:4[0-9]{12}(?:[0-9]{3})?|5[1-5][0-9]{14}|6011[0-9]{12}|3(?:0[0-5]|[68][0-9])[0-9]{11}|3[47][0-9]{13})$/');
 
-		if (is_array($this->type)) {
-			foreach ($this->type as $key => $value) {
+		if (is_array($_this->type)) {
+			foreach ($_this->type as $key => $value) {
 				$card = strtolower($value);
-				$this->regex = $cards['all'][$card];
+				$_this->regex = $cards['all'][$card];
 
-				if ($this->_check()) {
-					return $this->_luhn();
+				if ($_this->_check()) {
+					return $_this->_luhn();
 				}
 			}
 		} else {
-			if ($this->type == 'all') {
+			if ($_this->type == 'all') {
 				foreach ($cards['all'] as $key => $value) {
-					$this->regex = $value;
+					$_this->regex = $value;
 
-					if ($this->_check()) {
-						return $this->_luhn();
+					if ($_this->_check()) {
+						return $_this->_luhn();
 					}
 				}
 			} else {
-				$this->regex = $cards['fast'];
+				$_this->regex = $cards['fast'];
 
-				if ($this->_check()) {
-					return $this->_luhn();
+				if ($_this->_check()) {
+					return $_this->_luhn();
 				}
 			}
 		}
@@ -319,7 +331,8 @@ class Validation extends Object {
 				}
 			break;
 			default:
-				$this->errors[] = __('You must define the $operator parameter for Validation::comparison()', true);
+				$_this =& Validation::getInstance();
+				$_this->errors[] = __('You must define the $operator parameter for Validation::comparison()', true);
 				$return = false;
 			break;
 		}
@@ -335,17 +348,18 @@ class Validation extends Object {
  * @access public
  */
 	function custom($check, $regex = null) {
-		$this->__reset();
-		$this->check = $check;
-		$this->regex = $regex;
+		$_this =& Validation::getInstance();
+		$_this->__reset();
+		$_this->check = $check;
+		$_this->regex = $regex;
 		if (is_array($check)) {
-			$this->_extract($check);
+			$_this->_extract($check);
 		}
-		if ($this->regex === null) {
-			$this->errors[] = __('You must define a regular expression for Validation::custom()', true);
+		if ($_this->regex === null) {
+			$_this->errors[] = __('You must define a regular expression for Validation::custom()', true);
 			return false;
 		}
-		return $this->_check();
+		return $_this->_check();
 	}
 /**
  * Date validation, determines if the string passed is a valid date.
@@ -365,12 +379,13 @@ class Validation extends Object {
  * @access public
  */
 	function date($check, $format = 'ymd', $regex = null) {
-		$this->__reset();
-		$this->check = $check;
-		$this->regex = $regex;
+		$_this =& Validation::getInstance();
+		$_this->__reset();
+		$_this->check = $check;
+		$_this->regex = $regex;
 
-		if (!is_null($this->regex)) {
-			return $this->_check();
+		if (!is_null($_this->regex)) {
+			return $_this->_check();
 		}
 
 		$search = array();
@@ -391,9 +406,9 @@ class Validation extends Object {
 		$regex['my'] = '%^(((0[123456789]|10|11|12)([- /.])(([1][9][0-9][0-9])|([2][0-9][0-9][0-9]))))$%';
 
 		foreach ($search as $key) {
-			$this->regex = $regex[$key];
+			$_this->regex = $regex[$key];
 
-			if ($this->_check() === true) {
+			if ($_this->_check() === true) {
 				return true;
 			}
 		}
@@ -410,21 +425,22 @@ class Validation extends Object {
  * @access public
  */
 	function decimal($check, $places = null, $regex = null) {
-		$this->__reset();
-		$this->regex = $regex;
-		$this->check = $check;
+		$_this =& Validation::getInstance();
+		$_this->__reset();
+		$_this->regex = $regex;
+		$_this->check = $check;
 
-		if (!is_null($this->regex)) {
-			return $this->_check();
+		if (!is_null($_this->regex)) {
+			return $_this->_check();
 		}
 
 		if (is_null($places)) {
-			$this->regex = '/^[-+]?[0-9]*\\.{1}[0-9]+(?:[eE][-+]?[0-9]+)?$/';
-			return $this->_check();
+			$_this->regex = '/^[-+]?[0-9]*\\.{1}[0-9]+(?:[eE][-+]?[0-9]+)?$/';
+			return $_this->_check();
 		}
 
-		$this->regex = '/^[-+]?[0-9]*\\.{1}[0-9]{'.$places.'}$/';
-		return $this->_check();
+		$_this->regex = '/^[-+]?[0-9]*\\.{1}[0-9]{'.$places.'}$/';
+		return $_this->_check();
 	}
 /**
  * Validates for an email address.
@@ -436,25 +452,26 @@ class Validation extends Object {
  * @access public
  */
 	function email($check, $deep = false, $regex= null) {
-		$this->__reset();
-		$this->check = $check;
-		$this->regex = $regex;
-		$this->deep = $deep;
+		$_this =& Validation::getInstance();
+		$_this->__reset();
+		$_this->check = $check;
+		$_this->regex = $regex;
+		$_this->deep = $deep;
 
 		if (is_array($check)) {
-			$this->_extract($check);
+			$_this->_extract($check);
 		}
 
-		if (is_null($this->regex)) {
-			$this->regex = '/\\A(?:^([a-z0-9][a-z0-9_\\-\\.\\+]*)@([a-z0-9][a-z0-9\\.\\-]{0,63}\\.(com|org|net|biz|info|name|net|pro|aero|coop|museum|[a-z]{2,4}))$)\\z/i';
+		if (is_null($_this->regex)) {
+			$_this->regex = '/\\A(?:^([a-z0-9][a-z0-9_\\-\\.\\+]*)@([a-z0-9][a-z0-9\\.\\-]{0,63}\\.(com|org|net|biz|info|name|net|pro|aero|coop|museum|[a-z]{2,4}))$)\\z/i';
 		}
-		$return = $this->_check();
+		$return = $_this->_check();
 
-		if ($this->deep === false || $this->deep === null) {
+		if ($_this->deep === false || $_this->deep === null) {
 			return $return;
 		}
 
-		if ($return === true && preg_match('/@([a-z0-9][a-z0-9\\.\\-]{0,63}\\.([a-z]*))/', $this->check, $regs)) {
+		if ($return === true && preg_match('/@([a-z0-9][a-z0-9\\.\\-]{0,63}\\.([a-z]*))/', $_this->check, $regs)) {
 			$host = gethostbynamel($regs[1]);
 			if (is_array($host)) {
 				return true;
@@ -536,16 +553,17 @@ class Validation extends Object {
  * @access public
  */
     function money($check, $symbolPosition = 'left') {
-    	$this->check = $check;
+    	$_this =& Validation::getInstance();
+    	$_this->check = $check;
     	switch ($symbolPosition) {
     		case 'left':
-    			$this->regex = '/^(?!\\u00a2)\\p{Sc}?(?!0,?\\d)(?:\\d{1,3}(?:([, .])\\d{3})?(?:\\1\\d{3})*|(?:\\d+))((?!\\1)[,.]\\d{2})?$/';
+    			$_this->regex = '/^(?!\\u00a2)\\p{Sc}?(?!0,?\\d)(?:\\d{1,3}(?:([, .])\\d{3})?(?:\\1\\d{3})*|(?:\\d+))((?!\\1)[,.]\\d{2})?$/';
     		break;
     		case 'right':
-    			$this->regex = '/^(?!0,?\\d)(?:\\d{1,3}(?:([, .])\\d{3})?(?:\\1\\d{3})*|(?:\\d+))((?!\\1)[,.]\\d{2})?(?<!\\u00a2)\\p{Sc}?$/';
+    			$_this->regex = '/^(?!0,?\\d)(?:\\d{1,3}(?:([, .])\\d{3})?(?:\\1\\d{3})*|(?:\\d+))((?!\\1)[,.]\\d{2})?(?<!\\u00a2)\\p{Sc}?$/';
     		break;
     	}
-    	return $this->_check();
+    	return $_this->_check();
     }
 /**
  * Validate a multiple select.
@@ -598,22 +616,23 @@ class Validation extends Object {
  * @access public
  */
 	function phone($check, $regex= null, $country = 'all') {
+		$_this =& Validation::getInstance();
 		if (is_array($check)) {
-			$this->_extract($check);
+			$_this->_extract($check);
 		} else {
-			$this->check = $check;
-			$this->regex = $regex;
-			$this->country = $country;
+			$_this->check = $check;
+			$_this->regex = $regex;
+			$_this->country = $country;
 		}
 
-		if (is_null($this->regex)) {
-			switch ($this->country) {
+		if (is_null($_this->regex)) {
+			switch ($_this->country) {
 				case 'us':
-					$this->regex  = '/^1?[-. ]?\\(?([0-9]{3})\\)?[-. ]?([0-9]{3})[-. ]?([0-9]{4})$/';
+					$_this->regex  = '/^1?[-. ]?\\(?([0-9]{3})\\)?[-. ]?([0-9]{3})[-. ]?([0-9]{4})$/';
 					break;
 			}
 		}
-		return $this->_check();
+		return $_this->_check();
 	}
 /**
  * Checks that a given value is a valid postal code.
@@ -625,28 +644,29 @@ class Validation extends Object {
  * @access public
  */
 	function postal($check, $regex= null, $country = null) {
+		$_this =& Validation::getInstance();
 		if (is_array($check)) {
-			$this->_extract($check);
+			$_this->_extract($check);
 		} else {
-			$this->check = $check;
-			$this->regex = $regex;
-			$this->country = $country;
+			$_this->check = $check;
+			$_this->regex = $regex;
+			$_this->country = $country;
 		}
 
-		if (is_null($this->regex)) {
-			switch ($this->country) {
+		if (is_null($_this->regex)) {
+			switch ($_this->country) {
 				case 'us':
-					$this->regex  = '/\\A\\b[0-9]{5}(?:-[0-9]{4})?\\b\\z/i';
+					$_this->regex  = '/\\A\\b[0-9]{5}(?:-[0-9]{4})?\\b\\z/i';
 				break;
 				case 'uk':
-					$this->regex  = '/\\A\\b[A-Z]{1,2}[0-9][A-Z0-9]? [0-9][ABD-HJLNP-UW-Z]{2}\\b\\z/i';
+					$_this->regex  = '/\\A\\b[A-Z]{1,2}[0-9][A-Z0-9]? [0-9][ABD-HJLNP-UW-Z]{2}\\b\\z/i';
 				break;
 				case 'ca':
-					$this->regex  = '/\\A\\b[ABCEGHJKLMNPRSTVXY][0-9][A-Z] [0-9][A-Z][0-9]\\b\\z/i';
+					$_this->regex  = '/\\A\\b[ABCEGHJKLMNPRSTVXY][0-9][A-Z] [0-9][A-Z][0-9]\\b\\z/i';
 					break;
 			}
 		}
-		return $this->_check();
+		return $_this->_check();
 	}
 /**
  * Checks that a value is a valid Social Security Number.
@@ -658,28 +678,29 @@ class Validation extends Object {
  * @access public
  */
 	function ssn($check, $regex = null, $country = null) {
+		$_this =& Validation::getInstance();
 		if (is_array($check)) {
-			$this->_extract($check);
+			$_this->_extract($check);
 		} else {
-			$this->check = $check;
-			$this->regex = $regex;
-			$this->country = $country;
+			$_this->check = $check;
+			$_this->regex = $regex;
+			$_this->country = $country;
 		}
 
-		if (is_null($this->regex)) {
-			switch ($this->country) {
+		if (is_null($_this->regex)) {
+			switch ($_this->country) {
 				case 'us':
-					$this->regex  = '/\\A\\b[0-9]{3}-[0-9]{2}-[0-9]{4}\\b\\z/i';
+					$_this->regex  = '/\\A\\b[0-9]{3}-[0-9]{2}-[0-9]{4}\\b\\z/i';
 				break;
 				case 'dk':
-					$this->regex  = '/\\A\\b[0-9]{6}-[0-9]{4}\\b\\z/i';
+					$_this->regex  = '/\\A\\b[0-9]{6}-[0-9]{4}\\b\\z/i';
 				break;
 				case 'nl':
-					$this->regex  = '/\\A\\b[0-9]{9}\\b\\z/i';
+					$_this->regex  = '/\\A\\b[0-9]{9}\\b\\z/i';
 				break;
 			}
 		}
-		return $this->_check();
+		return $_this->_check();
 	}
 /**
  * Checks that a value is a valid URL.
@@ -689,11 +710,12 @@ class Validation extends Object {
  * @access public
  */
 	function url($check) {
-		$this->check = $check;
-		$this->regex = '/^(?:(?:https?|ftps?|file|news|gopher):\\/\\/)?(?:(?:(?:25[0-5]|2[0-4]\d|(?:(?:1\d)?|[1-9]?)\d)\.){3}(?:25[0-5]|2[0-4]\d|(?:(?:1\d)?|[1-9]?)\d)'
+		$_this =& Validation::getInstance();
+		$_this->check = $check;
+		$_this->regex = '/^(?:(?:https?|ftps?|file|news|gopher):\\/\\/)?(?:(?:(?:25[0-5]|2[0-4]\d|(?:(?:1\d)?|[1-9]?)\d)\.){3}(?:25[0-5]|2[0-4]\d|(?:(?:1\d)?|[1-9]?)\d)'
 							. '|(?:[0-9a-z]{1}[0-9a-z\\-]*\\.)*(?:[0-9a-z]{1}[0-9a-z\\-]{0,56})\\.(?:[a-z]{2,6}|[a-z]{2}\\.[a-z]{2,6})'
 							. '(?::[0-9]{1,4})?)(?:\\/?|\\/[\\w\\-\\.,\'@?^=%&:;\/~\\+#]*[\\w\\-\\@?^=%&\/~\\+#])$/i';
-        return $this->_check();
+        return $_this->_check();
 	}
 /**
  * Runs an user-defined validation.
@@ -706,7 +728,7 @@ class Validation extends Object {
  * @access public
  */
 	function userDefined($check, $object, $method, $args = null) {
-		return call_user_func_array(array(&$object, $method), array($check,$args));
+		return call_user_func_array(array(&$object, $method), array($check, $args));
 	}
 /**
  * Runs a regular expression match.
@@ -715,11 +737,12 @@ class Validation extends Object {
  * @access protected
  */
 	function _check() {
-		if (preg_match($this->regex, $this->check)) {
-			$this->error[] = false;
+		$_this =& Validation::getInstance();
+		if (preg_match($_this->regex, $_this->check)) {
+			$_this->error[] = false;
 			return true;
 		} else {
-			$this->error[] = true;
+			$_this->error[] = true;
 			return false;
 		}
 	}
@@ -731,22 +754,23 @@ class Validation extends Object {
  * @access protected
  */
 	function _extract($params) {
+		$_this =& Validation::getInstance();
 		extract($params, EXTR_OVERWRITE);
 
 		if (isset($check)) {
-			$this->check = $check;
+			$_this->check = $check;
 		}
 		if (isset($regex)) {
-			$this->regex = $regex;
+			$_this->regex = $regex;
 		}
 		if (isset($country)) {
-			$this->country = strtolower($country);
+			$_this->country = strtolower($country);
 		}
 		if (isset($deep)) {
-			$this->deep = $deep;
+			$_this->deep = $deep;
 		}
 		if (isset($type)) {
-			$this->type = $type;
+			$_this->type = $type;
 		}
 	}
 /**
@@ -757,19 +781,20 @@ class Validation extends Object {
  * @access protected
  */
 	function _luhn() {
-		if ($this->deep === true) {
-			if ($this->check == 0) {
+		$_this =& Validation::getInstance();
+		if ($_this->deep === true) {
+			if ($_this->check == 0) {
 				return false;
 			}
 			$sum = 0;
-			$length = strlen($this->check);
+			$length = strlen($_this->check);
 
 			for ($position = 1 - ($length % 2); $position < $length; $position += 2) {
-				$sum += substr($this->check, $position, 1);
+				$sum += substr($_this->check, $position, 1);
 			}
 
 			for ($position = ($length % 2); $position < $length; $position += 2) {
-				$number = substr($this->check, $position, 1) * 2;
+				$number = substr($_this->check, $position, 1) * 2;
 				if ($number < 10) {
 					$sum += $number;
 				} else {
@@ -789,11 +814,12 @@ class Validation extends Object {
  * @access private
  */
 	function __reset() {
-		$this->check = null;
-		$this->regex = null;
-		$this->country = null;
-		$this->deep = null;
-		$this->type = null;
+		$_this =& Validation::getInstance();
+		$_this->check = null;
+		$_this->regex = null;
+		$_this->country = null;
+		$_this->deep = null;
+		$_this->type = null;
 	}
 }
 ?>
\ No newline at end of file
diff --git a/cake/tests/cases/libs/validation.test.php b/cake/tests/cases/libs/validation.test.php
index 318af24fe..0f02bf791 100644
--- a/cake/tests/cases/libs/validation.test.php
+++ b/cake/tests/cases/libs/validation.test.php
@@ -38,500 +38,500 @@ class ValidationTestCase extends UnitTestCase {
 	var $Validation = null;
 
 	function setup() {
-		$this->Validation = new Validation();
+		$this->Validation =& Validation::getInstance();
 	}
 
 	function testAlphaNumeric() {
-		$this->assertTrue($this->Validation->alphaNumeric('frferrf'));
-		$this->assertTrue($this->Validation->alphaNumeric('12234'));
-		$this->assertTrue($this->Validation->alphaNumeric('1w2e2r3t4y'));
-		$this->assertTrue($this->Validation->alphaNumeric('0'));
-		$this->assertFalse($this->Validation->alphaNumeric('12 234'));
-		$this->assertFalse($this->Validation->alphaNumeric('dfd 234'));
-		$this->assertFalse($this->Validation->alphaNumeric("\n"));
-		$this->assertFalse($this->Validation->alphaNumeric("\t"));
-		$this->assertFalse($this->Validation->alphaNumeric("\r"));
-		$this->assertFalse($this->Validation->alphaNumeric(' '));
-		$this->assertFalse($this->Validation->alphaNumeric(''));
+		$this->assertTrue(Validation::alphaNumeric('frferrf'));
+		$this->assertTrue(Validation::alphaNumeric('12234'));
+		$this->assertTrue(Validation::alphaNumeric('1w2e2r3t4y'));
+		$this->assertTrue(Validation::alphaNumeric('0'));
+		$this->assertFalse(Validation::alphaNumeric('12 234'));
+		$this->assertFalse(Validation::alphaNumeric('dfd 234'));
+		$this->assertFalse(Validation::alphaNumeric("\n"));
+		$this->assertFalse(Validation::alphaNumeric("\t"));
+		$this->assertFalse(Validation::alphaNumeric("\r"));
+		$this->assertFalse(Validation::alphaNumeric(' '));
+		$this->assertFalse(Validation::alphaNumeric(''));
 	}
 
 	function testAlphaNumericPassedAsArray() {
-		$this->assertTrue($this->Validation->alphaNumeric(array('check' => 'frferrf')));
-		$this->assertTrue($this->Validation->alphaNumeric(array('check' => '12234')));
-		$this->assertTrue($this->Validation->alphaNumeric(array('check' => '1w2e2r3t4y')));
-		$this->assertTrue($this->Validation->alphaNumeric(array('check' => '0')));
-		$this->assertFalse($this->Validation->alphaNumeric(array('check' => '12 234')));
-		$this->assertFalse($this->Validation->alphaNumeric(array('check' => 'dfd 234')));
-		$this->assertFalse($this->Validation->alphaNumeric(array('check' => "\n")));
-		$this->assertFalse($this->Validation->alphaNumeric(array('check' => "\t")));
-		$this->assertFalse($this->Validation->alphaNumeric(array('check' => "\r")));
-		$this->assertFalse($this->Validation->alphaNumeric(array('check' =>  ' ')));
-		$this->assertFalse($this->Validation->alphaNumeric(array('check' =>  '')));
+		$this->assertTrue(Validation::alphaNumeric(array('check' => 'frferrf')));
+		$this->assertTrue(Validation::alphaNumeric(array('check' => '12234')));
+		$this->assertTrue(Validation::alphaNumeric(array('check' => '1w2e2r3t4y')));
+		$this->assertTrue(Validation::alphaNumeric(array('check' => '0')));
+		$this->assertFalse(Validation::alphaNumeric(array('check' => '12 234')));
+		$this->assertFalse(Validation::alphaNumeric(array('check' => 'dfd 234')));
+		$this->assertFalse(Validation::alphaNumeric(array('check' => "\n")));
+		$this->assertFalse(Validation::alphaNumeric(array('check' => "\t")));
+		$this->assertFalse(Validation::alphaNumeric(array('check' => "\r")));
+		$this->assertFalse(Validation::alphaNumeric(array('check' =>  ' ')));
+		$this->assertFalse(Validation::alphaNumeric(array('check' =>  '')));
 	}
 
 	function testBetween() {
-		$this->assertTrue($this->Validation->between('abcdefg', 1, 7));
-		$this->assertTrue($this->Validation->between('', 0, 7));
-		$this->assertFalse($this->Validation->between('abcdefg', 1, 6));
+		$this->assertTrue(Validation::between('abcdefg', 1, 7));
+		$this->assertTrue(Validation::between('', 0, 7));
+		$this->assertFalse(Validation::between('abcdefg', 1, 6));
 	}
 
 	function testBlank() {
-		$this->assertTrue($this->Validation->blank(''));
-		$this->assertTrue($this->Validation->blank(' '));
-		$this->assertTrue($this->Validation->blank("\n"));
-		$this->assertTrue($this->Validation->blank("\t"));
-		$this->assertTrue($this->Validation->blank("\r"));
-		$this->assertFalse($this->Validation->blank('    Blank'));
-		$this->assertFalse($this->Validation->blank('Blank'));
+		$this->assertTrue(Validation::blank(''));
+		$this->assertTrue(Validation::blank(' '));
+		$this->assertTrue(Validation::blank("\n"));
+		$this->assertTrue(Validation::blank("\t"));
+		$this->assertTrue(Validation::blank("\r"));
+		$this->assertFalse(Validation::blank('    Blank'));
+		$this->assertFalse(Validation::blank('Blank'));
 	}
 
 	function testBlankAsArray() {
-		$this->assertTrue($this->Validation->blank(array('check' => '')));
-		$this->assertTrue($this->Validation->blank(array('check' => ' ')));
-		$this->assertTrue($this->Validation->blank(array('check' => "\n")));
-		$this->assertTrue($this->Validation->blank(array('check' => "\t")));
-		$this->assertTrue($this->Validation->blank(array('check' => "\r")));
-		$this->assertFalse($this->Validation->blank(array('check' => '    Blank')));
-		$this->assertFalse($this->Validation->blank(array('check' => 'Blank')));
+		$this->assertTrue(Validation::blank(array('check' => '')));
+		$this->assertTrue(Validation::blank(array('check' => ' ')));
+		$this->assertTrue(Validation::blank(array('check' => "\n")));
+		$this->assertTrue(Validation::blank(array('check' => "\t")));
+		$this->assertTrue(Validation::blank(array('check' => "\r")));
+		$this->assertFalse(Validation::blank(array('check' => '    Blank')));
+		$this->assertFalse(Validation::blank(array('check' => 'Blank')));
 	}
 
 	function testcc() {
 		//American Express
-		$this->assertTrue($this->Validation->cc('370482756063980', array('amex')));
-		$this->assertTrue($this->Validation->cc('349106433773483', array('amex')));
-		$this->assertTrue($this->Validation->cc('344671486204764', array('amex')));
-		$this->assertTrue($this->Validation->cc('344042544509943', array('amex')));
-		$this->assertTrue($this->Validation->cc('377147515754475', array('amex')));
-		$this->assertTrue($this->Validation->cc('375239372816422', array('amex')));
-		$this->assertTrue($this->Validation->cc('376294341957707', array('amex')));
-		$this->assertTrue($this->Validation->cc('341779292230411', array('amex')));
-		$this->assertTrue($this->Validation->cc('341646919853372', array('amex')));
-		$this->assertTrue($this->Validation->cc('348498616319346', array('amex')));
+		$this->assertTrue(Validation::cc('370482756063980', array('amex')));
+		$this->assertTrue(Validation::cc('349106433773483', array('amex')));
+		$this->assertTrue(Validation::cc('344671486204764', array('amex')));
+		$this->assertTrue(Validation::cc('344042544509943', array('amex')));
+		$this->assertTrue(Validation::cc('377147515754475', array('amex')));
+		$this->assertTrue(Validation::cc('375239372816422', array('amex')));
+		$this->assertTrue(Validation::cc('376294341957707', array('amex')));
+		$this->assertTrue(Validation::cc('341779292230411', array('amex')));
+		$this->assertTrue(Validation::cc('341646919853372', array('amex')));
+		$this->assertTrue(Validation::cc('348498616319346', array('amex')));
 		//BankCard
-		$this->assertTrue($this->Validation->cc('5610745867413420', array('bankcard')));
-		$this->assertTrue($this->Validation->cc('5610376649499352', array('bankcard')));
-		$this->assertTrue($this->Validation->cc('5610091936000694', array('bankcard')));
-		$this->assertTrue($this->Validation->cc('5602248780118788', array('bankcard')));
-		$this->assertTrue($this->Validation->cc('5610631567676765', array('bankcard')));
-		$this->assertTrue($this->Validation->cc('5602238211270795', array('bankcard')));
-		$this->assertTrue($this->Validation->cc('5610173951215470', array('bankcard')));
-		$this->assertTrue($this->Validation->cc('5610139705753702', array('bankcard')));
-		$this->assertTrue($this->Validation->cc('5602226032150551', array('bankcard')));
-		$this->assertTrue($this->Validation->cc('5602223993735777', array('bankcard')));
+		$this->assertTrue(Validation::cc('5610745867413420', array('bankcard')));
+		$this->assertTrue(Validation::cc('5610376649499352', array('bankcard')));
+		$this->assertTrue(Validation::cc('5610091936000694', array('bankcard')));
+		$this->assertTrue(Validation::cc('5602248780118788', array('bankcard')));
+		$this->assertTrue(Validation::cc('5610631567676765', array('bankcard')));
+		$this->assertTrue(Validation::cc('5602238211270795', array('bankcard')));
+		$this->assertTrue(Validation::cc('5610173951215470', array('bankcard')));
+		$this->assertTrue(Validation::cc('5610139705753702', array('bankcard')));
+		$this->assertTrue(Validation::cc('5602226032150551', array('bankcard')));
+		$this->assertTrue(Validation::cc('5602223993735777', array('bankcard')));
 		//Diners Club 14
-		$this->assertTrue($this->Validation->cc('30155483651028', array('diners')));
-		$this->assertTrue($this->Validation->cc('36371312803821', array('diners')));
-		$this->assertTrue($this->Validation->cc('38801277489875', array('diners')));
-		$this->assertTrue($this->Validation->cc('30348560464296', array('diners')));
-		$this->assertTrue($this->Validation->cc('30349040317708', array('diners')));
-		$this->assertTrue($this->Validation->cc('36567413559978', array('diners')));
-		$this->assertTrue($this->Validation->cc('36051554732702', array('diners')));
-		$this->assertTrue($this->Validation->cc('30391842198191', array('diners')));
-		$this->assertTrue($this->Validation->cc('30172682197745', array('diners')));
-		$this->assertTrue($this->Validation->cc('30162056566641', array('diners')));
-		$this->assertTrue($this->Validation->cc('30085066927745', array('diners')));
-		$this->assertTrue($this->Validation->cc('36519025221976', array('diners')));
-		$this->assertTrue($this->Validation->cc('30372679371044', array('diners')));
-		$this->assertTrue($this->Validation->cc('38913939150124', array('diners')));
-		$this->assertTrue($this->Validation->cc('36852899094637', array('diners')));
-		$this->assertTrue($this->Validation->cc('30138041971120', array('diners')));
-		$this->assertTrue($this->Validation->cc('36184047836838', array('diners')));
-		$this->assertTrue($this->Validation->cc('30057460264462', array('diners')));
-		$this->assertTrue($this->Validation->cc('38980165212050', array('diners')));
-		$this->assertTrue($this->Validation->cc('30356516881240', array('diners')));
-		$this->assertTrue($this->Validation->cc('38744810033182', array('diners')));
-		$this->assertTrue($this->Validation->cc('30173638706621', array('diners')));
-		$this->assertTrue($this->Validation->cc('30158334709185', array('diners')));
-		$this->assertTrue($this->Validation->cc('30195413721186', array('diners')));
-		$this->assertTrue($this->Validation->cc('38863347694793', array('diners')));
-		$this->assertTrue($this->Validation->cc('30275627009113', array('diners')));
-		$this->assertTrue($this->Validation->cc('30242860404971', array('diners')));
-		$this->assertTrue($this->Validation->cc('30081877595151', array('diners')));
-		$this->assertTrue($this->Validation->cc('38053196067461', array('diners')));
-		$this->assertTrue($this->Validation->cc('36520379984870', array('diners')));
+		$this->assertTrue(Validation::cc('30155483651028', array('diners')));
+		$this->assertTrue(Validation::cc('36371312803821', array('diners')));
+		$this->assertTrue(Validation::cc('38801277489875', array('diners')));
+		$this->assertTrue(Validation::cc('30348560464296', array('diners')));
+		$this->assertTrue(Validation::cc('30349040317708', array('diners')));
+		$this->assertTrue(Validation::cc('36567413559978', array('diners')));
+		$this->assertTrue(Validation::cc('36051554732702', array('diners')));
+		$this->assertTrue(Validation::cc('30391842198191', array('diners')));
+		$this->assertTrue(Validation::cc('30172682197745', array('diners')));
+		$this->assertTrue(Validation::cc('30162056566641', array('diners')));
+		$this->assertTrue(Validation::cc('30085066927745', array('diners')));
+		$this->assertTrue(Validation::cc('36519025221976', array('diners')));
+		$this->assertTrue(Validation::cc('30372679371044', array('diners')));
+		$this->assertTrue(Validation::cc('38913939150124', array('diners')));
+		$this->assertTrue(Validation::cc('36852899094637', array('diners')));
+		$this->assertTrue(Validation::cc('30138041971120', array('diners')));
+		$this->assertTrue(Validation::cc('36184047836838', array('diners')));
+		$this->assertTrue(Validation::cc('30057460264462', array('diners')));
+		$this->assertTrue(Validation::cc('38980165212050', array('diners')));
+		$this->assertTrue(Validation::cc('30356516881240', array('diners')));
+		$this->assertTrue(Validation::cc('38744810033182', array('diners')));
+		$this->assertTrue(Validation::cc('30173638706621', array('diners')));
+		$this->assertTrue(Validation::cc('30158334709185', array('diners')));
+		$this->assertTrue(Validation::cc('30195413721186', array('diners')));
+		$this->assertTrue(Validation::cc('38863347694793', array('diners')));
+		$this->assertTrue(Validation::cc('30275627009113', array('diners')));
+		$this->assertTrue(Validation::cc('30242860404971', array('diners')));
+		$this->assertTrue(Validation::cc('30081877595151', array('diners')));
+		$this->assertTrue(Validation::cc('38053196067461', array('diners')));
+		$this->assertTrue(Validation::cc('36520379984870', array('diners')));
 		//2004 MasterCard/Diners Club Alliance International 14
-		$this->assertTrue($this->Validation->cc('36747701998969', array('diners')));
-		$this->assertTrue($this->Validation->cc('36427861123159', array('diners')));
-		$this->assertTrue($this->Validation->cc('36150537602386', array('diners')));
-		$this->assertTrue($this->Validation->cc('36582388820610', array('diners')));
-		$this->assertTrue($this->Validation->cc('36729045250216', array('diners')));
+		$this->assertTrue(Validation::cc('36747701998969', array('diners')));
+		$this->assertTrue(Validation::cc('36427861123159', array('diners')));
+		$this->assertTrue(Validation::cc('36150537602386', array('diners')));
+		$this->assertTrue(Validation::cc('36582388820610', array('diners')));
+		$this->assertTrue(Validation::cc('36729045250216', array('diners')));
 		//2004 MasterCard/Diners Club Alliance US & Canada 16
-		$this->assertTrue($this->Validation->cc('5597511346169950', array('diners')));
-		$this->assertTrue($this->Validation->cc('5526443162217562', array('diners')));
-		$this->assertTrue($this->Validation->cc('5577265786122391', array('diners')));
-		$this->assertTrue($this->Validation->cc('5534061404676989', array('diners')));
-		$this->assertTrue($this->Validation->cc('5545313588374502', array('diners')));
+		$this->assertTrue(Validation::cc('5597511346169950', array('diners')));
+		$this->assertTrue(Validation::cc('5526443162217562', array('diners')));
+		$this->assertTrue(Validation::cc('5577265786122391', array('diners')));
+		$this->assertTrue(Validation::cc('5534061404676989', array('diners')));
+		$this->assertTrue(Validation::cc('5545313588374502', array('diners')));
 		//Discover
-		$this->assertTrue($this->Validation->cc('6011802876467237', array('disc')));
-		$this->assertTrue($this->Validation->cc('6506432777720955', array('disc')));
-		$this->assertTrue($this->Validation->cc('6011126265283942', array('disc')));
-		$this->assertTrue($this->Validation->cc('6502187151579252', array('disc')));
-		$this->assertTrue($this->Validation->cc('6506600836002298', array('disc')));
-		$this->assertTrue($this->Validation->cc('6504376463615189', array('disc')));
-		$this->assertTrue($this->Validation->cc('6011440907005377', array('disc')));
-		$this->assertTrue($this->Validation->cc('6509735979634270', array('disc')));
-		$this->assertTrue($this->Validation->cc('6011422366775856', array('disc')));
-		$this->assertTrue($this->Validation->cc('6500976374623323', array('disc')));
+		$this->assertTrue(Validation::cc('6011802876467237', array('disc')));
+		$this->assertTrue(Validation::cc('6506432777720955', array('disc')));
+		$this->assertTrue(Validation::cc('6011126265283942', array('disc')));
+		$this->assertTrue(Validation::cc('6502187151579252', array('disc')));
+		$this->assertTrue(Validation::cc('6506600836002298', array('disc')));
+		$this->assertTrue(Validation::cc('6504376463615189', array('disc')));
+		$this->assertTrue(Validation::cc('6011440907005377', array('disc')));
+		$this->assertTrue(Validation::cc('6509735979634270', array('disc')));
+		$this->assertTrue(Validation::cc('6011422366775856', array('disc')));
+		$this->assertTrue(Validation::cc('6500976374623323', array('disc')));
 		//enRoute
-		$this->assertTrue($this->Validation->cc('201496944158937', array('enroute')));
-		$this->assertTrue($this->Validation->cc('214945833739665', array('enroute')));
-		$this->assertTrue($this->Validation->cc('214982692491187', array('enroute')));
-		$this->assertTrue($this->Validation->cc('214901395949424', array('enroute')));
-		$this->assertTrue($this->Validation->cc('201480676269187', array('enroute')));
-		$this->assertTrue($this->Validation->cc('214911922887807', array('enroute')));
-		$this->assertTrue($this->Validation->cc('201485025457250', array('enroute')));
-		$this->assertTrue($this->Validation->cc('201402662758866', array('enroute')));
-		$this->assertTrue($this->Validation->cc('214981579370225', array('enroute')));
-		$this->assertTrue($this->Validation->cc('201447595859877', array('enroute')));
+		$this->assertTrue(Validation::cc('201496944158937', array('enroute')));
+		$this->assertTrue(Validation::cc('214945833739665', array('enroute')));
+		$this->assertTrue(Validation::cc('214982692491187', array('enroute')));
+		$this->assertTrue(Validation::cc('214901395949424', array('enroute')));
+		$this->assertTrue(Validation::cc('201480676269187', array('enroute')));
+		$this->assertTrue(Validation::cc('214911922887807', array('enroute')));
+		$this->assertTrue(Validation::cc('201485025457250', array('enroute')));
+		$this->assertTrue(Validation::cc('201402662758866', array('enroute')));
+		$this->assertTrue(Validation::cc('214981579370225', array('enroute')));
+		$this->assertTrue(Validation::cc('201447595859877', array('enroute')));
 		//JCB 15 digit
-		$this->assertTrue($this->Validation->cc('210034762247893', array('jcb')));
-		$this->assertTrue($this->Validation->cc('180078671678892', array('jcb')));
-		$this->assertTrue($this->Validation->cc('180010559353736', array('jcb')));
-		$this->assertTrue($this->Validation->cc('210095474464258', array('jcb')));
-		$this->assertTrue($this->Validation->cc('210006675562188', array('jcb')));
-		$this->assertTrue($this->Validation->cc('210063299662662', array('jcb')));
-		$this->assertTrue($this->Validation->cc('180032506857825', array('jcb')));
-		$this->assertTrue($this->Validation->cc('210057919192738', array('jcb')));
-		$this->assertTrue($this->Validation->cc('180031358949367', array('jcb')));
-		$this->assertTrue($this->Validation->cc('180033802147846', array('jcb')));
+		$this->assertTrue(Validation::cc('210034762247893', array('jcb')));
+		$this->assertTrue(Validation::cc('180078671678892', array('jcb')));
+		$this->assertTrue(Validation::cc('180010559353736', array('jcb')));
+		$this->assertTrue(Validation::cc('210095474464258', array('jcb')));
+		$this->assertTrue(Validation::cc('210006675562188', array('jcb')));
+		$this->assertTrue(Validation::cc('210063299662662', array('jcb')));
+		$this->assertTrue(Validation::cc('180032506857825', array('jcb')));
+		$this->assertTrue(Validation::cc('210057919192738', array('jcb')));
+		$this->assertTrue(Validation::cc('180031358949367', array('jcb')));
+		$this->assertTrue(Validation::cc('180033802147846', array('jcb')));
 		//JCB 16 digit
-		$this->assertTrue($this->Validation->cc('3096806857839939', array('jcb')));
-		$this->assertTrue($this->Validation->cc('3158699503187091', array('jcb')));
-		$this->assertTrue($this->Validation->cc('3112549607186579', array('jcb')));
-		$this->assertTrue($this->Validation->cc('3112332922425604', array('jcb')));
-		$this->assertTrue($this->Validation->cc('3112001541159239', array('jcb')));
-		$this->assertTrue($this->Validation->cc('3112162495317841', array('jcb')));
-		$this->assertTrue($this->Validation->cc('3337562627732768', array('jcb')));
-		$this->assertTrue($this->Validation->cc('3337107161330775', array('jcb')));
-		$this->assertTrue($this->Validation->cc('3528053736003621', array('jcb')));
-		$this->assertTrue($this->Validation->cc('3528915255020360', array('jcb')));
-		$this->assertTrue($this->Validation->cc('3096786059660921', array('jcb')));
-		$this->assertTrue($this->Validation->cc('3528264799292320', array('jcb')));
-		$this->assertTrue($this->Validation->cc('3096469164130136', array('jcb')));
-		$this->assertTrue($this->Validation->cc('3112127443822853', array('jcb')));
-		$this->assertTrue($this->Validation->cc('3096849995802328', array('jcb')));
-		$this->assertTrue($this->Validation->cc('3528090735127407', array('jcb')));
-		$this->assertTrue($this->Validation->cc('3112101006819234', array('jcb')));
-		$this->assertTrue($this->Validation->cc('3337444428040784', array('jcb')));
-		$this->assertTrue($this->Validation->cc('3088043154151061', array('jcb')));
-		$this->assertTrue($this->Validation->cc('3088295969414866', array('jcb')));
-		$this->assertTrue($this->Validation->cc('3158748843158575', array('jcb')));
-		$this->assertTrue($this->Validation->cc('3158709206148538', array('jcb')));
-		$this->assertTrue($this->Validation->cc('3158365159575324', array('jcb')));
-		$this->assertTrue($this->Validation->cc('3158671691305165', array('jcb')));
-		$this->assertTrue($this->Validation->cc('3528523028771093', array('jcb')));
-		$this->assertTrue($this->Validation->cc('3096057126267870', array('jcb')));
-		$this->assertTrue($this->Validation->cc('3158514047166834', array('jcb')));
-		$this->assertTrue($this->Validation->cc('3528274546125962', array('jcb')));
-		$this->assertTrue($this->Validation->cc('3528890967705733', array('jcb')));
-		$this->assertTrue($this->Validation->cc('3337198811307545', array('jcb')));
+		$this->assertTrue(Validation::cc('3096806857839939', array('jcb')));
+		$this->assertTrue(Validation::cc('3158699503187091', array('jcb')));
+		$this->assertTrue(Validation::cc('3112549607186579', array('jcb')));
+		$this->assertTrue(Validation::cc('3112332922425604', array('jcb')));
+		$this->assertTrue(Validation::cc('3112001541159239', array('jcb')));
+		$this->assertTrue(Validation::cc('3112162495317841', array('jcb')));
+		$this->assertTrue(Validation::cc('3337562627732768', array('jcb')));
+		$this->assertTrue(Validation::cc('3337107161330775', array('jcb')));
+		$this->assertTrue(Validation::cc('3528053736003621', array('jcb')));
+		$this->assertTrue(Validation::cc('3528915255020360', array('jcb')));
+		$this->assertTrue(Validation::cc('3096786059660921', array('jcb')));
+		$this->assertTrue(Validation::cc('3528264799292320', array('jcb')));
+		$this->assertTrue(Validation::cc('3096469164130136', array('jcb')));
+		$this->assertTrue(Validation::cc('3112127443822853', array('jcb')));
+		$this->assertTrue(Validation::cc('3096849995802328', array('jcb')));
+		$this->assertTrue(Validation::cc('3528090735127407', array('jcb')));
+		$this->assertTrue(Validation::cc('3112101006819234', array('jcb')));
+		$this->assertTrue(Validation::cc('3337444428040784', array('jcb')));
+		$this->assertTrue(Validation::cc('3088043154151061', array('jcb')));
+		$this->assertTrue(Validation::cc('3088295969414866', array('jcb')));
+		$this->assertTrue(Validation::cc('3158748843158575', array('jcb')));
+		$this->assertTrue(Validation::cc('3158709206148538', array('jcb')));
+		$this->assertTrue(Validation::cc('3158365159575324', array('jcb')));
+		$this->assertTrue(Validation::cc('3158671691305165', array('jcb')));
+		$this->assertTrue(Validation::cc('3528523028771093', array('jcb')));
+		$this->assertTrue(Validation::cc('3096057126267870', array('jcb')));
+		$this->assertTrue(Validation::cc('3158514047166834', array('jcb')));
+		$this->assertTrue(Validation::cc('3528274546125962', array('jcb')));
+		$this->assertTrue(Validation::cc('3528890967705733', array('jcb')));
+		$this->assertTrue(Validation::cc('3337198811307545', array('jcb')));
 		//Maestro (debit card)
-		$this->assertTrue($this->Validation->cc('5020147409985219', array('maestro')));
-		$this->assertTrue($this->Validation->cc('5020931809905616', array('maestro')));
-		$this->assertTrue($this->Validation->cc('5020412965470224', array('maestro')));
-		$this->assertTrue($this->Validation->cc('5020129740944022', array('maestro')));
-		$this->assertTrue($this->Validation->cc('5020024696747943', array('maestro')));
-		$this->assertTrue($this->Validation->cc('5020581514636509', array('maestro')));
-		$this->assertTrue($this->Validation->cc('5020695008411987', array('maestro')));
-		$this->assertTrue($this->Validation->cc('5020565359718977', array('maestro')));
-		$this->assertTrue($this->Validation->cc('6339931536544062', array('maestro')));
-		$this->assertTrue($this->Validation->cc('6465028615704406', array('maestro')));
+		$this->assertTrue(Validation::cc('5020147409985219', array('maestro')));
+		$this->assertTrue(Validation::cc('5020931809905616', array('maestro')));
+		$this->assertTrue(Validation::cc('5020412965470224', array('maestro')));
+		$this->assertTrue(Validation::cc('5020129740944022', array('maestro')));
+		$this->assertTrue(Validation::cc('5020024696747943', array('maestro')));
+		$this->assertTrue(Validation::cc('5020581514636509', array('maestro')));
+		$this->assertTrue(Validation::cc('5020695008411987', array('maestro')));
+		$this->assertTrue(Validation::cc('5020565359718977', array('maestro')));
+		$this->assertTrue(Validation::cc('6339931536544062', array('maestro')));
+		$this->assertTrue(Validation::cc('6465028615704406', array('maestro')));
 		//Mastercard
-		$this->assertTrue($this->Validation->cc('5580424361774366', array('mc')));
-		$this->assertTrue($this->Validation->cc('5589563059318282', array('mc')));
-		$this->assertTrue($this->Validation->cc('5387558333690047', array('mc')));
-		$this->assertTrue($this->Validation->cc('5163919215247175', array('mc')));
-		$this->assertTrue($this->Validation->cc('5386742685055055', array('mc')));
-		$this->assertTrue($this->Validation->cc('5102303335960674', array('mc')));
-		$this->assertTrue($this->Validation->cc('5526543403964565', array('mc')));
-		$this->assertTrue($this->Validation->cc('5538725892618432', array('mc')));
-		$this->assertTrue($this->Validation->cc('5119543573129778', array('mc')));
-		$this->assertTrue($this->Validation->cc('5391174753915767', array('mc')));
-		$this->assertTrue($this->Validation->cc('5510994113980714', array('mc')));
-		$this->assertTrue($this->Validation->cc('5183720260418091', array('mc')));
-		$this->assertTrue($this->Validation->cc('5488082196086704', array('mc')));
-		$this->assertTrue($this->Validation->cc('5484645164161834', array('mc')));
-		$this->assertTrue($this->Validation->cc('5171254350337031', array('mc')));
-		$this->assertTrue($this->Validation->cc('5526987528136452', array('mc')));
-		$this->assertTrue($this->Validation->cc('5504148941409358', array('mc')));
-		$this->assertTrue($this->Validation->cc('5240793507243615', array('mc')));
-		$this->assertTrue($this->Validation->cc('5162114693017107', array('mc')));
-		$this->assertTrue($this->Validation->cc('5163104807404753', array('mc')));
-		$this->assertTrue($this->Validation->cc('5590136167248365', array('mc')));
-		$this->assertTrue($this->Validation->cc('5565816281038948', array('mc')));
-		$this->assertTrue($this->Validation->cc('5467639122779531', array('mc')));
-		$this->assertTrue($this->Validation->cc('5297350261550024', array('mc')));
-		$this->assertTrue($this->Validation->cc('5162739131368058', array('mc')));
+		$this->assertTrue(Validation::cc('5580424361774366', array('mc')));
+		$this->assertTrue(Validation::cc('5589563059318282', array('mc')));
+		$this->assertTrue(Validation::cc('5387558333690047', array('mc')));
+		$this->assertTrue(Validation::cc('5163919215247175', array('mc')));
+		$this->assertTrue(Validation::cc('5386742685055055', array('mc')));
+		$this->assertTrue(Validation::cc('5102303335960674', array('mc')));
+		$this->assertTrue(Validation::cc('5526543403964565', array('mc')));
+		$this->assertTrue(Validation::cc('5538725892618432', array('mc')));
+		$this->assertTrue(Validation::cc('5119543573129778', array('mc')));
+		$this->assertTrue(Validation::cc('5391174753915767', array('mc')));
+		$this->assertTrue(Validation::cc('5510994113980714', array('mc')));
+		$this->assertTrue(Validation::cc('5183720260418091', array('mc')));
+		$this->assertTrue(Validation::cc('5488082196086704', array('mc')));
+		$this->assertTrue(Validation::cc('5484645164161834', array('mc')));
+		$this->assertTrue(Validation::cc('5171254350337031', array('mc')));
+		$this->assertTrue(Validation::cc('5526987528136452', array('mc')));
+		$this->assertTrue(Validation::cc('5504148941409358', array('mc')));
+		$this->assertTrue(Validation::cc('5240793507243615', array('mc')));
+		$this->assertTrue(Validation::cc('5162114693017107', array('mc')));
+		$this->assertTrue(Validation::cc('5163104807404753', array('mc')));
+		$this->assertTrue(Validation::cc('5590136167248365', array('mc')));
+		$this->assertTrue(Validation::cc('5565816281038948', array('mc')));
+		$this->assertTrue(Validation::cc('5467639122779531', array('mc')));
+		$this->assertTrue(Validation::cc('5297350261550024', array('mc')));
+		$this->assertTrue(Validation::cc('5162739131368058', array('mc')));
 		//Solo 16
-		$this->assertTrue($this->Validation->cc('6767432107064987', array('solo')));
-		$this->assertTrue($this->Validation->cc('6334667758225411', array('solo')));
-		$this->assertTrue($this->Validation->cc('6767037421954068', array('solo')));
-		$this->assertTrue($this->Validation->cc('6767823306394854', array('solo')));
-		$this->assertTrue($this->Validation->cc('6334768185398134', array('solo')));
-		$this->assertTrue($this->Validation->cc('6767286729498589', array('solo')));
-		$this->assertTrue($this->Validation->cc('6334972104431261', array('solo')));
-		$this->assertTrue($this->Validation->cc('6334843427400616', array('solo')));
-		$this->assertTrue($this->Validation->cc('6767493947881311', array('solo')));
-		$this->assertTrue($this->Validation->cc('6767194235798817', array('solo')));
+		$this->assertTrue(Validation::cc('6767432107064987', array('solo')));
+		$this->assertTrue(Validation::cc('6334667758225411', array('solo')));
+		$this->assertTrue(Validation::cc('6767037421954068', array('solo')));
+		$this->assertTrue(Validation::cc('6767823306394854', array('solo')));
+		$this->assertTrue(Validation::cc('6334768185398134', array('solo')));
+		$this->assertTrue(Validation::cc('6767286729498589', array('solo')));
+		$this->assertTrue(Validation::cc('6334972104431261', array('solo')));
+		$this->assertTrue(Validation::cc('6334843427400616', array('solo')));
+		$this->assertTrue(Validation::cc('6767493947881311', array('solo')));
+		$this->assertTrue(Validation::cc('6767194235798817', array('solo')));
 		//Solo 18
-		$this->assertTrue($this->Validation->cc('676714834398858593', array('solo')));
-		$this->assertTrue($this->Validation->cc('676751666435130857', array('solo')));
-		$this->assertTrue($this->Validation->cc('676781908573924236', array('solo')));
-		$this->assertTrue($this->Validation->cc('633488724644003240', array('solo')));
-		$this->assertTrue($this->Validation->cc('676732252338067316', array('solo')));
-		$this->assertTrue($this->Validation->cc('676747520084495821', array('solo')));
-		$this->assertTrue($this->Validation->cc('633465488901381957', array('solo')));
-		$this->assertTrue($this->Validation->cc('633487484858610484', array('solo')));
-		$this->assertTrue($this->Validation->cc('633453764680740694', array('solo')));
-		$this->assertTrue($this->Validation->cc('676768613295414451', array('solo')));
+		$this->assertTrue(Validation::cc('676714834398858593', array('solo')));
+		$this->assertTrue(Validation::cc('676751666435130857', array('solo')));
+		$this->assertTrue(Validation::cc('676781908573924236', array('solo')));
+		$this->assertTrue(Validation::cc('633488724644003240', array('solo')));
+		$this->assertTrue(Validation::cc('676732252338067316', array('solo')));
+		$this->assertTrue(Validation::cc('676747520084495821', array('solo')));
+		$this->assertTrue(Validation::cc('633465488901381957', array('solo')));
+		$this->assertTrue(Validation::cc('633487484858610484', array('solo')));
+		$this->assertTrue(Validation::cc('633453764680740694', array('solo')));
+		$this->assertTrue(Validation::cc('676768613295414451', array('solo')));
 		//Solo 19
-		$this->assertTrue($this->Validation->cc('6767838565218340113', array('solo')));
-		$this->assertTrue($this->Validation->cc('6767760119829705181', array('solo')));
-		$this->assertTrue($this->Validation->cc('6767265917091593668', array('solo')));
-		$this->assertTrue($this->Validation->cc('6767938856947440111', array('solo')));
-		$this->assertTrue($this->Validation->cc('6767501945697390076', array('solo')));
-		$this->assertTrue($this->Validation->cc('6334902868716257379', array('solo')));
-		$this->assertTrue($this->Validation->cc('6334922127686425532', array('solo')));
-		$this->assertTrue($this->Validation->cc('6334933119080706440', array('solo')));
-		$this->assertTrue($this->Validation->cc('6334647959628261714', array('solo')));
-		$this->assertTrue($this->Validation->cc('6334527312384101382', array('solo')));
+		$this->assertTrue(Validation::cc('6767838565218340113', array('solo')));
+		$this->assertTrue(Validation::cc('6767760119829705181', array('solo')));
+		$this->assertTrue(Validation::cc('6767265917091593668', array('solo')));
+		$this->assertTrue(Validation::cc('6767938856947440111', array('solo')));
+		$this->assertTrue(Validation::cc('6767501945697390076', array('solo')));
+		$this->assertTrue(Validation::cc('6334902868716257379', array('solo')));
+		$this->assertTrue(Validation::cc('6334922127686425532', array('solo')));
+		$this->assertTrue(Validation::cc('6334933119080706440', array('solo')));
+		$this->assertTrue(Validation::cc('6334647959628261714', array('solo')));
+		$this->assertTrue(Validation::cc('6334527312384101382', array('solo')));
 		//Switch 16
-		$this->assertTrue($this->Validation->cc('5641829171515733', array('switch')));
-		$this->assertTrue($this->Validation->cc('5641824852820809', array('switch')));
-		$this->assertTrue($this->Validation->cc('6759129648956909', array('switch')));
-		$this->assertTrue($this->Validation->cc('6759626072268156', array('switch')));
-		$this->assertTrue($this->Validation->cc('5641822698388957', array('switch')));
-		$this->assertTrue($this->Validation->cc('5641827123105470', array('switch')));
-		$this->assertTrue($this->Validation->cc('5641823755819553', array('switch')));
-		$this->assertTrue($this->Validation->cc('5641821939587682', array('switch')));
-		$this->assertTrue($this->Validation->cc('4936097148079186', array('switch')));
-		$this->assertTrue($this->Validation->cc('5641829739125009', array('switch')));
-		$this->assertTrue($this->Validation->cc('5641822860725507', array('switch')));
-		$this->assertTrue($this->Validation->cc('4936717688865831', array('switch')));
-		$this->assertTrue($this->Validation->cc('6759487613615441', array('switch')));
-		$this->assertTrue($this->Validation->cc('5641821346840617', array('switch')));
-		$this->assertTrue($this->Validation->cc('5641825793417126', array('switch')));
-		$this->assertTrue($this->Validation->cc('5641821302759595', array('switch')));
-		$this->assertTrue($this->Validation->cc('6759784969918837', array('switch')));
-		$this->assertTrue($this->Validation->cc('5641824910667036', array('switch')));
-		$this->assertTrue($this->Validation->cc('6759139909636173', array('switch')));
-		$this->assertTrue($this->Validation->cc('6333425070638022', array('switch')));
-		$this->assertTrue($this->Validation->cc('5641823910382067', array('switch')));
-		$this->assertTrue($this->Validation->cc('4936295218139423', array('switch')));
-		$this->assertTrue($this->Validation->cc('6333031811316199', array('switch')));
-		$this->assertTrue($this->Validation->cc('4936912044763198', array('switch')));
-		$this->assertTrue($this->Validation->cc('4936387053303824', array('switch')));
-		$this->assertTrue($this->Validation->cc('6759535838760523', array('switch')));
-		$this->assertTrue($this->Validation->cc('6333427174594051', array('switch')));
-		$this->assertTrue($this->Validation->cc('5641829037102700', array('switch')));
-		$this->assertTrue($this->Validation->cc('5641826495463046', array('switch')));
-		$this->assertTrue($this->Validation->cc('6333480852979946', array('switch')));
-		$this->assertTrue($this->Validation->cc('5641827761302876', array('switch')));
-		$this->assertTrue($this->Validation->cc('5641825083505317', array('switch')));
-		$this->assertTrue($this->Validation->cc('6759298096003991', array('switch')));
-		$this->assertTrue($this->Validation->cc('4936119165483420', array('switch')));
-		$this->assertTrue($this->Validation->cc('4936190990500993', array('switch')));
-		$this->assertTrue($this->Validation->cc('4903356467384927', array('switch')));
-		$this->assertTrue($this->Validation->cc('6333372765092554', array('switch')));
-		$this->assertTrue($this->Validation->cc('5641821330950570', array('switch')));
-		$this->assertTrue($this->Validation->cc('6759841558826118', array('switch')));
-		$this->assertTrue($this->Validation->cc('4936164540922452', array('switch')));
+		$this->assertTrue(Validation::cc('5641829171515733', array('switch')));
+		$this->assertTrue(Validation::cc('5641824852820809', array('switch')));
+		$this->assertTrue(Validation::cc('6759129648956909', array('switch')));
+		$this->assertTrue(Validation::cc('6759626072268156', array('switch')));
+		$this->assertTrue(Validation::cc('5641822698388957', array('switch')));
+		$this->assertTrue(Validation::cc('5641827123105470', array('switch')));
+		$this->assertTrue(Validation::cc('5641823755819553', array('switch')));
+		$this->assertTrue(Validation::cc('5641821939587682', array('switch')));
+		$this->assertTrue(Validation::cc('4936097148079186', array('switch')));
+		$this->assertTrue(Validation::cc('5641829739125009', array('switch')));
+		$this->assertTrue(Validation::cc('5641822860725507', array('switch')));
+		$this->assertTrue(Validation::cc('4936717688865831', array('switch')));
+		$this->assertTrue(Validation::cc('6759487613615441', array('switch')));
+		$this->assertTrue(Validation::cc('5641821346840617', array('switch')));
+		$this->assertTrue(Validation::cc('5641825793417126', array('switch')));
+		$this->assertTrue(Validation::cc('5641821302759595', array('switch')));
+		$this->assertTrue(Validation::cc('6759784969918837', array('switch')));
+		$this->assertTrue(Validation::cc('5641824910667036', array('switch')));
+		$this->assertTrue(Validation::cc('6759139909636173', array('switch')));
+		$this->assertTrue(Validation::cc('6333425070638022', array('switch')));
+		$this->assertTrue(Validation::cc('5641823910382067', array('switch')));
+		$this->assertTrue(Validation::cc('4936295218139423', array('switch')));
+		$this->assertTrue(Validation::cc('6333031811316199', array('switch')));
+		$this->assertTrue(Validation::cc('4936912044763198', array('switch')));
+		$this->assertTrue(Validation::cc('4936387053303824', array('switch')));
+		$this->assertTrue(Validation::cc('6759535838760523', array('switch')));
+		$this->assertTrue(Validation::cc('6333427174594051', array('switch')));
+		$this->assertTrue(Validation::cc('5641829037102700', array('switch')));
+		$this->assertTrue(Validation::cc('5641826495463046', array('switch')));
+		$this->assertTrue(Validation::cc('6333480852979946', array('switch')));
+		$this->assertTrue(Validation::cc('5641827761302876', array('switch')));
+		$this->assertTrue(Validation::cc('5641825083505317', array('switch')));
+		$this->assertTrue(Validation::cc('6759298096003991', array('switch')));
+		$this->assertTrue(Validation::cc('4936119165483420', array('switch')));
+		$this->assertTrue(Validation::cc('4936190990500993', array('switch')));
+		$this->assertTrue(Validation::cc('4903356467384927', array('switch')));
+		$this->assertTrue(Validation::cc('6333372765092554', array('switch')));
+		$this->assertTrue(Validation::cc('5641821330950570', array('switch')));
+		$this->assertTrue(Validation::cc('6759841558826118', array('switch')));
+		$this->assertTrue(Validation::cc('4936164540922452', array('switch')));
 		//Switch 18
-		$this->assertTrue($this->Validation->cc('493622764224625174', array('switch')));
-		$this->assertTrue($this->Validation->cc('564182823396913535', array('switch')));
-		$this->assertTrue($this->Validation->cc('675917308304801234', array('switch')));
-		$this->assertTrue($this->Validation->cc('675919890024220298', array('switch')));
-		$this->assertTrue($this->Validation->cc('633308376862556751', array('switch')));
-		$this->assertTrue($this->Validation->cc('564182377633208779', array('switch')));
-		$this->assertTrue($this->Validation->cc('564182870014926787', array('switch')));
-		$this->assertTrue($this->Validation->cc('675979788553829819', array('switch')));
-		$this->assertTrue($this->Validation->cc('493668394358130935', array('switch')));
-		$this->assertTrue($this->Validation->cc('493637431790930965', array('switch')));
-		$this->assertTrue($this->Validation->cc('633321438601941513', array('switch')));
-		$this->assertTrue($this->Validation->cc('675913800898840986', array('switch')));
-		$this->assertTrue($this->Validation->cc('564182592016841547', array('switch')));
-		$this->assertTrue($this->Validation->cc('564182428380440899', array('switch')));
-		$this->assertTrue($this->Validation->cc('493696376827623463', array('switch')));
-		$this->assertTrue($this->Validation->cc('675977939286485757', array('switch')));
-		$this->assertTrue($this->Validation->cc('490302699502091579', array('switch')));
-		$this->assertTrue($this->Validation->cc('564182085013662230', array('switch')));
-		$this->assertTrue($this->Validation->cc('493693054263310167', array('switch')));
-		$this->assertTrue($this->Validation->cc('633321755966697525', array('switch')));
-		$this->assertTrue($this->Validation->cc('675996851719732811', array('switch')));
-		$this->assertTrue($this->Validation->cc('493699211208281028', array('switch')));
-		$this->assertTrue($this->Validation->cc('493697817378356614', array('switch')));
-		$this->assertTrue($this->Validation->cc('675968224161768150', array('switch')));
-		$this->assertTrue($this->Validation->cc('493669416873337627', array('switch')));
-		$this->assertTrue($this->Validation->cc('564182439172549714', array('switch')));
-		$this->assertTrue($this->Validation->cc('675926914467673598', array('switch')));
-		$this->assertTrue($this->Validation->cc('564182565231977809', array('switch')));
-		$this->assertTrue($this->Validation->cc('675966282607849002', array('switch')));
-		$this->assertTrue($this->Validation->cc('493691609704348548', array('switch')));
-		$this->assertTrue($this->Validation->cc('675933118546065120', array('switch')));
-		$this->assertTrue($this->Validation->cc('493631116677238592', array('switch')));
-		$this->assertTrue($this->Validation->cc('675921142812825938', array('switch')));
-		$this->assertTrue($this->Validation->cc('633338311815675113', array('switch')));
-		$this->assertTrue($this->Validation->cc('633323539867338621', array('switch')));
-		$this->assertTrue($this->Validation->cc('675964912740845663', array('switch')));
-		$this->assertTrue($this->Validation->cc('633334008833727504', array('switch')));
-		$this->assertTrue($this->Validation->cc('493631941273687169', array('switch')));
-		$this->assertTrue($this->Validation->cc('564182971729706785', array('switch')));
-		$this->assertTrue($this->Validation->cc('633303461188963496', array('switch')));
+		$this->assertTrue(Validation::cc('493622764224625174', array('switch')));
+		$this->assertTrue(Validation::cc('564182823396913535', array('switch')));
+		$this->assertTrue(Validation::cc('675917308304801234', array('switch')));
+		$this->assertTrue(Validation::cc('675919890024220298', array('switch')));
+		$this->assertTrue(Validation::cc('633308376862556751', array('switch')));
+		$this->assertTrue(Validation::cc('564182377633208779', array('switch')));
+		$this->assertTrue(Validation::cc('564182870014926787', array('switch')));
+		$this->assertTrue(Validation::cc('675979788553829819', array('switch')));
+		$this->assertTrue(Validation::cc('493668394358130935', array('switch')));
+		$this->assertTrue(Validation::cc('493637431790930965', array('switch')));
+		$this->assertTrue(Validation::cc('633321438601941513', array('switch')));
+		$this->assertTrue(Validation::cc('675913800898840986', array('switch')));
+		$this->assertTrue(Validation::cc('564182592016841547', array('switch')));
+		$this->assertTrue(Validation::cc('564182428380440899', array('switch')));
+		$this->assertTrue(Validation::cc('493696376827623463', array('switch')));
+		$this->assertTrue(Validation::cc('675977939286485757', array('switch')));
+		$this->assertTrue(Validation::cc('490302699502091579', array('switch')));
+		$this->assertTrue(Validation::cc('564182085013662230', array('switch')));
+		$this->assertTrue(Validation::cc('493693054263310167', array('switch')));
+		$this->assertTrue(Validation::cc('633321755966697525', array('switch')));
+		$this->assertTrue(Validation::cc('675996851719732811', array('switch')));
+		$this->assertTrue(Validation::cc('493699211208281028', array('switch')));
+		$this->assertTrue(Validation::cc('493697817378356614', array('switch')));
+		$this->assertTrue(Validation::cc('675968224161768150', array('switch')));
+		$this->assertTrue(Validation::cc('493669416873337627', array('switch')));
+		$this->assertTrue(Validation::cc('564182439172549714', array('switch')));
+		$this->assertTrue(Validation::cc('675926914467673598', array('switch')));
+		$this->assertTrue(Validation::cc('564182565231977809', array('switch')));
+		$this->assertTrue(Validation::cc('675966282607849002', array('switch')));
+		$this->assertTrue(Validation::cc('493691609704348548', array('switch')));
+		$this->assertTrue(Validation::cc('675933118546065120', array('switch')));
+		$this->assertTrue(Validation::cc('493631116677238592', array('switch')));
+		$this->assertTrue(Validation::cc('675921142812825938', array('switch')));
+		$this->assertTrue(Validation::cc('633338311815675113', array('switch')));
+		$this->assertTrue(Validation::cc('633323539867338621', array('switch')));
+		$this->assertTrue(Validation::cc('675964912740845663', array('switch')));
+		$this->assertTrue(Validation::cc('633334008833727504', array('switch')));
+		$this->assertTrue(Validation::cc('493631941273687169', array('switch')));
+		$this->assertTrue(Validation::cc('564182971729706785', array('switch')));
+		$this->assertTrue(Validation::cc('633303461188963496', array('switch')));
 		//Switch 19
-		$this->assertTrue($this->Validation->cc('6759603460617628716', array('switch')));
-		$this->assertTrue($this->Validation->cc('4936705825268647681', array('switch')));
-		$this->assertTrue($this->Validation->cc('5641829846600479183', array('switch')));
-		$this->assertTrue($this->Validation->cc('6759389846573792530', array('switch')));
-		$this->assertTrue($this->Validation->cc('4936189558712637603', array('switch')));
-		$this->assertTrue($this->Validation->cc('5641822217393868189', array('switch')));
-		$this->assertTrue($this->Validation->cc('4903075563780057152', array('switch')));
-		$this->assertTrue($this->Validation->cc('4936510653566569547', array('switch')));
-		$this->assertTrue($this->Validation->cc('4936503083627303364', array('switch')));
-		$this->assertTrue($this->Validation->cc('4936777334398116272', array('switch')));
-		$this->assertTrue($this->Validation->cc('5641823876900554860', array('switch')));
-		$this->assertTrue($this->Validation->cc('6759619236903407276', array('switch')));
-		$this->assertTrue($this->Validation->cc('6759011470269978117', array('switch')));
-		$this->assertTrue($this->Validation->cc('6333175833997062502', array('switch')));
-		$this->assertTrue($this->Validation->cc('6759498728789080439', array('switch')));
-		$this->assertTrue($this->Validation->cc('4903020404168157841', array('switch')));
-		$this->assertTrue($this->Validation->cc('6759354334874804313', array('switch')));
-		$this->assertTrue($this->Validation->cc('6759900856420875115', array('switch')));
-		$this->assertTrue($this->Validation->cc('5641827269346868860', array('switch')));
-		$this->assertTrue($this->Validation->cc('5641828995047453870', array('switch')));
-		$this->assertTrue($this->Validation->cc('6333321884754806543', array('switch')));
-		$this->assertTrue($this->Validation->cc('6333108246283715901', array('switch')));
-		$this->assertTrue($this->Validation->cc('6759572372800700102', array('switch')));
-		$this->assertTrue($this->Validation->cc('4903095096797974933', array('switch')));
-		$this->assertTrue($this->Validation->cc('6333354315797920215', array('switch')));
-		$this->assertTrue($this->Validation->cc('6759163746089433755', array('switch')));
-		$this->assertTrue($this->Validation->cc('6759871666634807647', array('switch')));
-		$this->assertTrue($this->Validation->cc('5641827883728575248', array('switch')));
-		$this->assertTrue($this->Validation->cc('4936527975051407847', array('switch')));
-		$this->assertTrue($this->Validation->cc('5641823318396882141', array('switch')));
-		$this->assertTrue($this->Validation->cc('6759123772311123708', array('switch')));
-		$this->assertTrue($this->Validation->cc('4903054736148271088', array('switch')));
-		$this->assertTrue($this->Validation->cc('4936477526808883952', array('switch')));
-		$this->assertTrue($this->Validation->cc('4936433964890967966', array('switch')));
-		$this->assertTrue($this->Validation->cc('6333245128906049344', array('switch')));
-		$this->assertTrue($this->Validation->cc('4936321036970553134', array('switch')));
-		$this->assertTrue($this->Validation->cc('4936111816358702773', array('switch')));
-		$this->assertTrue($this->Validation->cc('4936196077254804290', array('switch')));
-		$this->assertTrue($this->Validation->cc('6759558831206830183', array('switch')));
-		$this->assertTrue($this->Validation->cc('5641827998830403137', array('switch')));
+		$this->assertTrue(Validation::cc('6759603460617628716', array('switch')));
+		$this->assertTrue(Validation::cc('4936705825268647681', array('switch')));
+		$this->assertTrue(Validation::cc('5641829846600479183', array('switch')));
+		$this->assertTrue(Validation::cc('6759389846573792530', array('switch')));
+		$this->assertTrue(Validation::cc('4936189558712637603', array('switch')));
+		$this->assertTrue(Validation::cc('5641822217393868189', array('switch')));
+		$this->assertTrue(Validation::cc('4903075563780057152', array('switch')));
+		$this->assertTrue(Validation::cc('4936510653566569547', array('switch')));
+		$this->assertTrue(Validation::cc('4936503083627303364', array('switch')));
+		$this->assertTrue(Validation::cc('4936777334398116272', array('switch')));
+		$this->assertTrue(Validation::cc('5641823876900554860', array('switch')));
+		$this->assertTrue(Validation::cc('6759619236903407276', array('switch')));
+		$this->assertTrue(Validation::cc('6759011470269978117', array('switch')));
+		$this->assertTrue(Validation::cc('6333175833997062502', array('switch')));
+		$this->assertTrue(Validation::cc('6759498728789080439', array('switch')));
+		$this->assertTrue(Validation::cc('4903020404168157841', array('switch')));
+		$this->assertTrue(Validation::cc('6759354334874804313', array('switch')));
+		$this->assertTrue(Validation::cc('6759900856420875115', array('switch')));
+		$this->assertTrue(Validation::cc('5641827269346868860', array('switch')));
+		$this->assertTrue(Validation::cc('5641828995047453870', array('switch')));
+		$this->assertTrue(Validation::cc('6333321884754806543', array('switch')));
+		$this->assertTrue(Validation::cc('6333108246283715901', array('switch')));
+		$this->assertTrue(Validation::cc('6759572372800700102', array('switch')));
+		$this->assertTrue(Validation::cc('4903095096797974933', array('switch')));
+		$this->assertTrue(Validation::cc('6333354315797920215', array('switch')));
+		$this->assertTrue(Validation::cc('6759163746089433755', array('switch')));
+		$this->assertTrue(Validation::cc('6759871666634807647', array('switch')));
+		$this->assertTrue(Validation::cc('5641827883728575248', array('switch')));
+		$this->assertTrue(Validation::cc('4936527975051407847', array('switch')));
+		$this->assertTrue(Validation::cc('5641823318396882141', array('switch')));
+		$this->assertTrue(Validation::cc('6759123772311123708', array('switch')));
+		$this->assertTrue(Validation::cc('4903054736148271088', array('switch')));
+		$this->assertTrue(Validation::cc('4936477526808883952', array('switch')));
+		$this->assertTrue(Validation::cc('4936433964890967966', array('switch')));
+		$this->assertTrue(Validation::cc('6333245128906049344', array('switch')));
+		$this->assertTrue(Validation::cc('4936321036970553134', array('switch')));
+		$this->assertTrue(Validation::cc('4936111816358702773', array('switch')));
+		$this->assertTrue(Validation::cc('4936196077254804290', array('switch')));
+		$this->assertTrue(Validation::cc('6759558831206830183', array('switch')));
+		$this->assertTrue(Validation::cc('5641827998830403137', array('switch')));
 		//VISA 13 digit
-		$this->assertTrue($this->Validation->cc('4024007174754', array('visa')));
-		$this->assertTrue($this->Validation->cc('4104816460717', array('visa')));
-		$this->assertTrue($this->Validation->cc('4716229700437', array('visa')));
-		$this->assertTrue($this->Validation->cc('4539305400213', array('visa')));
-		$this->assertTrue($this->Validation->cc('4728260558665', array('visa')));
-		$this->assertTrue($this->Validation->cc('4929100131792', array('visa')));
-		$this->assertTrue($this->Validation->cc('4024007117308', array('visa')));
-		$this->assertTrue($this->Validation->cc('4539915491024', array('visa')));
-		$this->assertTrue($this->Validation->cc('4539790901139', array('visa')));
-		$this->assertTrue($this->Validation->cc('4485284914909', array('visa')));
-		$this->assertTrue($this->Validation->cc('4782793022350', array('visa')));
-		$this->assertTrue($this->Validation->cc('4556899290685', array('visa')));
-		$this->assertTrue($this->Validation->cc('4024007134774', array('visa')));
-		$this->assertTrue($this->Validation->cc('4333412341316', array('visa')));
-		$this->assertTrue($this->Validation->cc('4539534204543', array('visa')));
-		$this->assertTrue($this->Validation->cc('4485640373626', array('visa')));
-		$this->assertTrue($this->Validation->cc('4929911445746', array('visa')));
-		$this->assertTrue($this->Validation->cc('4539292550806', array('visa')));
-		$this->assertTrue($this->Validation->cc('4716523014030', array('visa')));
-		$this->assertTrue($this->Validation->cc('4024007125152', array('visa')));
-		$this->assertTrue($this->Validation->cc('4539758883311', array('visa')));
-		$this->assertTrue($this->Validation->cc('4024007103258', array('visa')));
-		$this->assertTrue($this->Validation->cc('4916933155767', array('visa')));
-		$this->assertTrue($this->Validation->cc('4024007159672', array('visa')));
-		$this->assertTrue($this->Validation->cc('4716935544871', array('visa')));
-		$this->assertTrue($this->Validation->cc('4929415177779', array('visa')));
-		$this->assertTrue($this->Validation->cc('4929748547896', array('visa')));
-		$this->assertTrue($this->Validation->cc('4929153468612', array('visa')));
-		$this->assertTrue($this->Validation->cc('4539397132104', array('visa')));
-		$this->assertTrue($this->Validation->cc('4485293435540', array('visa')));
-		$this->assertTrue($this->Validation->cc('4485799412720', array('visa')));
-		$this->assertTrue($this->Validation->cc('4916744757686', array('visa')));
-		$this->assertTrue($this->Validation->cc('4556475655426', array('visa')));
-		$this->assertTrue($this->Validation->cc('4539400441625', array('visa')));
-		$this->assertTrue($this->Validation->cc('4485437129173', array('visa')));
-		$this->assertTrue($this->Validation->cc('4716253605320', array('visa')));
-		$this->assertTrue($this->Validation->cc('4539366156589', array('visa')));
-		$this->assertTrue($this->Validation->cc('4916498061392', array('visa')));
-		$this->assertTrue($this->Validation->cc('4716127163779', array('visa')));
-		$this->assertTrue($this->Validation->cc('4024007183078', array('visa')));
-		$this->assertTrue($this->Validation->cc('4041553279654', array('visa')));
-		$this->assertTrue($this->Validation->cc('4532380121960', array('visa')));
-		$this->assertTrue($this->Validation->cc('4485906062491', array('visa')));
-		$this->assertTrue($this->Validation->cc('4539365115149', array('visa')));
-		$this->assertTrue($this->Validation->cc('4485146516702', array('visa')));
+		$this->assertTrue(Validation::cc('4024007174754', array('visa')));
+		$this->assertTrue(Validation::cc('4104816460717', array('visa')));
+		$this->assertTrue(Validation::cc('4716229700437', array('visa')));
+		$this->assertTrue(Validation::cc('4539305400213', array('visa')));
+		$this->assertTrue(Validation::cc('4728260558665', array('visa')));
+		$this->assertTrue(Validation::cc('4929100131792', array('visa')));
+		$this->assertTrue(Validation::cc('4024007117308', array('visa')));
+		$this->assertTrue(Validation::cc('4539915491024', array('visa')));
+		$this->assertTrue(Validation::cc('4539790901139', array('visa')));
+		$this->assertTrue(Validation::cc('4485284914909', array('visa')));
+		$this->assertTrue(Validation::cc('4782793022350', array('visa')));
+		$this->assertTrue(Validation::cc('4556899290685', array('visa')));
+		$this->assertTrue(Validation::cc('4024007134774', array('visa')));
+		$this->assertTrue(Validation::cc('4333412341316', array('visa')));
+		$this->assertTrue(Validation::cc('4539534204543', array('visa')));
+		$this->assertTrue(Validation::cc('4485640373626', array('visa')));
+		$this->assertTrue(Validation::cc('4929911445746', array('visa')));
+		$this->assertTrue(Validation::cc('4539292550806', array('visa')));
+		$this->assertTrue(Validation::cc('4716523014030', array('visa')));
+		$this->assertTrue(Validation::cc('4024007125152', array('visa')));
+		$this->assertTrue(Validation::cc('4539758883311', array('visa')));
+		$this->assertTrue(Validation::cc('4024007103258', array('visa')));
+		$this->assertTrue(Validation::cc('4916933155767', array('visa')));
+		$this->assertTrue(Validation::cc('4024007159672', array('visa')));
+		$this->assertTrue(Validation::cc('4716935544871', array('visa')));
+		$this->assertTrue(Validation::cc('4929415177779', array('visa')));
+		$this->assertTrue(Validation::cc('4929748547896', array('visa')));
+		$this->assertTrue(Validation::cc('4929153468612', array('visa')));
+		$this->assertTrue(Validation::cc('4539397132104', array('visa')));
+		$this->assertTrue(Validation::cc('4485293435540', array('visa')));
+		$this->assertTrue(Validation::cc('4485799412720', array('visa')));
+		$this->assertTrue(Validation::cc('4916744757686', array('visa')));
+		$this->assertTrue(Validation::cc('4556475655426', array('visa')));
+		$this->assertTrue(Validation::cc('4539400441625', array('visa')));
+		$this->assertTrue(Validation::cc('4485437129173', array('visa')));
+		$this->assertTrue(Validation::cc('4716253605320', array('visa')));
+		$this->assertTrue(Validation::cc('4539366156589', array('visa')));
+		$this->assertTrue(Validation::cc('4916498061392', array('visa')));
+		$this->assertTrue(Validation::cc('4716127163779', array('visa')));
+		$this->assertTrue(Validation::cc('4024007183078', array('visa')));
+		$this->assertTrue(Validation::cc('4041553279654', array('visa')));
+		$this->assertTrue(Validation::cc('4532380121960', array('visa')));
+		$this->assertTrue(Validation::cc('4485906062491', array('visa')));
+		$this->assertTrue(Validation::cc('4539365115149', array('visa')));
+		$this->assertTrue(Validation::cc('4485146516702', array('visa')));
 		//VISA 16 digit
-		$this->assertTrue($this->Validation->cc('4916375389940009', array('visa')));
-		$this->assertTrue($this->Validation->cc('4929167481032610', array('visa')));
-		$this->assertTrue($this->Validation->cc('4485029969061519', array('visa')));
-		$this->assertTrue($this->Validation->cc('4485573845281759', array('visa')));
-		$this->assertTrue($this->Validation->cc('4485669810383529', array('visa')));
-		$this->assertTrue($this->Validation->cc('4929615806560327', array('visa')));
-		$this->assertTrue($this->Validation->cc('4556807505609535', array('visa')));
-		$this->assertTrue($this->Validation->cc('4532611336232890', array('visa')));
-		$this->assertTrue($this->Validation->cc('4532201952422387', array('visa')));
-		$this->assertTrue($this->Validation->cc('4485073797976290', array('visa')));
-		$this->assertTrue($this->Validation->cc('4024007157580969', array('visa')));
-		$this->assertTrue($this->Validation->cc('4053740470212274', array('visa')));
-		$this->assertTrue($this->Validation->cc('4716265831525676', array('visa')));
-		$this->assertTrue($this->Validation->cc('4024007100222966', array('visa')));
-		$this->assertTrue($this->Validation->cc('4539556148303244', array('visa')));
-		$this->assertTrue($this->Validation->cc('4532449879689709', array('visa')));
-		$this->assertTrue($this->Validation->cc('4916805467840986', array('visa')));
-		$this->assertTrue($this->Validation->cc('4532155644440233', array('visa')));
-		$this->assertTrue($this->Validation->cc('4467977802223781', array('visa')));
-		$this->assertTrue($this->Validation->cc('4539224637000686', array('visa')));
-		$this->assertTrue($this->Validation->cc('4556629187064965', array('visa')));
-		$this->assertTrue($this->Validation->cc('4532970205932943', array('visa')));
-		$this->assertTrue($this->Validation->cc('4821470132041850', array('visa')));
-		$this->assertTrue($this->Validation->cc('4916214267894485', array('visa')));
-		$this->assertTrue($this->Validation->cc('4024007169073284', array('visa')));
-		$this->assertTrue($this->Validation->cc('4716783351296122', array('visa')));
-		$this->assertTrue($this->Validation->cc('4556480171913795', array('visa')));
-		$this->assertTrue($this->Validation->cc('4929678411034997', array('visa')));
-		$this->assertTrue($this->Validation->cc('4682061913519392', array('visa')));
-		$this->assertTrue($this->Validation->cc('4916495481746474', array('visa')));
-		$this->assertTrue($this->Validation->cc('4929007108460499', array('visa')));
-		$this->assertTrue($this->Validation->cc('4539951357838586', array('visa')));
-		$this->assertTrue($this->Validation->cc('4716482691051558', array('visa')));
-		$this->assertTrue($this->Validation->cc('4916385069917516', array('visa')));
-		$this->assertTrue($this->Validation->cc('4929020289494641', array('visa')));
-		$this->assertTrue($this->Validation->cc('4532176245263774', array('visa')));
-		$this->assertTrue($this->Validation->cc('4556242273553949', array('visa')));
-		$this->assertTrue($this->Validation->cc('4481007485188614', array('visa')));
-		$this->assertTrue($this->Validation->cc('4716533372139623', array('visa')));
-		$this->assertTrue($this->Validation->cc('4929152038152632', array('visa')));
-		$this->assertTrue($this->Validation->cc('4539404037310550', array('visa')));
-		$this->assertTrue($this->Validation->cc('4532800925229140', array('visa')));
-		$this->assertTrue($this->Validation->cc('4916845885268360', array('visa')));
-		$this->assertTrue($this->Validation->cc('4394514669078434', array('visa')));
-		$this->assertTrue($this->Validation->cc('4485611378115042', array('visa')));
+		$this->assertTrue(Validation::cc('4916375389940009', array('visa')));
+		$this->assertTrue(Validation::cc('4929167481032610', array('visa')));
+		$this->assertTrue(Validation::cc('4485029969061519', array('visa')));
+		$this->assertTrue(Validation::cc('4485573845281759', array('visa')));
+		$this->assertTrue(Validation::cc('4485669810383529', array('visa')));
+		$this->assertTrue(Validation::cc('4929615806560327', array('visa')));
+		$this->assertTrue(Validation::cc('4556807505609535', array('visa')));
+		$this->assertTrue(Validation::cc('4532611336232890', array('visa')));
+		$this->assertTrue(Validation::cc('4532201952422387', array('visa')));
+		$this->assertTrue(Validation::cc('4485073797976290', array('visa')));
+		$this->assertTrue(Validation::cc('4024007157580969', array('visa')));
+		$this->assertTrue(Validation::cc('4053740470212274', array('visa')));
+		$this->assertTrue(Validation::cc('4716265831525676', array('visa')));
+		$this->assertTrue(Validation::cc('4024007100222966', array('visa')));
+		$this->assertTrue(Validation::cc('4539556148303244', array('visa')));
+		$this->assertTrue(Validation::cc('4532449879689709', array('visa')));
+		$this->assertTrue(Validation::cc('4916805467840986', array('visa')));
+		$this->assertTrue(Validation::cc('4532155644440233', array('visa')));
+		$this->assertTrue(Validation::cc('4467977802223781', array('visa')));
+		$this->assertTrue(Validation::cc('4539224637000686', array('visa')));
+		$this->assertTrue(Validation::cc('4556629187064965', array('visa')));
+		$this->assertTrue(Validation::cc('4532970205932943', array('visa')));
+		$this->assertTrue(Validation::cc('4821470132041850', array('visa')));
+		$this->assertTrue(Validation::cc('4916214267894485', array('visa')));
+		$this->assertTrue(Validation::cc('4024007169073284', array('visa')));
+		$this->assertTrue(Validation::cc('4716783351296122', array('visa')));
+		$this->assertTrue(Validation::cc('4556480171913795', array('visa')));
+		$this->assertTrue(Validation::cc('4929678411034997', array('visa')));
+		$this->assertTrue(Validation::cc('4682061913519392', array('visa')));
+		$this->assertTrue(Validation::cc('4916495481746474', array('visa')));
+		$this->assertTrue(Validation::cc('4929007108460499', array('visa')));
+		$this->assertTrue(Validation::cc('4539951357838586', array('visa')));
+		$this->assertTrue(Validation::cc('4716482691051558', array('visa')));
+		$this->assertTrue(Validation::cc('4916385069917516', array('visa')));
+		$this->assertTrue(Validation::cc('4929020289494641', array('visa')));
+		$this->assertTrue(Validation::cc('4532176245263774', array('visa')));
+		$this->assertTrue(Validation::cc('4556242273553949', array('visa')));
+		$this->assertTrue(Validation::cc('4481007485188614', array('visa')));
+		$this->assertTrue(Validation::cc('4716533372139623', array('visa')));
+		$this->assertTrue(Validation::cc('4929152038152632', array('visa')));
+		$this->assertTrue(Validation::cc('4539404037310550', array('visa')));
+		$this->assertTrue(Validation::cc('4532800925229140', array('visa')));
+		$this->assertTrue(Validation::cc('4916845885268360', array('visa')));
+		$this->assertTrue(Validation::cc('4394514669078434', array('visa')));
+		$this->assertTrue(Validation::cc('4485611378115042', array('visa')));
 		//Visa Electron
-		$this->assertTrue($this->Validation->cc('4175003346287100', array('electron')));
-		$this->assertTrue($this->Validation->cc('4913042516577228', array('electron')));
-		$this->assertTrue($this->Validation->cc('4917592325659381', array('electron')));
-		$this->assertTrue($this->Validation->cc('4917084924450511', array('electron')));
-		$this->assertTrue($this->Validation->cc('4917994610643999', array('electron')));
-		$this->assertTrue($this->Validation->cc('4175005933743585', array('electron')));
-		$this->assertTrue($this->Validation->cc('4175008373425044', array('electron')));
-		$this->assertTrue($this->Validation->cc('4913119763664154', array('electron')));
-		$this->assertTrue($this->Validation->cc('4913189017481812', array('electron')));
-		$this->assertTrue($this->Validation->cc('4913085104968622', array('electron')));
-		$this->assertTrue($this->Validation->cc('4175008803122021', array('electron')));
-		$this->assertTrue($this->Validation->cc('4913294453962489', array('electron')));
-		$this->assertTrue($this->Validation->cc('4175009797419290', array('electron')));
-		$this->assertTrue($this->Validation->cc('4175005028142917', array('electron')));
-		$this->assertTrue($this->Validation->cc('4913940802385364', array('electron')));
+		$this->assertTrue(Validation::cc('4175003346287100', array('electron')));
+		$this->assertTrue(Validation::cc('4913042516577228', array('electron')));
+		$this->assertTrue(Validation::cc('4917592325659381', array('electron')));
+		$this->assertTrue(Validation::cc('4917084924450511', array('electron')));
+		$this->assertTrue(Validation::cc('4917994610643999', array('electron')));
+		$this->assertTrue(Validation::cc('4175005933743585', array('electron')));
+		$this->assertTrue(Validation::cc('4175008373425044', array('electron')));
+		$this->assertTrue(Validation::cc('4913119763664154', array('electron')));
+		$this->assertTrue(Validation::cc('4913189017481812', array('electron')));
+		$this->assertTrue(Validation::cc('4913085104968622', array('electron')));
+		$this->assertTrue(Validation::cc('4175008803122021', array('electron')));
+		$this->assertTrue(Validation::cc('4913294453962489', array('electron')));
+		$this->assertTrue(Validation::cc('4175009797419290', array('electron')));
+		$this->assertTrue(Validation::cc('4175005028142917', array('electron')));
+		$this->assertTrue(Validation::cc('4913940802385364', array('electron')));
 		//Voyager
-		$this->assertTrue($this->Validation->cc('869940697287073', array('voyager')));
-		$this->assertTrue($this->Validation->cc('869934523596112', array('voyager')));
-		$this->assertTrue($this->Validation->cc('869958670174621', array('voyager')));
-		$this->assertTrue($this->Validation->cc('869921250068209', array('voyager')));
-		$this->assertTrue($this->Validation->cc('869972521242198', array('voyager')));
+		$this->assertTrue(Validation::cc('869940697287073', array('voyager')));
+		$this->assertTrue(Validation::cc('869934523596112', array('voyager')));
+		$this->assertTrue(Validation::cc('869958670174621', array('voyager')));
+		$this->assertTrue(Validation::cc('869921250068209', array('voyager')));
+		$this->assertTrue(Validation::cc('869972521242198', array('voyager')));
 	}
 
 	function testLuhn() {
@@ -609,633 +609,633 @@ class ValidationTestCase extends UnitTestCase {
 	}
 
 	function testCustomRegexForCc() {
-		$this->assertTrue($this->Validation->cc('12332105933743585', null, null, '/123321\\d{11}/'));
-		$this->assertFalse($this->Validation->cc('1233210593374358', null, null, '/123321\\d{11}/'));
-		$this->assertFalse($this->Validation->cc('12312305933743585', null, null, '/123321\\d{11}/'));
+		$this->assertTrue(Validation::cc('12332105933743585', null, null, '/123321\\d{11}/'));
+		$this->assertFalse(Validation::cc('1233210593374358', null, null, '/123321\\d{11}/'));
+		$this->assertFalse(Validation::cc('12312305933743585', null, null, '/123321\\d{11}/'));
 	}
 
 	function testCustomRegexForCcWithLuhnCheck() {
-		$this->assertTrue($this->Validation->cc('12332110426226941', null, true, '/123321\\d{11}/'));
-		$this->assertFalse($this->Validation->cc('12332105933743585', null, true, '/123321\\d{11}/'));
-		$this->assertFalse($this->Validation->cc('12332105933743587', null, true, '/123321\\d{11}/'));
-		$this->assertFalse($this->Validation->cc('12312305933743585', null, true, '/123321\\d{11}/'));
+		$this->assertTrue(Validation::cc('12332110426226941', null, true, '/123321\\d{11}/'));
+		$this->assertFalse(Validation::cc('12332105933743585', null, true, '/123321\\d{11}/'));
+		$this->assertFalse(Validation::cc('12332105933743587', null, true, '/123321\\d{11}/'));
+		$this->assertFalse(Validation::cc('12312305933743585', null, true, '/123321\\d{11}/'));
 	}
 
 	function testFastCc() {
 		//American Express
-		$this->assertTrue($this->Validation->cc('370482756063980'));
+		$this->assertTrue(Validation::cc('370482756063980'));
 		//Diners Club 14
-		$this->assertTrue($this->Validation->cc('30155483651028'));
+		$this->assertTrue(Validation::cc('30155483651028'));
 		//2004 MasterCard/Diners Club Alliance International 14
-		$this->assertTrue($this->Validation->cc('36747701998969'));
+		$this->assertTrue(Validation::cc('36747701998969'));
 		//2004 MasterCard/Diners Club Alliance US & Canada 16
-		$this->assertTrue($this->Validation->cc('5597511346169950'));
+		$this->assertTrue(Validation::cc('5597511346169950'));
 		//Discover
-		$this->assertTrue($this->Validation->cc('6011802876467237'));
+		$this->assertTrue(Validation::cc('6011802876467237'));
 		//Mastercard
-		$this->assertTrue($this->Validation->cc('5580424361774366'));
+		$this->assertTrue(Validation::cc('5580424361774366'));
 		//VISA 13 digit
-		$this->assertTrue($this->Validation->cc('4024007174754'));
+		$this->assertTrue(Validation::cc('4024007174754'));
 		//VISA 16 digit
-		$this->assertTrue($this->Validation->cc('4916375389940009'));
+		$this->assertTrue(Validation::cc('4916375389940009'));
 		//Visa Electron
-		$this->assertTrue($this->Validation->cc('4175003346287100'));
+		$this->assertTrue(Validation::cc('4175003346287100'));
 	}
 
 	function testAllCc() {
 		//American Express
-		$this->assertTrue($this->Validation->cc('370482756063980', 'all'));
+		$this->assertTrue(Validation::cc('370482756063980', 'all'));
 		//BankCard
-		$this->assertTrue($this->Validation->cc('5610745867413420', 'all'));
+		$this->assertTrue(Validation::cc('5610745867413420', 'all'));
 		//Diners Club 14
-		$this->assertTrue($this->Validation->cc('30155483651028', 'all'));
+		$this->assertTrue(Validation::cc('30155483651028', 'all'));
 		//2004 MasterCard/Diners Club Alliance International 14
-		$this->assertTrue($this->Validation->cc('36747701998969', 'all'));
+		$this->assertTrue(Validation::cc('36747701998969', 'all'));
 		//2004 MasterCard/Diners Club Alliance US & Canada 16
-		$this->assertTrue($this->Validation->cc('5597511346169950', 'all'));
+		$this->assertTrue(Validation::cc('5597511346169950', 'all'));
 		//Discover
-		$this->assertTrue($this->Validation->cc('6011802876467237', 'all'));
+		$this->assertTrue(Validation::cc('6011802876467237', 'all'));
 		//enRoute
-		$this->assertTrue($this->Validation->cc('201496944158937', 'all'));
+		$this->assertTrue(Validation::cc('201496944158937', 'all'));
 		//JCB 15 digit
-		$this->assertTrue($this->Validation->cc('210034762247893', 'all'));
+		$this->assertTrue(Validation::cc('210034762247893', 'all'));
 		//JCB 16 digit
-		$this->assertTrue($this->Validation->cc('3096806857839939', 'all'));
+		$this->assertTrue(Validation::cc('3096806857839939', 'all'));
 		//Maestro (debit card)
-		$this->assertTrue($this->Validation->cc('5020147409985219', 'all'));
+		$this->assertTrue(Validation::cc('5020147409985219', 'all'));
 		//Mastercard
-		$this->assertTrue($this->Validation->cc('5580424361774366', 'all'));
+		$this->assertTrue(Validation::cc('5580424361774366', 'all'));
 		//Solo 16
-		$this->assertTrue($this->Validation->cc('6767432107064987', 'all'));
+		$this->assertTrue(Validation::cc('6767432107064987', 'all'));
 		//Solo 18
-		$this->assertTrue($this->Validation->cc('676714834398858593', 'all'));
+		$this->assertTrue(Validation::cc('676714834398858593', 'all'));
 		//Solo 19
-		$this->assertTrue($this->Validation->cc('6767838565218340113', 'all'));
+		$this->assertTrue(Validation::cc('6767838565218340113', 'all'));
 		//Switch 16
-		$this->assertTrue($this->Validation->cc('5641829171515733', 'all'));
+		$this->assertTrue(Validation::cc('5641829171515733', 'all'));
 		//Switch 18
-		$this->assertTrue($this->Validation->cc('493622764224625174', 'all'));
+		$this->assertTrue(Validation::cc('493622764224625174', 'all'));
 		//Switch 19
-		$this->assertTrue($this->Validation->cc('6759603460617628716', 'all'));
+		$this->assertTrue(Validation::cc('6759603460617628716', 'all'));
 		//VISA 13 digit
-		$this->assertTrue($this->Validation->cc('4024007174754', 'all'));
+		$this->assertTrue(Validation::cc('4024007174754', 'all'));
 		//VISA 16 digit
-		$this->assertTrue($this->Validation->cc('4916375389940009', 'all'));
+		$this->assertTrue(Validation::cc('4916375389940009', 'all'));
 		//Visa Electron
-		$this->assertTrue($this->Validation->cc('4175003346287100', 'all'));
+		$this->assertTrue(Validation::cc('4175003346287100', 'all'));
 		//Voyager
-		$this->assertTrue($this->Validation->cc('869940697287073', 'all'));
+		$this->assertTrue(Validation::cc('869940697287073', 'all'));
 	}
 
 	function testAllCcDeep() {
 		//American Express
-		$this->assertTrue($this->Validation->cc('370482756063980', 'all', true));
+		$this->assertTrue(Validation::cc('370482756063980', 'all', true));
 		//BankCard
-		$this->assertTrue($this->Validation->cc('5610745867413420', 'all', true));
+		$this->assertTrue(Validation::cc('5610745867413420', 'all', true));
 		//Diners Club 14
-		$this->assertTrue($this->Validation->cc('30155483651028', 'all', true));
+		$this->assertTrue(Validation::cc('30155483651028', 'all', true));
 		//2004 MasterCard/Diners Club Alliance International 14
-		$this->assertTrue($this->Validation->cc('36747701998969', 'all', true));
+		$this->assertTrue(Validation::cc('36747701998969', 'all', true));
 		//2004 MasterCard/Diners Club Alliance US & Canada 16
-		$this->assertTrue($this->Validation->cc('5597511346169950', 'all', true));
+		$this->assertTrue(Validation::cc('5597511346169950', 'all', true));
 		//Discover
-		$this->assertTrue($this->Validation->cc('6011802876467237', 'all', true));
+		$this->assertTrue(Validation::cc('6011802876467237', 'all', true));
 		//enRoute
-		$this->assertTrue($this->Validation->cc('201496944158937', 'all', true));
+		$this->assertTrue(Validation::cc('201496944158937', 'all', true));
 		//JCB 15 digit
-		$this->assertTrue($this->Validation->cc('210034762247893', 'all', true));
+		$this->assertTrue(Validation::cc('210034762247893', 'all', true));
 		//JCB 16 digit
-		$this->assertTrue($this->Validation->cc('3096806857839939', 'all', true));
+		$this->assertTrue(Validation::cc('3096806857839939', 'all', true));
 		//Maestro (debit card)
-		$this->assertTrue($this->Validation->cc('5020147409985219', 'all', true));
+		$this->assertTrue(Validation::cc('5020147409985219', 'all', true));
 		//Mastercard
-		$this->assertTrue($this->Validation->cc('5580424361774366', 'all', true));
+		$this->assertTrue(Validation::cc('5580424361774366', 'all', true));
 		//Solo 16
-		$this->assertTrue($this->Validation->cc('6767432107064987', 'all', true));
+		$this->assertTrue(Validation::cc('6767432107064987', 'all', true));
 		//Solo 18
-		$this->assertTrue($this->Validation->cc('676714834398858593', 'all', true));
+		$this->assertTrue(Validation::cc('676714834398858593', 'all', true));
 		//Solo 19
-		$this->assertTrue($this->Validation->cc('6767838565218340113', 'all', true));
+		$this->assertTrue(Validation::cc('6767838565218340113', 'all', true));
 		//Switch 16
-		$this->assertTrue($this->Validation->cc('5641829171515733', 'all', true));
+		$this->assertTrue(Validation::cc('5641829171515733', 'all', true));
 		//Switch 18
-		$this->assertTrue($this->Validation->cc('493622764224625174', 'all', true));
+		$this->assertTrue(Validation::cc('493622764224625174', 'all', true));
 		//Switch 19
-		$this->assertTrue($this->Validation->cc('6759603460617628716', 'all', true));
+		$this->assertTrue(Validation::cc('6759603460617628716', 'all', true));
 		//VISA 13 digit
-		$this->assertTrue($this->Validation->cc('4024007174754', 'all', true));
+		$this->assertTrue(Validation::cc('4024007174754', 'all', true));
 		//VISA 16 digit
-		$this->assertTrue($this->Validation->cc('4916375389940009', 'all', true));
+		$this->assertTrue(Validation::cc('4916375389940009', 'all', true));
 		//Visa Electron
-		$this->assertTrue($this->Validation->cc('4175003346287100', 'all', true));
+		$this->assertTrue(Validation::cc('4175003346287100', 'all', true));
 		//Voyager
-		$this->assertTrue($this->Validation->cc('869940697287073', 'all', true));
+		$this->assertTrue(Validation::cc('869940697287073', 'all', true));
 	}
 
 	function testComparison() {
-		$this->assertTrue($this->Validation->comparison(7, 'is greater', 6));
-		$this->assertTrue($this->Validation->comparison(7, '>', 6));
-		$this->assertTrue($this->Validation->comparison(6, 'is less', 7));
-		$this->assertTrue($this->Validation->comparison(6, '<', 7));
-		$this->assertTrue($this->Validation->comparison(7, 'greater or equal', 7));
-		$this->assertTrue($this->Validation->comparison(7, '>=', 7));
-		$this->assertTrue($this->Validation->comparison(7, 'greater or equal', 6));
-		$this->assertTrue($this->Validation->comparison(7, '>=', 6));
-		$this->assertTrue($this->Validation->comparison(6, 'less or equal', 7));
-		$this->assertTrue($this->Validation->comparison(6, '<=', 7));
-		$this->assertTrue($this->Validation->comparison(7, 'equal to', 7));
-		$this->assertTrue($this->Validation->comparison(7, '==', 7));
-		$this->assertTrue($this->Validation->comparison(7, 'not equal', 6));
-		$this->assertTrue($this->Validation->comparison(7, '!=', 6));
-		$this->assertFalse($this->Validation->comparison(6, 'is greater', 7));
-		$this->assertFalse($this->Validation->comparison(6, '>', 7));
-		$this->assertFalse($this->Validation->comparison(7, 'is less', 6));
-		$this->assertFalse($this->Validation->comparison(7, '<', 6));
-		$this->assertFalse($this->Validation->comparison(6, 'greater or equal', 7));
-		$this->assertFalse($this->Validation->comparison(6, '>=', 7));
-		$this->assertFalse($this->Validation->comparison(6, 'greater or equal', 7));
-		$this->assertFalse($this->Validation->comparison(6, '>=', 7));
-		$this->assertFalse($this->Validation->comparison(7, 'less or equal', 6));
-		$this->assertFalse($this->Validation->comparison(7, '<=', 6));
-		$this->assertFalse($this->Validation->comparison(7, 'equal to', 6));
-		$this->assertFalse($this->Validation->comparison(7, '==', 6));
-		$this->assertFalse($this->Validation->comparison(7, 'not equal', 7));
-		$this->assertFalse($this->Validation->comparison(7, '!=', 7));
+		$this->assertTrue(Validation::comparison(7, 'is greater', 6));
+		$this->assertTrue(Validation::comparison(7, '>', 6));
+		$this->assertTrue(Validation::comparison(6, 'is less', 7));
+		$this->assertTrue(Validation::comparison(6, '<', 7));
+		$this->assertTrue(Validation::comparison(7, 'greater or equal', 7));
+		$this->assertTrue(Validation::comparison(7, '>=', 7));
+		$this->assertTrue(Validation::comparison(7, 'greater or equal', 6));
+		$this->assertTrue(Validation::comparison(7, '>=', 6));
+		$this->assertTrue(Validation::comparison(6, 'less or equal', 7));
+		$this->assertTrue(Validation::comparison(6, '<=', 7));
+		$this->assertTrue(Validation::comparison(7, 'equal to', 7));
+		$this->assertTrue(Validation::comparison(7, '==', 7));
+		$this->assertTrue(Validation::comparison(7, 'not equal', 6));
+		$this->assertTrue(Validation::comparison(7, '!=', 6));
+		$this->assertFalse(Validation::comparison(6, 'is greater', 7));
+		$this->assertFalse(Validation::comparison(6, '>', 7));
+		$this->assertFalse(Validation::comparison(7, 'is less', 6));
+		$this->assertFalse(Validation::comparison(7, '<', 6));
+		$this->assertFalse(Validation::comparison(6, 'greater or equal', 7));
+		$this->assertFalse(Validation::comparison(6, '>=', 7));
+		$this->assertFalse(Validation::comparison(6, 'greater or equal', 7));
+		$this->assertFalse(Validation::comparison(6, '>=', 7));
+		$this->assertFalse(Validation::comparison(7, 'less or equal', 6));
+		$this->assertFalse(Validation::comparison(7, '<=', 6));
+		$this->assertFalse(Validation::comparison(7, 'equal to', 6));
+		$this->assertFalse(Validation::comparison(7, '==', 6));
+		$this->assertFalse(Validation::comparison(7, 'not equal', 7));
+		$this->assertFalse(Validation::comparison(7, '!=', 7));
 	}
 
 	function testComparisonAsArray() {
-		$this->assertTrue($this->Validation->comparison(array('check1' => 7, 'operator' => 'is greater', 'check2' => 6)));
-		$this->assertTrue($this->Validation->comparison(array('check1' => 7, 'operator' => '>', 'check2' => 6)));
-		$this->assertTrue($this->Validation->comparison(array('check1' => 6, 'operator' => 'is less', 'check2' => 7)));
-		$this->assertTrue($this->Validation->comparison(array('check1' => 6, 'operator' => '<', 'check2' => 7)));
-		$this->assertTrue($this->Validation->comparison(array('check1' => 7, 'operator' => 'greater or equal', 'check2' => 7)));
-		$this->assertTrue($this->Validation->comparison(array('check1' => 7, 'operator' => '>=', 'check2' => 7)));
-		$this->assertTrue($this->Validation->comparison(array('check1' => 7, 'operator' => 'greater or equal','check2' =>  6)));
-		$this->assertTrue($this->Validation->comparison(array('check1' => 7, 'operator' => '>=', 'check2' => 6)));
-		$this->assertTrue($this->Validation->comparison(array('check1' => 6, 'operator' => 'less or equal', 'check2' => 7)));
-		$this->assertTrue($this->Validation->comparison(array('check1' => 6, 'operator' => '<=', 'check2' => 7)));
-		$this->assertTrue($this->Validation->comparison(array('check1' => 7, 'operator' => 'equal to', 'check2' => 7)));
-		$this->assertTrue($this->Validation->comparison(array('check1' => 7, 'operator' => '==', 'check2' => 7)));
-		$this->assertTrue($this->Validation->comparison(array('check1' => 7, 'operator' => 'not equal', 'check2' => 6)));
-		$this->assertTrue($this->Validation->comparison(array('check1' => 7, 'operator' => '!=', 'check2' => 6)));
-		$this->assertFalse($this->Validation->comparison(array('check1' => 6, 'operator' => 'is greater', 'check2' => 7)));
-		$this->assertFalse($this->Validation->comparison(array('check1' => 6, 'operator' => '>', 'check2' => 7)));
-		$this->assertFalse($this->Validation->comparison(array('check1' => 7, 'operator' => 'is less', 'check2' => 6)));
-		$this->assertFalse($this->Validation->comparison(array('check1' => 7, 'operator' => '<', 'check2' => 6)));
-		$this->assertFalse($this->Validation->comparison(array('check1' => 6, 'operator' => 'greater or equal', 'check2' => 7)));
-		$this->assertFalse($this->Validation->comparison(array('check1' => 6, 'operator' => '>=', 'check2' => 7)));
-		$this->assertFalse($this->Validation->comparison(array('check1' => 6, 'operator' => 'greater or equal', 'check2' => 7)));
-		$this->assertFalse($this->Validation->comparison(array('check1' => 6, 'operator' => '>=', 'check2' => 7)));
-		$this->assertFalse($this->Validation->comparison(array('check1' => 7, 'operator' => 'less or equal', 'check2' => 6)));
-		$this->assertFalse($this->Validation->comparison(array('check1' => 7, 'operator' => '<=', 'check2' => 6)));
-		$this->assertFalse($this->Validation->comparison(array('check1' => 7, 'operator' => 'equal to', 'check2' => 6)));
-		$this->assertFalse($this->Validation->comparison(array('check1' => 7, 'operator' => '==','check2' =>  6)));
-		$this->assertFalse($this->Validation->comparison(array('check1' => 7, 'operator' => 'not equal', 'check2' => 7)));
-		$this->assertFalse($this->Validation->comparison(array('check1' => 7, 'operator' => '!=', 'check2' => 7)));
+		$this->assertTrue(Validation::comparison(array('check1' => 7, 'operator' => 'is greater', 'check2' => 6)));
+		$this->assertTrue(Validation::comparison(array('check1' => 7, 'operator' => '>', 'check2' => 6)));
+		$this->assertTrue(Validation::comparison(array('check1' => 6, 'operator' => 'is less', 'check2' => 7)));
+		$this->assertTrue(Validation::comparison(array('check1' => 6, 'operator' => '<', 'check2' => 7)));
+		$this->assertTrue(Validation::comparison(array('check1' => 7, 'operator' => 'greater or equal', 'check2' => 7)));
+		$this->assertTrue(Validation::comparison(array('check1' => 7, 'operator' => '>=', 'check2' => 7)));
+		$this->assertTrue(Validation::comparison(array('check1' => 7, 'operator' => 'greater or equal','check2' =>  6)));
+		$this->assertTrue(Validation::comparison(array('check1' => 7, 'operator' => '>=', 'check2' => 6)));
+		$this->assertTrue(Validation::comparison(array('check1' => 6, 'operator' => 'less or equal', 'check2' => 7)));
+		$this->assertTrue(Validation::comparison(array('check1' => 6, 'operator' => '<=', 'check2' => 7)));
+		$this->assertTrue(Validation::comparison(array('check1' => 7, 'operator' => 'equal to', 'check2' => 7)));
+		$this->assertTrue(Validation::comparison(array('check1' => 7, 'operator' => '==', 'check2' => 7)));
+		$this->assertTrue(Validation::comparison(array('check1' => 7, 'operator' => 'not equal', 'check2' => 6)));
+		$this->assertTrue(Validation::comparison(array('check1' => 7, 'operator' => '!=', 'check2' => 6)));
+		$this->assertFalse(Validation::comparison(array('check1' => 6, 'operator' => 'is greater', 'check2' => 7)));
+		$this->assertFalse(Validation::comparison(array('check1' => 6, 'operator' => '>', 'check2' => 7)));
+		$this->assertFalse(Validation::comparison(array('check1' => 7, 'operator' => 'is less', 'check2' => 6)));
+		$this->assertFalse(Validation::comparison(array('check1' => 7, 'operator' => '<', 'check2' => 6)));
+		$this->assertFalse(Validation::comparison(array('check1' => 6, 'operator' => 'greater or equal', 'check2' => 7)));
+		$this->assertFalse(Validation::comparison(array('check1' => 6, 'operator' => '>=', 'check2' => 7)));
+		$this->assertFalse(Validation::comparison(array('check1' => 6, 'operator' => 'greater or equal', 'check2' => 7)));
+		$this->assertFalse(Validation::comparison(array('check1' => 6, 'operator' => '>=', 'check2' => 7)));
+		$this->assertFalse(Validation::comparison(array('check1' => 7, 'operator' => 'less or equal', 'check2' => 6)));
+		$this->assertFalse(Validation::comparison(array('check1' => 7, 'operator' => '<=', 'check2' => 6)));
+		$this->assertFalse(Validation::comparison(array('check1' => 7, 'operator' => 'equal to', 'check2' => 6)));
+		$this->assertFalse(Validation::comparison(array('check1' => 7, 'operator' => '==','check2' =>  6)));
+		$this->assertFalse(Validation::comparison(array('check1' => 7, 'operator' => 'not equal', 'check2' => 7)));
+		$this->assertFalse(Validation::comparison(array('check1' => 7, 'operator' => '!=', 'check2' => 7)));
 	}
 
 	function testCustom() {
-		$this->assertTrue($this->Validation->custom('12345', '/(?<!\\S)\\d++(?!\\S)/'));
-		$this->assertFalse($this->Validation->custom('Text', '/(?<!\\S)\\d++(?!\\S)/'));
-		$this->assertFalse($this->Validation->custom('123.45', '/(?<!\\S)\\d++(?!\\S)/'));
+		$this->assertTrue(Validation::custom('12345', '/(?<!\\S)\\d++(?!\\S)/'));
+		$this->assertFalse(Validation::custom('Text', '/(?<!\\S)\\d++(?!\\S)/'));
+		$this->assertFalse(Validation::custom('123.45', '/(?<!\\S)\\d++(?!\\S)/'));
 	}
 
 	function testCustomAsArray() {
-		$this->assertTrue($this->Validation->custom(array('check' => '12345', 'regex' => '/(?<!\\S)\\d++(?!\\S)/')));
-		$this->assertFalse($this->Validation->custom(array('check' => 'Text', 'regex' => '/(?<!\\S)\\d++(?!\\S)/')));
-		$this->assertFalse($this->Validation->custom(array('check' => '123.45', 'regex' => '/(?<!\\S)\\d++(?!\\S)/')));
+		$this->assertTrue(Validation::custom(array('check' => '12345', 'regex' => '/(?<!\\S)\\d++(?!\\S)/')));
+		$this->assertFalse(Validation::custom(array('check' => 'Text', 'regex' => '/(?<!\\S)\\d++(?!\\S)/')));
+		$this->assertFalse(Validation::custom(array('check' => '123.45', 'regex' => '/(?<!\\S)\\d++(?!\\S)/')));
 	}
 
 	function testDateDdmmyyyy() {
-		$this->assertTrue($this->Validation->date('27-12-2006', array('dmy')));
-		$this->assertTrue($this->Validation->date('27.12.2006', array('dmy')));
-		$this->assertTrue($this->Validation->date('27/12/2006', array('dmy')));
-		$this->assertTrue($this->Validation->date('27 12 2006', array('dmy')));
-		$this->assertFalse($this->Validation->date('00-00-0000', array('dmy')));
-		$this->assertFalse($this->Validation->date('00.00.0000', array('dmy')));
-		$this->assertFalse($this->Validation->date('00/00/0000', array('dmy')));
-		$this->assertFalse($this->Validation->date('00 00 0000', array('dmy')));
-		$this->assertFalse($this->Validation->date('31-11-2006', array('dmy')));
-		$this->assertFalse($this->Validation->date('31.11.2006', array('dmy')));
-		$this->assertFalse($this->Validation->date('31/11/2006', array('dmy')));
-		$this->assertFalse($this->Validation->date('31 11 2006', array('dmy')));
+		$this->assertTrue(Validation::date('27-12-2006', array('dmy')));
+		$this->assertTrue(Validation::date('27.12.2006', array('dmy')));
+		$this->assertTrue(Validation::date('27/12/2006', array('dmy')));
+		$this->assertTrue(Validation::date('27 12 2006', array('dmy')));
+		$this->assertFalse(Validation::date('00-00-0000', array('dmy')));
+		$this->assertFalse(Validation::date('00.00.0000', array('dmy')));
+		$this->assertFalse(Validation::date('00/00/0000', array('dmy')));
+		$this->assertFalse(Validation::date('00 00 0000', array('dmy')));
+		$this->assertFalse(Validation::date('31-11-2006', array('dmy')));
+		$this->assertFalse(Validation::date('31.11.2006', array('dmy')));
+		$this->assertFalse(Validation::date('31/11/2006', array('dmy')));
+		$this->assertFalse(Validation::date('31 11 2006', array('dmy')));
 	}
 
 	function testDateDdmmyyyyLeapYear() {
-		$this->assertTrue($this->Validation->date('29-02-2004', array('dmy')));
-		$this->assertTrue($this->Validation->date('29.02.2004', array('dmy')));
-		$this->assertTrue($this->Validation->date('29/02/2004', array('dmy')));
-		$this->assertTrue($this->Validation->date('29 02 2004', array('dmy')));
-		$this->assertFalse($this->Validation->date('29-02-2006', array('dmy')));
-		$this->assertFalse($this->Validation->date('29.02.2006', array('dmy')));
-		$this->assertFalse($this->Validation->date('29/02/2006', array('dmy')));
-		$this->assertFalse($this->Validation->date('29 02 2006', array('dmy')));
+		$this->assertTrue(Validation::date('29-02-2004', array('dmy')));
+		$this->assertTrue(Validation::date('29.02.2004', array('dmy')));
+		$this->assertTrue(Validation::date('29/02/2004', array('dmy')));
+		$this->assertTrue(Validation::date('29 02 2004', array('dmy')));
+		$this->assertFalse(Validation::date('29-02-2006', array('dmy')));
+		$this->assertFalse(Validation::date('29.02.2006', array('dmy')));
+		$this->assertFalse(Validation::date('29/02/2006', array('dmy')));
+		$this->assertFalse(Validation::date('29 02 2006', array('dmy')));
 	}
 
 	function testDateDdmmyy() {
-		$this->assertTrue($this->Validation->date('27-12-06', array('dmy')));
-		$this->assertTrue($this->Validation->date('27.12.06', array('dmy')));
-		$this->assertTrue($this->Validation->date('27/12/06', array('dmy')));
-		$this->assertTrue($this->Validation->date('27 12 06', array('dmy')));
-		$this->assertFalse($this->Validation->date('00-00-00', array('dmy')));
-		$this->assertFalse($this->Validation->date('00.00.00', array('dmy')));
-		$this->assertFalse($this->Validation->date('00/00/00', array('dmy')));
-		$this->assertFalse($this->Validation->date('00 00 00', array('dmy')));
-		$this->assertFalse($this->Validation->date('31-11-06', array('dmy')));
-		$this->assertFalse($this->Validation->date('31.11.06', array('dmy')));
-		$this->assertFalse($this->Validation->date('31/11/06', array('dmy')));
-		$this->assertFalse($this->Validation->date('31 11 06', array('dmy')));
+		$this->assertTrue(Validation::date('27-12-06', array('dmy')));
+		$this->assertTrue(Validation::date('27.12.06', array('dmy')));
+		$this->assertTrue(Validation::date('27/12/06', array('dmy')));
+		$this->assertTrue(Validation::date('27 12 06', array('dmy')));
+		$this->assertFalse(Validation::date('00-00-00', array('dmy')));
+		$this->assertFalse(Validation::date('00.00.00', array('dmy')));
+		$this->assertFalse(Validation::date('00/00/00', array('dmy')));
+		$this->assertFalse(Validation::date('00 00 00', array('dmy')));
+		$this->assertFalse(Validation::date('31-11-06', array('dmy')));
+		$this->assertFalse(Validation::date('31.11.06', array('dmy')));
+		$this->assertFalse(Validation::date('31/11/06', array('dmy')));
+		$this->assertFalse(Validation::date('31 11 06', array('dmy')));
 	}
 
 	function testDateDdmmyyLeapYear() {
-		$this->assertTrue($this->Validation->date('29-02-04', array('dmy')));
-		$this->assertTrue($this->Validation->date('29.02.04', array('dmy')));
-		$this->assertTrue($this->Validation->date('29/02/04', array('dmy')));
-		$this->assertTrue($this->Validation->date('29 02 04', array('dmy')));
-		$this->assertFalse($this->Validation->date('29-02-06', array('dmy')));
-		$this->assertFalse($this->Validation->date('29.02.06', array('dmy')));
-		$this->assertFalse($this->Validation->date('29/02/06', array('dmy')));
-		$this->assertFalse($this->Validation->date('29 02 06', array('dmy')));
+		$this->assertTrue(Validation::date('29-02-04', array('dmy')));
+		$this->assertTrue(Validation::date('29.02.04', array('dmy')));
+		$this->assertTrue(Validation::date('29/02/04', array('dmy')));
+		$this->assertTrue(Validation::date('29 02 04', array('dmy')));
+		$this->assertFalse(Validation::date('29-02-06', array('dmy')));
+		$this->assertFalse(Validation::date('29.02.06', array('dmy')));
+		$this->assertFalse(Validation::date('29/02/06', array('dmy')));
+		$this->assertFalse(Validation::date('29 02 06', array('dmy')));
 	}
 
 	function testDateDmyy() {
-		$this->assertTrue($this->Validation->date('7-2-06', array('dmy')));
-		$this->assertTrue($this->Validation->date('7.2.06', array('dmy')));
-		$this->assertTrue($this->Validation->date('7/2/06', array('dmy')));
-		$this->assertTrue($this->Validation->date('7 2 06', array('dmy')));
-		$this->assertFalse($this->Validation->date('0-0-00', array('dmy')));
-		$this->assertFalse($this->Validation->date('0.0.00', array('dmy')));
-		$this->assertFalse($this->Validation->date('0/0/00', array('dmy')));
-		$this->assertFalse($this->Validation->date('0 0 00', array('dmy')));
-		$this->assertFalse($this->Validation->date('32-2-06', array('dmy')));
-		$this->assertFalse($this->Validation->date('32.2.06', array('dmy')));
-		$this->assertFalse($this->Validation->date('32/2/06', array('dmy')));
-		$this->assertFalse($this->Validation->date('32 2 06', array('dmy')));
+		$this->assertTrue(Validation::date('7-2-06', array('dmy')));
+		$this->assertTrue(Validation::date('7.2.06', array('dmy')));
+		$this->assertTrue(Validation::date('7/2/06', array('dmy')));
+		$this->assertTrue(Validation::date('7 2 06', array('dmy')));
+		$this->assertFalse(Validation::date('0-0-00', array('dmy')));
+		$this->assertFalse(Validation::date('0.0.00', array('dmy')));
+		$this->assertFalse(Validation::date('0/0/00', array('dmy')));
+		$this->assertFalse(Validation::date('0 0 00', array('dmy')));
+		$this->assertFalse(Validation::date('32-2-06', array('dmy')));
+		$this->assertFalse(Validation::date('32.2.06', array('dmy')));
+		$this->assertFalse(Validation::date('32/2/06', array('dmy')));
+		$this->assertFalse(Validation::date('32 2 06', array('dmy')));
 	}
 
 	function testDateDmyyLeapYear() {
-		$this->assertTrue($this->Validation->date('29-2-04', array('dmy')));
-		$this->assertTrue($this->Validation->date('29.2.04', array('dmy')));
-		$this->assertTrue($this->Validation->date('29/2/04', array('dmy')));
-		$this->assertTrue($this->Validation->date('29 2 04', array('dmy')));
-		$this->assertFalse($this->Validation->date('29-2-06', array('dmy')));
-		$this->assertFalse($this->Validation->date('29.2.06', array('dmy')));
-		$this->assertFalse($this->Validation->date('29/2/06', array('dmy')));
-		$this->assertFalse($this->Validation->date('29 2 06', array('dmy')));
+		$this->assertTrue(Validation::date('29-2-04', array('dmy')));
+		$this->assertTrue(Validation::date('29.2.04', array('dmy')));
+		$this->assertTrue(Validation::date('29/2/04', array('dmy')));
+		$this->assertTrue(Validation::date('29 2 04', array('dmy')));
+		$this->assertFalse(Validation::date('29-2-06', array('dmy')));
+		$this->assertFalse(Validation::date('29.2.06', array('dmy')));
+		$this->assertFalse(Validation::date('29/2/06', array('dmy')));
+		$this->assertFalse(Validation::date('29 2 06', array('dmy')));
 	}
 
 	function testDateDmyyyy() {
-		$this->assertTrue($this->Validation->date('7-2-2006', array('dmy')));
-		$this->assertTrue($this->Validation->date('7.2.2006', array('dmy')));
-		$this->assertTrue($this->Validation->date('7/2/2006', array('dmy')));
-		$this->assertTrue($this->Validation->date('7 2 2006', array('dmy')));
-		$this->assertFalse($this->Validation->date('0-0-0000', array('dmy')));
-		$this->assertFalse($this->Validation->date('0.0.0000', array('dmy')));
-		$this->assertFalse($this->Validation->date('0/0/0000', array('dmy')));
-		$this->assertFalse($this->Validation->date('0 0 0000', array('dmy')));
-		$this->assertFalse($this->Validation->date('32-2-2006', array('dmy')));
-		$this->assertFalse($this->Validation->date('32.2.2006', array('dmy')));
-		$this->assertFalse($this->Validation->date('32/2/2006', array('dmy')));
-		$this->assertFalse($this->Validation->date('32 2 2006', array('dmy')));
+		$this->assertTrue(Validation::date('7-2-2006', array('dmy')));
+		$this->assertTrue(Validation::date('7.2.2006', array('dmy')));
+		$this->assertTrue(Validation::date('7/2/2006', array('dmy')));
+		$this->assertTrue(Validation::date('7 2 2006', array('dmy')));
+		$this->assertFalse(Validation::date('0-0-0000', array('dmy')));
+		$this->assertFalse(Validation::date('0.0.0000', array('dmy')));
+		$this->assertFalse(Validation::date('0/0/0000', array('dmy')));
+		$this->assertFalse(Validation::date('0 0 0000', array('dmy')));
+		$this->assertFalse(Validation::date('32-2-2006', array('dmy')));
+		$this->assertFalse(Validation::date('32.2.2006', array('dmy')));
+		$this->assertFalse(Validation::date('32/2/2006', array('dmy')));
+		$this->assertFalse(Validation::date('32 2 2006', array('dmy')));
 	}
 
 	function testDateDmyyyyLeapYear() {
-		$this->assertTrue($this->Validation->date('29-2-2004', array('dmy')));
-		$this->assertTrue($this->Validation->date('29.2.2004', array('dmy')));
-		$this->assertTrue($this->Validation->date('29/2/2004', array('dmy')));
-		$this->assertTrue($this->Validation->date('29 2 2004', array('dmy')));
-		$this->assertFalse($this->Validation->date('29-2-2006', array('dmy')));
-		$this->assertFalse($this->Validation->date('29.2.2006', array('dmy')));
-		$this->assertFalse($this->Validation->date('29/2/2006', array('dmy')));
-		$this->assertFalse($this->Validation->date('29 2 2006', array('dmy')));
+		$this->assertTrue(Validation::date('29-2-2004', array('dmy')));
+		$this->assertTrue(Validation::date('29.2.2004', array('dmy')));
+		$this->assertTrue(Validation::date('29/2/2004', array('dmy')));
+		$this->assertTrue(Validation::date('29 2 2004', array('dmy')));
+		$this->assertFalse(Validation::date('29-2-2006', array('dmy')));
+		$this->assertFalse(Validation::date('29.2.2006', array('dmy')));
+		$this->assertFalse(Validation::date('29/2/2006', array('dmy')));
+		$this->assertFalse(Validation::date('29 2 2006', array('dmy')));
 	}
 
 	function testDateMmddyyyy() {
-		$this->assertTrue($this->Validation->date('12-27-2006', array('mdy')));
-		$this->assertTrue($this->Validation->date('12.27.2006', array('mdy')));
-		$this->assertTrue($this->Validation->date('12/27/2006', array('mdy')));
-		$this->assertTrue($this->Validation->date('12 27 2006', array('mdy')));
-		$this->assertFalse($this->Validation->date('00-00-0000', array('mdy')));
-		$this->assertFalse($this->Validation->date('00.00.0000', array('mdy')));
-		$this->assertFalse($this->Validation->date('00/00/0000', array('mdy')));
-		$this->assertFalse($this->Validation->date('00 00 0000', array('mdy')));
-		$this->assertFalse($this->Validation->date('11-31-2006', array('mdy')));
-		$this->assertFalse($this->Validation->date('11.31.2006', array('mdy')));
-		$this->assertFalse($this->Validation->date('11/31/2006', array('mdy')));
-		$this->assertFalse($this->Validation->date('11 31 2006', array('mdy')));
+		$this->assertTrue(Validation::date('12-27-2006', array('mdy')));
+		$this->assertTrue(Validation::date('12.27.2006', array('mdy')));
+		$this->assertTrue(Validation::date('12/27/2006', array('mdy')));
+		$this->assertTrue(Validation::date('12 27 2006', array('mdy')));
+		$this->assertFalse(Validation::date('00-00-0000', array('mdy')));
+		$this->assertFalse(Validation::date('00.00.0000', array('mdy')));
+		$this->assertFalse(Validation::date('00/00/0000', array('mdy')));
+		$this->assertFalse(Validation::date('00 00 0000', array('mdy')));
+		$this->assertFalse(Validation::date('11-31-2006', array('mdy')));
+		$this->assertFalse(Validation::date('11.31.2006', array('mdy')));
+		$this->assertFalse(Validation::date('11/31/2006', array('mdy')));
+		$this->assertFalse(Validation::date('11 31 2006', array('mdy')));
 	}
 
 	function testDateMmddyyyyLeapYear() {
-		$this->assertTrue($this->Validation->date('02-29-2004', array('mdy')));
-		$this->assertTrue($this->Validation->date('02.29.2004', array('mdy')));
-		$this->assertTrue($this->Validation->date('02/29/2004', array('mdy')));
-		$this->assertTrue($this->Validation->date('02 29 2004', array('mdy')));
-		$this->assertFalse($this->Validation->date('02-29-2006', array('mdy')));
-		$this->assertFalse($this->Validation->date('02.29.2006', array('mdy')));
-		$this->assertFalse($this->Validation->date('02/29/2006', array('mdy')));
-		$this->assertFalse($this->Validation->date('02 29 2006', array('mdy')));
+		$this->assertTrue(Validation::date('02-29-2004', array('mdy')));
+		$this->assertTrue(Validation::date('02.29.2004', array('mdy')));
+		$this->assertTrue(Validation::date('02/29/2004', array('mdy')));
+		$this->assertTrue(Validation::date('02 29 2004', array('mdy')));
+		$this->assertFalse(Validation::date('02-29-2006', array('mdy')));
+		$this->assertFalse(Validation::date('02.29.2006', array('mdy')));
+		$this->assertFalse(Validation::date('02/29/2006', array('mdy')));
+		$this->assertFalse(Validation::date('02 29 2006', array('mdy')));
 	}
 
 	function testDateMmddyy() {
-		$this->assertTrue($this->Validation->date('12-27-06', array('mdy')));
-		$this->assertTrue($this->Validation->date('12.27.06', array('mdy')));
-		$this->assertTrue($this->Validation->date('12/27/06', array('mdy')));
-		$this->assertTrue($this->Validation->date('12 27 06', array('mdy')));
-		$this->assertFalse($this->Validation->date('00-00-00', array('mdy')));
-		$this->assertFalse($this->Validation->date('00.00.00', array('mdy')));
-		$this->assertFalse($this->Validation->date('00/00/00', array('mdy')));
-		$this->assertFalse($this->Validation->date('00 00 00', array('mdy')));
-		$this->assertFalse($this->Validation->date('11-31-06', array('mdy')));
-		$this->assertFalse($this->Validation->date('11.31.06', array('mdy')));
-		$this->assertFalse($this->Validation->date('11/31/06', array('mdy')));
-		$this->assertFalse($this->Validation->date('11 31 06', array('mdy')));
+		$this->assertTrue(Validation::date('12-27-06', array('mdy')));
+		$this->assertTrue(Validation::date('12.27.06', array('mdy')));
+		$this->assertTrue(Validation::date('12/27/06', array('mdy')));
+		$this->assertTrue(Validation::date('12 27 06', array('mdy')));
+		$this->assertFalse(Validation::date('00-00-00', array('mdy')));
+		$this->assertFalse(Validation::date('00.00.00', array('mdy')));
+		$this->assertFalse(Validation::date('00/00/00', array('mdy')));
+		$this->assertFalse(Validation::date('00 00 00', array('mdy')));
+		$this->assertFalse(Validation::date('11-31-06', array('mdy')));
+		$this->assertFalse(Validation::date('11.31.06', array('mdy')));
+		$this->assertFalse(Validation::date('11/31/06', array('mdy')));
+		$this->assertFalse(Validation::date('11 31 06', array('mdy')));
 	}
 
 	function testDateMmddyyLeapYear() {
-		$this->assertTrue($this->Validation->date('02-29-04', array('mdy')));
-		$this->assertTrue($this->Validation->date('02.29.04', array('mdy')));
-		$this->assertTrue($this->Validation->date('02/29/04', array('mdy')));
-		$this->assertTrue($this->Validation->date('02 29 04', array('mdy')));
-		$this->assertFalse($this->Validation->date('02-29-06', array('mdy')));
-		$this->assertFalse($this->Validation->date('02.29.06', array('mdy')));
-		$this->assertFalse($this->Validation->date('02/29/06', array('mdy')));
-		$this->assertFalse($this->Validation->date('02 29 06', array('mdy')));
+		$this->assertTrue(Validation::date('02-29-04', array('mdy')));
+		$this->assertTrue(Validation::date('02.29.04', array('mdy')));
+		$this->assertTrue(Validation::date('02/29/04', array('mdy')));
+		$this->assertTrue(Validation::date('02 29 04', array('mdy')));
+		$this->assertFalse(Validation::date('02-29-06', array('mdy')));
+		$this->assertFalse(Validation::date('02.29.06', array('mdy')));
+		$this->assertFalse(Validation::date('02/29/06', array('mdy')));
+		$this->assertFalse(Validation::date('02 29 06', array('mdy')));
 	}
 
 	function testDateMdyy() {
-		$this->assertTrue($this->Validation->date('2-7-06', array('mdy')));
-		$this->assertTrue($this->Validation->date('2.7.06', array('mdy')));
-		$this->assertTrue($this->Validation->date('2/7/06', array('mdy')));
-		$this->assertTrue($this->Validation->date('2 7 06', array('mdy')));
-		$this->assertFalse($this->Validation->date('0-0-00', array('mdy')));
-		$this->assertFalse($this->Validation->date('0.0.00', array('mdy')));
-		$this->assertFalse($this->Validation->date('0/0/00', array('mdy')));
-		$this->assertFalse($this->Validation->date('0 0 00', array('mdy')));
-		$this->assertFalse($this->Validation->date('2-32-06', array('mdy')));
-		$this->assertFalse($this->Validation->date('2.32.06', array('mdy')));
-		$this->assertFalse($this->Validation->date('2/32/06', array('mdy')));
-		$this->assertFalse($this->Validation->date('2 32 06', array('mdy')));
+		$this->assertTrue(Validation::date('2-7-06', array('mdy')));
+		$this->assertTrue(Validation::date('2.7.06', array('mdy')));
+		$this->assertTrue(Validation::date('2/7/06', array('mdy')));
+		$this->assertTrue(Validation::date('2 7 06', array('mdy')));
+		$this->assertFalse(Validation::date('0-0-00', array('mdy')));
+		$this->assertFalse(Validation::date('0.0.00', array('mdy')));
+		$this->assertFalse(Validation::date('0/0/00', array('mdy')));
+		$this->assertFalse(Validation::date('0 0 00', array('mdy')));
+		$this->assertFalse(Validation::date('2-32-06', array('mdy')));
+		$this->assertFalse(Validation::date('2.32.06', array('mdy')));
+		$this->assertFalse(Validation::date('2/32/06', array('mdy')));
+		$this->assertFalse(Validation::date('2 32 06', array('mdy')));
 	}
 
 	function testDateMdyyLeapYear() {
-		$this->assertTrue($this->Validation->date('2-29-04', array('mdy')));
-		$this->assertTrue($this->Validation->date('2.29.04', array('mdy')));
-		$this->assertTrue($this->Validation->date('2/29/04', array('mdy')));
-		$this->assertTrue($this->Validation->date('2 29 04', array('mdy')));
-		$this->assertFalse($this->Validation->date('2-29-06', array('mdy')));
-		$this->assertFalse($this->Validation->date('2.29.06', array('mdy')));
-		$this->assertFalse($this->Validation->date('2/29/06', array('mdy')));
-		$this->assertFalse($this->Validation->date('2 29 06', array('mdy')));
+		$this->assertTrue(Validation::date('2-29-04', array('mdy')));
+		$this->assertTrue(Validation::date('2.29.04', array('mdy')));
+		$this->assertTrue(Validation::date('2/29/04', array('mdy')));
+		$this->assertTrue(Validation::date('2 29 04', array('mdy')));
+		$this->assertFalse(Validation::date('2-29-06', array('mdy')));
+		$this->assertFalse(Validation::date('2.29.06', array('mdy')));
+		$this->assertFalse(Validation::date('2/29/06', array('mdy')));
+		$this->assertFalse(Validation::date('2 29 06', array('mdy')));
 	}
 
 	function testDateMdyyyy() {
-		$this->assertTrue($this->Validation->date('2-7-2006', array('mdy')));
-		$this->assertTrue($this->Validation->date('2.7.2006', array('mdy')));
-		$this->assertTrue($this->Validation->date('2/7/2006', array('mdy')));
-		$this->assertTrue($this->Validation->date('2 7 2006', array('mdy')));
-		$this->assertFalse($this->Validation->date('0-0-0000', array('mdy')));
-		$this->assertFalse($this->Validation->date('0.0.0000', array('mdy')));
-		$this->assertFalse($this->Validation->date('0/0/0000', array('mdy')));
-		$this->assertFalse($this->Validation->date('0 0 0000', array('mdy')));
-		$this->assertFalse($this->Validation->date('2-32-2006', array('mdy')));
-		$this->assertFalse($this->Validation->date('2.32.2006', array('mdy')));
-		$this->assertFalse($this->Validation->date('2/32/2006', array('mdy')));
-		$this->assertFalse($this->Validation->date('2 32 2006', array('mdy')));
+		$this->assertTrue(Validation::date('2-7-2006', array('mdy')));
+		$this->assertTrue(Validation::date('2.7.2006', array('mdy')));
+		$this->assertTrue(Validation::date('2/7/2006', array('mdy')));
+		$this->assertTrue(Validation::date('2 7 2006', array('mdy')));
+		$this->assertFalse(Validation::date('0-0-0000', array('mdy')));
+		$this->assertFalse(Validation::date('0.0.0000', array('mdy')));
+		$this->assertFalse(Validation::date('0/0/0000', array('mdy')));
+		$this->assertFalse(Validation::date('0 0 0000', array('mdy')));
+		$this->assertFalse(Validation::date('2-32-2006', array('mdy')));
+		$this->assertFalse(Validation::date('2.32.2006', array('mdy')));
+		$this->assertFalse(Validation::date('2/32/2006', array('mdy')));
+		$this->assertFalse(Validation::date('2 32 2006', array('mdy')));
 	}
 
 	function testDateMdyyyyLeapYear() {
-		$this->assertTrue($this->Validation->date('2-29-2004', array('mdy')));
-		$this->assertTrue($this->Validation->date('2.29.2004', array('mdy')));
-		$this->assertTrue($this->Validation->date('2/29/2004', array('mdy')));
-		$this->assertTrue($this->Validation->date('2 29 2004', array('mdy')));
-		$this->assertFalse($this->Validation->date('2-29-2006', array('mdy')));
-		$this->assertFalse($this->Validation->date('2.29.2006', array('mdy')));
-		$this->assertFalse($this->Validation->date('2/29/2006', array('mdy')));
-		$this->assertFalse($this->Validation->date('2 29 2006', array('mdy')));
+		$this->assertTrue(Validation::date('2-29-2004', array('mdy')));
+		$this->assertTrue(Validation::date('2.29.2004', array('mdy')));
+		$this->assertTrue(Validation::date('2/29/2004', array('mdy')));
+		$this->assertTrue(Validation::date('2 29 2004', array('mdy')));
+		$this->assertFalse(Validation::date('2-29-2006', array('mdy')));
+		$this->assertFalse(Validation::date('2.29.2006', array('mdy')));
+		$this->assertFalse(Validation::date('2/29/2006', array('mdy')));
+		$this->assertFalse(Validation::date('2 29 2006', array('mdy')));
 	}
 
 	function testDateYyyymmdd() {
-		$this->assertTrue($this->Validation->date('2006-12-27', array('ymd')));
-		$this->assertTrue($this->Validation->date('2006.12.27', array('ymd')));
-		$this->assertTrue($this->Validation->date('2006/12/27', array('ymd')));
-		$this->assertTrue($this->Validation->date('2006 12 27', array('ymd')));
-		$this->assertFalse($this->Validation->date('2006-11-31', array('ymd')));
-		$this->assertFalse($this->Validation->date('2006.11.31', array('ymd')));
-		$this->assertFalse($this->Validation->date('2006/11/31', array('ymd')));
-		$this->assertFalse($this->Validation->date('2006 11 31', array('ymd')));
+		$this->assertTrue(Validation::date('2006-12-27', array('ymd')));
+		$this->assertTrue(Validation::date('2006.12.27', array('ymd')));
+		$this->assertTrue(Validation::date('2006/12/27', array('ymd')));
+		$this->assertTrue(Validation::date('2006 12 27', array('ymd')));
+		$this->assertFalse(Validation::date('2006-11-31', array('ymd')));
+		$this->assertFalse(Validation::date('2006.11.31', array('ymd')));
+		$this->assertFalse(Validation::date('2006/11/31', array('ymd')));
+		$this->assertFalse(Validation::date('2006 11 31', array('ymd')));
 	}
 
 	function testDateYyyymmddLeapYear() {
-		$this->assertTrue($this->Validation->date('2004-02-29', array('ymd')));
-		$this->assertTrue($this->Validation->date('2004.02.29', array('ymd')));
-		$this->assertTrue($this->Validation->date('2004/02/29', array('ymd')));
-		$this->assertTrue($this->Validation->date('2004 02 29', array('ymd')));
-		$this->assertFalse($this->Validation->date('2006-02-29', array('ymd')));
-		$this->assertFalse($this->Validation->date('2006.02.29', array('ymd')));
-		$this->assertFalse($this->Validation->date('2006/02/29', array('ymd')));
-		$this->assertFalse($this->Validation->date('2006 02 29', array('ymd')));
+		$this->assertTrue(Validation::date('2004-02-29', array('ymd')));
+		$this->assertTrue(Validation::date('2004.02.29', array('ymd')));
+		$this->assertTrue(Validation::date('2004/02/29', array('ymd')));
+		$this->assertTrue(Validation::date('2004 02 29', array('ymd')));
+		$this->assertFalse(Validation::date('2006-02-29', array('ymd')));
+		$this->assertFalse(Validation::date('2006.02.29', array('ymd')));
+		$this->assertFalse(Validation::date('2006/02/29', array('ymd')));
+		$this->assertFalse(Validation::date('2006 02 29', array('ymd')));
 	}
 
 	function testDateYymmdd() {
-		$this->assertTrue($this->Validation->date('06-12-27', array('ymd')));
-		$this->assertTrue($this->Validation->date('06.12.27', array('ymd')));
-		$this->assertTrue($this->Validation->date('06/12/27', array('ymd')));
-		$this->assertTrue($this->Validation->date('06 12 27', array('ymd')));
-		$this->assertFalse($this->Validation->date('12/27/2600', array('ymd')));
-		$this->assertFalse($this->Validation->date('12.27.2600', array('ymd')));
-		$this->assertFalse($this->Validation->date('12/27/2600', array('ymd')));
-		$this->assertFalse($this->Validation->date('12 27 2600', array('ymd')));
-		$this->assertFalse($this->Validation->date('06-11-31', array('ymd')));
-		$this->assertFalse($this->Validation->date('06.11.31', array('ymd')));
-		$this->assertFalse($this->Validation->date('06/11/31', array('ymd')));
-		$this->assertFalse($this->Validation->date('06 11 31', array('ymd')));
+		$this->assertTrue(Validation::date('06-12-27', array('ymd')));
+		$this->assertTrue(Validation::date('06.12.27', array('ymd')));
+		$this->assertTrue(Validation::date('06/12/27', array('ymd')));
+		$this->assertTrue(Validation::date('06 12 27', array('ymd')));
+		$this->assertFalse(Validation::date('12/27/2600', array('ymd')));
+		$this->assertFalse(Validation::date('12.27.2600', array('ymd')));
+		$this->assertFalse(Validation::date('12/27/2600', array('ymd')));
+		$this->assertFalse(Validation::date('12 27 2600', array('ymd')));
+		$this->assertFalse(Validation::date('06-11-31', array('ymd')));
+		$this->assertFalse(Validation::date('06.11.31', array('ymd')));
+		$this->assertFalse(Validation::date('06/11/31', array('ymd')));
+		$this->assertFalse(Validation::date('06 11 31', array('ymd')));
 	}
 
 	function testDateYymmddLeapYear() {
-		$this->assertTrue($this->Validation->date('2004-02-29', array('ymd')));
-		$this->assertTrue($this->Validation->date('2004.02.29', array('ymd')));
-		$this->assertTrue($this->Validation->date('2004/02/29', array('ymd')));
-		$this->assertTrue($this->Validation->date('2004 02 29', array('ymd')));
-		$this->assertFalse($this->Validation->date('2006-02-29', array('ymd')));
-		$this->assertFalse($this->Validation->date('2006.02.29', array('ymd')));
-		$this->assertFalse($this->Validation->date('2006/02/29', array('ymd')));
-		$this->assertFalse($this->Validation->date('2006 02 29', array('ymd')));
+		$this->assertTrue(Validation::date('2004-02-29', array('ymd')));
+		$this->assertTrue(Validation::date('2004.02.29', array('ymd')));
+		$this->assertTrue(Validation::date('2004/02/29', array('ymd')));
+		$this->assertTrue(Validation::date('2004 02 29', array('ymd')));
+		$this->assertFalse(Validation::date('2006-02-29', array('ymd')));
+		$this->assertFalse(Validation::date('2006.02.29', array('ymd')));
+		$this->assertFalse(Validation::date('2006/02/29', array('ymd')));
+		$this->assertFalse(Validation::date('2006 02 29', array('ymd')));
 	}
 
 	function testDateDdMMMMyyyy() {
-		$this->assertTrue($this->Validation->date('27 December 2006', array('dMy')));
-		$this->assertTrue($this->Validation->date('27 Dec 2006', array('dMy')));
-		$this->assertFalse($this->Validation->date('2006 Dec 27', array('dMy')));
-		$this->assertFalse($this->Validation->date('2006 December 27', array('dMy')));
+		$this->assertTrue(Validation::date('27 December 2006', array('dMy')));
+		$this->assertTrue(Validation::date('27 Dec 2006', array('dMy')));
+		$this->assertFalse(Validation::date('2006 Dec 27', array('dMy')));
+		$this->assertFalse(Validation::date('2006 December 27', array('dMy')));
 	}
 
 	function testDateDdMMMMyyyyLeapYear() {
-		$this->assertTrue($this->Validation->date('29 February 2004', array('dMy')));
-		$this->assertFalse($this->Validation->date('29 February 2006', array('dMy')));
+		$this->assertTrue(Validation::date('29 February 2004', array('dMy')));
+		$this->assertFalse(Validation::date('29 February 2006', array('dMy')));
 	}
 
 	function testDateMmmmDdyyyy() {
-		$this->assertTrue($this->Validation->date('December 27, 2006', array('Mdy')));
-		$this->assertTrue($this->Validation->date('Dec 27, 2006', array('Mdy')));
-		$this->assertTrue($this->Validation->date('December 27 2006', array('Mdy')));
-		$this->assertTrue($this->Validation->date('Dec 27 2006', array('Mdy')));
-		$this->assertFalse($this->Validation->date('27 Dec 2006', array('Mdy')));
-		$this->assertFalse($this->Validation->date('2006 December 27', array('Mdy')));
+		$this->assertTrue(Validation::date('December 27, 2006', array('Mdy')));
+		$this->assertTrue(Validation::date('Dec 27, 2006', array('Mdy')));
+		$this->assertTrue(Validation::date('December 27 2006', array('Mdy')));
+		$this->assertTrue(Validation::date('Dec 27 2006', array('Mdy')));
+		$this->assertFalse(Validation::date('27 Dec 2006', array('Mdy')));
+		$this->assertFalse(Validation::date('2006 December 27', array('Mdy')));
 	}
 
 	function testDateMmmmDdyyyyLeapYear() {
-		$this->assertTrue($this->Validation->date('February 29, 2004', array('Mdy')));
-		$this->assertTrue($this->Validation->date('Feb 29, 2004', array('Mdy')));
-		$this->assertTrue($this->Validation->date('February 29 2004', array('Mdy')));
-		$this->assertTrue($this->Validation->date('Feb 29 2004', array('Mdy')));
-		$this->assertFalse($this->Validation->date('February 29, 2006', array('Mdy')));
+		$this->assertTrue(Validation::date('February 29, 2004', array('Mdy')));
+		$this->assertTrue(Validation::date('Feb 29, 2004', array('Mdy')));
+		$this->assertTrue(Validation::date('February 29 2004', array('Mdy')));
+		$this->assertTrue(Validation::date('Feb 29 2004', array('Mdy')));
+		$this->assertFalse(Validation::date('February 29, 2006', array('Mdy')));
 	}
 
 	function testDateMy() {
-		$this->assertTrue($this->Validation->date('December 2006', array('My')));
-		$this->assertTrue($this->Validation->date('Dec 2006', array('My')));
-		$this->assertTrue($this->Validation->date('December/2006', array('My')));
-		$this->assertTrue($this->Validation->date('Dec/2006', array('My')));
+		$this->assertTrue(Validation::date('December 2006', array('My')));
+		$this->assertTrue(Validation::date('Dec 2006', array('My')));
+		$this->assertTrue(Validation::date('December/2006', array('My')));
+		$this->assertTrue(Validation::date('Dec/2006', array('My')));
 	}
 
 	function testDateMyNumeric() {
-		$this->assertTrue($this->Validation->date('12/2006', array('my')));
-		$this->assertTrue($this->Validation->date('12-2006', array('my')));
-		$this->assertTrue($this->Validation->date('12.2006', array('my')));
-		$this->assertTrue($this->Validation->date('12 2006', array('my')));
-		$this->assertFalse($this->Validation->date('12/06', array('my')));
-		$this->assertFalse($this->Validation->date('12-06', array('my')));
-		$this->assertFalse($this->Validation->date('12.06', array('my')));
-		$this->assertFalse($this->Validation->date('12 06', array('my')));
+		$this->assertTrue(Validation::date('12/2006', array('my')));
+		$this->assertTrue(Validation::date('12-2006', array('my')));
+		$this->assertTrue(Validation::date('12.2006', array('my')));
+		$this->assertTrue(Validation::date('12 2006', array('my')));
+		$this->assertFalse(Validation::date('12/06', array('my')));
+		$this->assertFalse(Validation::date('12-06', array('my')));
+		$this->assertFalse(Validation::date('12.06', array('my')));
+		$this->assertFalse(Validation::date('12 06', array('my')));
 	}
 
 	function testDateCustomRegx() {
-		$this->assertTrue($this->Validation->date('2006-12-27', null, '%^(19|20)[0-9]{2}[- /.](0[1-9]|1[012])[- /.](0[1-9]|[12][0-9]|3[01])$%'));
-		$this->assertFalse($this->Validation->date('12-27-2006', null, '%^(19|20)[0-9]{2}[- /.](0[1-9]|1[012])[- /.](0[1-9]|[12][0-9]|3[01])$%'));
+		$this->assertTrue(Validation::date('2006-12-27', null, '%^(19|20)[0-9]{2}[- /.](0[1-9]|1[012])[- /.](0[1-9]|[12][0-9]|3[01])$%'));
+		$this->assertFalse(Validation::date('12-27-2006', null, '%^(19|20)[0-9]{2}[- /.](0[1-9]|1[012])[- /.](0[1-9]|[12][0-9]|3[01])$%'));
 	}
 
 	function testDecimal() {
-		$this->assertTrue($this->Validation->decimal('+1234.54321'));
-		$this->assertTrue($this->Validation->decimal('-1234.54321'));
-		$this->assertTrue($this->Validation->decimal('1234.54321'));
-		$this->assertTrue($this->Validation->decimal('+0123.45e6'));
-		$this->assertTrue($this->Validation->decimal('-0123.45e6'));
-		$this->assertTrue($this->Validation->decimal('0123.45e6'));
-		$this->assertFalse($this->Validation->decimal('string'));
-		$this->assertFalse($this->Validation->decimal('1234'));
-		$this->assertFalse($this->Validation->decimal('-1234'));
-		$this->assertFalse($this->Validation->decimal('+1234'));
+		$this->assertTrue(Validation::decimal('+1234.54321'));
+		$this->assertTrue(Validation::decimal('-1234.54321'));
+		$this->assertTrue(Validation::decimal('1234.54321'));
+		$this->assertTrue(Validation::decimal('+0123.45e6'));
+		$this->assertTrue(Validation::decimal('-0123.45e6'));
+		$this->assertTrue(Validation::decimal('0123.45e6'));
+		$this->assertFalse(Validation::decimal('string'));
+		$this->assertFalse(Validation::decimal('1234'));
+		$this->assertFalse(Validation::decimal('-1234'));
+		$this->assertFalse(Validation::decimal('+1234'));
 	}
 
 	function testDecimalWithPlaces() {
-		$this->assertTrue($this->Validation->decimal('.27', '2'));
-		$this->assertTrue($this->Validation->decimal(.27, 2));
-		$this->assertTrue($this->Validation->decimal(-.27, 2));
-		$this->assertTrue($this->Validation->decimal(+.27, 2));
-		$this->assertTrue($this->Validation->decimal('.277', '3'));
-		$this->assertTrue($this->Validation->decimal(.277, 3));
-		$this->assertTrue($this->Validation->decimal(-.277, 3));
-		$this->assertTrue($this->Validation->decimal(+.277, 3));
-		$this->assertTrue($this->Validation->decimal('1234.5678', '4'));
-		$this->assertTrue($this->Validation->decimal(1234.5678, 4));
-		$this->assertTrue($this->Validation->decimal(-1234.5678, 4));
-		$this->assertTrue($this->Validation->decimal(+1234.5678, 4));
-		$this->assertFalse($this->Validation->decimal('1234.5678', '3'));
-		$this->assertFalse($this->Validation->decimal(1234.5678, 3));
-		$this->assertFalse($this->Validation->decimal(-1234.5678, 3));
-		$this->assertFalse($this->Validation->decimal(+1234.5678, 3));
+		$this->assertTrue(Validation::decimal('.27', '2'));
+		$this->assertTrue(Validation::decimal(.27, 2));
+		$this->assertTrue(Validation::decimal(-.27, 2));
+		$this->assertTrue(Validation::decimal(+.27, 2));
+		$this->assertTrue(Validation::decimal('.277', '3'));
+		$this->assertTrue(Validation::decimal(.277, 3));
+		$this->assertTrue(Validation::decimal(-.277, 3));
+		$this->assertTrue(Validation::decimal(+.277, 3));
+		$this->assertTrue(Validation::decimal('1234.5678', '4'));
+		$this->assertTrue(Validation::decimal(1234.5678, 4));
+		$this->assertTrue(Validation::decimal(-1234.5678, 4));
+		$this->assertTrue(Validation::decimal(+1234.5678, 4));
+		$this->assertFalse(Validation::decimal('1234.5678', '3'));
+		$this->assertFalse(Validation::decimal(1234.5678, 3));
+		$this->assertFalse(Validation::decimal(-1234.5678, 3));
+		$this->assertFalse(Validation::decimal(+1234.5678, 3));
 	}
 
 	function testDecimalCustomRegex() {
-		$this->assertTrue($this->Validation->decimal('1.54321', null, '/^[-+]?[0-9]+(\\.[0-9]+)?$/s'));
-		$this->assertFalse($this->Validation->decimal('.54321', null, '/^[-+]?[0-9]+(\\.[0-9]+)?$/s'));
+		$this->assertTrue(Validation::decimal('1.54321', null, '/^[-+]?[0-9]+(\\.[0-9]+)?$/s'));
+		$this->assertFalse(Validation::decimal('.54321', null, '/^[-+]?[0-9]+(\\.[0-9]+)?$/s'));
 	}
 
 	function testEmail() {
-		$this->assertTrue($this->Validation->email('abc.efg@domain.com'));
-		$this->assertTrue($this->Validation->email('efg@domain.com'));
-		$this->assertTrue($this->Validation->email('abc-efg@domain.com'));
-		$this->assertTrue($this->Validation->email('abc_efg@domain.com'));
-		$this->assertFalse($this->Validation->email('abc@efg@domain.com'));
+		$this->assertTrue(Validation::email('abc.efg@domain.com'));
+		$this->assertTrue(Validation::email('efg@domain.com'));
+		$this->assertTrue(Validation::email('abc-efg@domain.com'));
+		$this->assertTrue(Validation::email('abc_efg@domain.com'));
+		$this->assertFalse(Validation::email('abc@efg@domain.com'));
 	}
 /*
 	//Commented out because test is slow, but it does work
 	function testEmailDeep() {
-		$this->assertTrue($this->Validation->email('abc.efg@cakephp.org', true), 'Expected valid email');
-		$this->assertFalse($this->Validation->email('abc.efg@caphpkeinvalid.com', true), 'Expected valid email');
+		$this->assertTrue(Validation::email('abc.efg@cakephp.org', true), 'Expected valid email');
+		$this->assertFalse(Validation::email('abc.efg@caphpkeinvalid.com', true), 'Expected valid email');
 	}
 */
 	function testEmailCustomRegex() {
-		$this->assertTrue($this->Validation->email('abc.efg@cakephp.org', null, '/^[A-Z0-9._%-]+@[A-Z0-9.-]+\\.[A-Z]{2,4}$/i'));
-		$this->assertFalse($this->Validation->email('abc.efg@com.caphpkeinvalid', null, '/^[A-Z0-9._%-]+@[A-Z0-9.-]+\\.[A-Z]{2,4}$/i'));
+		$this->assertTrue(Validation::email('abc.efg@cakephp.org', null, '/^[A-Z0-9._%-]+@[A-Z0-9.-]+\\.[A-Z]{2,4}$/i'));
+		$this->assertFalse(Validation::email('abc.efg@com.caphpkeinvalid', null, '/^[A-Z0-9._%-]+@[A-Z0-9.-]+\\.[A-Z]{2,4}$/i'));
 	}
 
 	function testEqualTo() {
-		$this->assertTrue($this->Validation->equalTo("1", "1"));
-		$this->assertFalse($this->Validation->equalTo(1, "1"));
-		$this->assertFalse($this->Validation->equalTo("", null));
-		$this->assertFalse($this->Validation->equalTo("", false));
-		$this->assertFalse($this->Validation->equalTo(0, false));
-		$this->assertFalse($this->Validation->equalTo(null, false));
+		$this->assertTrue(Validation::equalTo("1", "1"));
+		$this->assertFalse(Validation::equalTo(1, "1"));
+		$this->assertFalse(Validation::equalTo("", null));
+		$this->assertFalse(Validation::equalTo("", false));
+		$this->assertFalse(Validation::equalTo(0, false));
+		$this->assertFalse(Validation::equalTo(null, false));
 	}
 
 	function testIp() {
-		$this->assertTrue($this->Validation->ip('0.0.0.0'));
-		$this->assertTrue($this->Validation->ip('192.168.1.156'));
-		$this->assertTrue($this->Validation->ip('255.255.255.255'));
-		$this->assertFalse($this->Validation->ip('127.0.0'));
-		$this->assertFalse($this->Validation->ip('127.0.0.a'));
-		$this->assertFalse($this->Validation->ip('127.0.0.256'));
+		$this->assertTrue(Validation::ip('0.0.0.0'));
+		$this->assertTrue(Validation::ip('192.168.1.156'));
+		$this->assertTrue(Validation::ip('255.255.255.255'));
+		$this->assertFalse(Validation::ip('127.0.0'));
+		$this->assertFalse(Validation::ip('127.0.0.a'));
+		$this->assertFalse(Validation::ip('127.0.0.256'));
 	}
 
 	function testMaxLength() {
-		$this->assertTrue($this->Validation->maxLength('ab', 3));
-		$this->assertTrue($this->Validation->maxLength('abc', 3));
-		$this->assertFalse($this->Validation->maxLength('abcd', 3));
+		$this->assertTrue(Validation::maxLength('ab', 3));
+		$this->assertTrue(Validation::maxLength('abc', 3));
+		$this->assertFalse(Validation::maxLength('abcd', 3));
 	}
 
 	function testMinLength() {
-		$this->assertFalse($this->Validation->minLength('ab', 3));
-		$this->assertTrue($this->Validation->minLength('abc', 3));
-		$this->assertTrue($this->Validation->minLength('abcd', 3));
+		$this->assertFalse(Validation::minLength('ab', 3));
+		$this->assertTrue(Validation::minLength('abc', 3));
+		$this->assertTrue(Validation::minLength('abcd', 3));
 	}
 
 	function testUrl() {
-		$this->assertTrue($this->Validation->url('http://www.cakephp.org'));
-		$this->assertTrue($this->Validation->url('http://cakephp.org'));
-		$this->assertTrue($this->Validation->url('http://www.cakephp.org/somewhere#anchor'));
-		$this->assertTrue($this->Validation->url('http://192.168.0.1'));
-		$this->assertTrue($this->Validation->url('ftps://192.168.0.1/pub/cake'));
-		$this->assertFalse($this->Validation->url('ftp://256.168.0.1/pub/cake'));
-		$this->assertTrue($this->Validation->url('https://my.gizmoproject.com/gizmo/app?class=MySip;proc=start'));
-		$this->assertTrue($this->Validation->url('www.domain.tld'));
-		$this->assertFalse($this->Validation->url('http://w_w.micr_soft.co_m'));
-		$this->assertFalse($this->Validation->url('http://www.domain.12com'));
-		$this->assertFalse($this->Validation->url('http://www.domain.longttldnotallowed'));
-		$this->assertFalse($this->Validation->url('http://www.-invaliddomain.tld'));
-		$this->assertFalse($this->Validation->url('http://www.domain.-invalidtld'));
-		$this->assertFalse($this->Validation->url('http://www.this-domain-is-just-too-long-and-inacceptable-by-icann-rules-the-maximum-limit-of-characters-is-57.com'));
+		$this->assertTrue(Validation::url('http://www.cakephp.org'));
+		$this->assertTrue(Validation::url('http://cakephp.org'));
+		$this->assertTrue(Validation::url('http://www.cakephp.org/somewhere#anchor'));
+		$this->assertTrue(Validation::url('http://192.168.0.1'));
+		$this->assertTrue(Validation::url('ftps://192.168.0.1/pub/cake'));
+		$this->assertFalse(Validation::url('ftp://256.168.0.1/pub/cake'));
+		$this->assertTrue(Validation::url('https://my.gizmoproject.com/gizmo/app?class=MySip;proc=start'));
+		$this->assertTrue(Validation::url('www.domain.tld'));
+		$this->assertFalse(Validation::url('http://w_w.micr_soft.co_m'));
+		$this->assertFalse(Validation::url('http://www.domain.12com'));
+		$this->assertFalse(Validation::url('http://www.domain.longttldnotallowed'));
+		$this->assertFalse(Validation::url('http://www.-invaliddomain.tld'));
+		$this->assertFalse(Validation::url('http://www.domain.-invalidtld'));
+		$this->assertFalse(Validation::url('http://www.this-domain-is-just-too-long-and-inacceptable-by-icann-rules-the-maximum-limit-of-characters-is-57.com'));
 	}
 
 	function testValidNumber() {
-		$this->assertTrue($this->Validation->custom('12345', VALID_NUMBER));
-		$this->assertTrue($this->Validation->custom('-12345', VALID_NUMBER));
-		$this->assertTrue($this->Validation->custom('+12345', VALID_NUMBER));
-		$this->assertFalse($this->Validation->custom('--12345', VALID_NUMBER));
-		$this->assertFalse($this->Validation->custom('++12345', VALID_NUMBER));
-		$this->assertFalse($this->Validation->custom('a12345', VALID_NUMBER));
-		$this->assertFalse($this->Validation->custom('12345z', VALID_NUMBER));
-		$this->assertFalse($this->Validation->custom('-a12345z', VALID_NUMBER));
-		$this->assertFalse($this->Validation->custom('-', VALID_NUMBER));
-		$this->assertFalse($this->Validation->custom('123-12345', VALID_NUMBER));
-		$this->assertTrue($this->Validation->custom('1.2345', VALID_NUMBER));
-		$this->assertTrue($this->Validation->custom('-1.2345', VALID_NUMBER));
-		$this->assertTrue($this->Validation->custom('+1.2345', VALID_NUMBER));
-		$this->assertFalse($this->Validation->custom('1..2345', VALID_NUMBER));
-		$this->assertFalse($this->Validation->custom('-1..2345', VALID_NUMBER));
-		$this->assertFalse($this->Validation->custom('+1..2345', VALID_NUMBER));
-		$this->assertFalse($this->Validation->custom('.2345', VALID_NUMBER));
-		$this->assertFalse($this->Validation->custom('12345.', VALID_NUMBER));
+		$this->assertTrue(Validation::custom('12345', VALID_NUMBER));
+		$this->assertTrue(Validation::custom('-12345', VALID_NUMBER));
+		$this->assertTrue(Validation::custom('+12345', VALID_NUMBER));
+		$this->assertFalse(Validation::custom('--12345', VALID_NUMBER));
+		$this->assertFalse(Validation::custom('++12345', VALID_NUMBER));
+		$this->assertFalse(Validation::custom('a12345', VALID_NUMBER));
+		$this->assertFalse(Validation::custom('12345z', VALID_NUMBER));
+		$this->assertFalse(Validation::custom('-a12345z', VALID_NUMBER));
+		$this->assertFalse(Validation::custom('-', VALID_NUMBER));
+		$this->assertFalse(Validation::custom('123-12345', VALID_NUMBER));
+		$this->assertTrue(Validation::custom('1.2345', VALID_NUMBER));
+		$this->assertTrue(Validation::custom('-1.2345', VALID_NUMBER));
+		$this->assertTrue(Validation::custom('+1.2345', VALID_NUMBER));
+		$this->assertFalse(Validation::custom('1..2345', VALID_NUMBER));
+		$this->assertFalse(Validation::custom('-1..2345', VALID_NUMBER));
+		$this->assertFalse(Validation::custom('+1..2345', VALID_NUMBER));
+		$this->assertFalse(Validation::custom('.2345', VALID_NUMBER));
+		$this->assertFalse(Validation::custom('12345.', VALID_NUMBER));
 	}
 }
 ?>
\ No newline at end of file