[limb-svn] r6537 - in 3.x/trunk/limb: active_record/tests/cases validation/src/rule validation/tests/cases/rule
svn at limb-project.com
svn at limb-project.com
Thu Nov 22 10:26:56 MSK 2007
Author: pachanga
Date: 2007-11-22 10:26:55 +0300 (Thu, 22 Nov 2007)
New Revision: 6537
URL: http://fisheye.limb-project.com/changelog/limb/?cs=6537
Modified:
3.x/trunk/limb/active_record/tests/cases/lmbARRelationsDefinitionMethodsTest.class.php
3.x/trunk/limb/validation/src/rule/lmbDateRule.class.php
3.x/trunk/limb/validation/src/rule/lmbLocaleDateRule.class.php
3.x/trunk/limb/validation/tests/cases/rule/lmbLocaleDateRuleTest.class.php
Log:
-- using lmbDateTime instead of obsolete lmbDate now
Modified: 3.x/trunk/limb/active_record/tests/cases/lmbARRelationsDefinitionMethodsTest.class.php
===================================================================
--- 3.x/trunk/limb/active_record/tests/cases/lmbARRelationsDefinitionMethodsTest.class.php 2007-11-22 07:26:32 UTC (rev 6536)
+++ 3.x/trunk/limb/active_record/tests/cases/lmbARRelationsDefinitionMethodsTest.class.php 2007-11-22 07:26:55 UTC (rev 6537)
@@ -73,14 +73,14 @@
$this->relations['other_many_belongs_to_relation'] = $other_many_belongs_to;
$this->_composedOf('value_object', $value_object = array('field' => 'date_start',
- 'class' => 'lmbDate',
+ 'class' => 'lmbDateTime',
'getter' => 'getStamp'));
$this->relations['value_object'] = $value_object;
$this->_composedOf('other_value_object', $other_value_object = array('field' => 'date_end',
- 'class' => 'lmbDate',
+ 'class' => 'lmbDateTime',
'getter' => 'getStamp'));
$this->relations['other_value_object'] = $other_value_object;
}
Modified: 3.x/trunk/limb/validation/src/rule/lmbDateRule.class.php
===================================================================
--- 3.x/trunk/limb/validation/src/rule/lmbDateRule.class.php 2007-11-22 07:26:32 UTC (rev 6536)
+++ 3.x/trunk/limb/validation/src/rule/lmbDateRule.class.php 2007-11-22 07:26:55 UTC (rev 6537)
@@ -7,7 +7,7 @@
* @license LGPL http://www.gnu.org/copyleft/lesser.html
*/
lmb_require('limb/validation/src/rule/lmbSingleFieldRule.class.php');
-lmb_require('limb/datetime/src/lmbDate.class.php');
+lmb_require('limb/datetime/src/lmbDateTime.class.php');
/**
* Checks that field value is a valid date
@@ -31,7 +31,7 @@
{
if($this->type == lmbDateRule :: TYPE_ISO)
{
- if(!lmbDate :: validate((string)$value))
+ if(!lmbDateTime :: validate((string)$value))
$this->error('{Field} is not a valid ISO formatted date(YYYY-MM-DD HH:MM).');
}
}
Modified: 3.x/trunk/limb/validation/src/rule/lmbLocaleDateRule.class.php
===================================================================
--- 3.x/trunk/limb/validation/src/rule/lmbLocaleDateRule.class.php 2007-11-22 07:26:32 UTC (rev 6536)
+++ 3.x/trunk/limb/validation/src/rule/lmbLocaleDateRule.class.php 2007-11-22 07:26:55 UTC (rev 6537)
@@ -7,15 +7,15 @@
* @license LGPL http://www.gnu.org/copyleft/lesser.html
*/
lmb_require('limb/validation/src/rule/lmbSingleFieldRule.class.php');
-lmb_require('limb/i18n/src/datetime/lmbLocaleDate.class.php');
+lmb_require('limb/i18n/src/datetime/lmbLocaleDateTime.class.php');
/**
- * class lmbLocaleDateRule.
+ * class lmbLocaleDateTimeRule.
*
* @package validation
* @version $Id$
*/
-class lmbLocaleDateRule extends lmbSingleFieldRule
+class lmbLocaleDateTimeRule extends lmbSingleFieldRule
{
protected $locale;
@@ -32,7 +32,7 @@
if(!$this->locale)
$this->locale = $toolkit->getLocaleObject();
- if(!lmbLocaleDate :: isLocalStringValid($this->locale, $value))
+ if(!lmbLocaleDateTime :: isLocalStringValid($this->locale, $value))
$this->error(lmb_i18n('{Field} must have a valid date format', 'validation'));
}
}
Modified: 3.x/trunk/limb/validation/tests/cases/rule/lmbLocaleDateRuleTest.class.php
===================================================================
--- 3.x/trunk/limb/validation/tests/cases/rule/lmbLocaleDateRuleTest.class.php 2007-11-22 07:26:32 UTC (rev 6536)
+++ 3.x/trunk/limb/validation/tests/cases/rule/lmbLocaleDateRuleTest.class.php 2007-11-22 07:26:55 UTC (rev 6537)
@@ -6,13 +6,13 @@
* @copyright Copyright © 2004-2007 BIT(http://bit-creative.com)
* @license LGPL http://www.gnu.org/copyleft/lesser.html
*/
-lmb_require('limb/validation/src/rule/lmbLocaleDateRule.class.php');
+lmb_require('limb/validation/src/rule/lmbLocaleDateTimeRule.class.php');
-class lmbLocaleDateRuleTest extends lmbValidationRuleTestCase
+class lmbLocaleDateTimeRuleTest extends lmbValidationRuleTestCase
{
function testLocaleDateRuleCorrect()
{
- $rule = new lmbLocaleDateRule('test', new lmbLocale('en', new lmbIni(dirname(__FILE__) . '/en.ini')));
+ $rule = new lmbLocaleDateTimeRule('test', new lmbLocale('en', new lmbIni(dirname(__FILE__) . '/en.ini')));
$data = new lmbSet(array('test' => '02/28/2003'));
@@ -23,7 +23,7 @@
function testLocaleDateRuleErrorLeapYear()
{
- $rule = new lmbLocaleDateRule('test', new lmbLocale('en', new lmbIni(dirname(__FILE__) . '/en.ini')));
+ $rule = new lmbLocaleDateTimeRule('test', new lmbLocale('en', new lmbIni(dirname(__FILE__) . '/en.ini')));
$data = new lmbSet(array('test' => '02/29/2003'));
@@ -36,7 +36,7 @@
function testErrorLocaleMonthPosition()
{
- $rule = new lmbLocaleDateRule('test', new lmbLocale('en', new lmbIni(dirname(__FILE__) . '/en.ini')));
+ $rule = new lmbLocaleDateTimeRule('test', new lmbLocale('en', new lmbIni(dirname(__FILE__) . '/en.ini')));
$data = new lmbSet(array('test' => '28/12/2003'));
@@ -49,7 +49,7 @@
function testLocaleDateRuleErrorFormat()
{
- $rule = new lmbLocaleDateRule('test', new lmbLocale('en', new lmbIni(dirname(__FILE__) . '/en.ini')));
+ $rule = new lmbLocaleDateTimeRule('test', new lmbLocale('en', new lmbIni(dirname(__FILE__) . '/en.ini')));
$data = new lmbSet(array('test' => '02-29-2003'));
@@ -62,7 +62,7 @@
function testLocaleDateRuleError()
{
- $rule = new lmbLocaleDateRule('test', new lmbLocale('en', new lmbIni(dirname(__FILE__) . '/en.ini')));
+ $rule = new lmbLocaleDateTimeRule('test', new lmbLocale('en', new lmbIni(dirname(__FILE__) . '/en.ini')));
$data = new lmbSet(array('test' => '02jjklklak/sdsdskj34-sdsdsjkjkj78'));
More information about the limb-svn
mailing list