Changeset 4072
- Timestamp:
- 03/21/08 23:47:48 (16 months ago)
- Location:
- branches/0.10/lib/Doctrine/Validator
- Files:
-
- 2 modified
-
Time.php (modified) (3 diffs)
-
Timestamp.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
branches/0.10/lib/Doctrine/Validator/Time.php
r4069 r4072 34 34 { 35 35 /** 36 * validate 37 * 36 38 * checks if given value is a valid time 37 39 * … … 44 46 return true; 45 47 } 48 46 49 $e = explode(':', $value); 47 50 … … 49 52 return false; 50 53 } 51 52 if ( !preg_match('/^ *[0-9]{2}:[0-9]{2}:[0-9]{2} *$/', $value)) {54 55 if ( ! preg_match('/^ *[0-9]{2}:[0-9]{2}:[0-9]{2} *$/', $value)) { 53 56 return false; 54 57 } 55 58 56 59 $hr = intval($e[0], 10); 57 60 $min = intval($e[1], 10); 58 61 $sec = intval($e[2], 10); 59 62 60 63 return $hr >= 0 && $hr <= 23 && $min >= 0 && $min <= 59 && $sec >= 0 && $sec <= 59; 61 64 } -
branches/0.10/lib/Doctrine/Validator/Timestamp.php
r4069 r4072 45 45 } 46 46 47 if ( !preg_match('/^ *[0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2} *$/', $value)) {47 if ( ! preg_match('/^ *[0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2} *$/', $value)) { 48 48 return false; 49 49 } 50 50 51 51 list($date, $time) = explode(' ', trim($value)); 52 52 53 53 $dateValidator = Doctrine_Validator::getValidator('date'); 54 54 $timeValidator = Doctrine_Validator::getValidator('time'); 55 56 if ( !$dateValidator->validate($date)) {55 56 if ( ! $dateValidator->validate($date)) { 57 57 return false; 58 58 } 59 60 if ( !$timeValidator->validate($time)) {59 60 if ( ! $timeValidator->validate($time)) { 61 61 return false; 62 62 }