[limb-svn] r6543 - in 3.x/trunk/limb/validation: src/rule tests/cases/rule

[svn at limb-project.com]

Author: wiliam
Date: 2007-11-23 10:36:34 +0300 (Fri, 23 Nov 2007)
New Revision: 6543
URL: http://fisheye.limb-project.com/changelog/limb/?cs=6543

Added:
   3.x/trunk/limb/validation/src/rule/lmbLocaleDateRule.class.php
Removed:
   3.x/trunk/limb/validation/src/rule/lmbLocaleDateTimeRule.class.php
Modified:
   3.x/trunk/limb/validation/tests/cases/rule/lmbLocaleDateRuleTest.class.php
Log:
-- lmbLocaleDateTimeRule renamed to lmbLocaleDateRule back (keep BC);

Copied: 3.x/trunk/limb/validation/src/rule/lmbLocaleDateRule.class.php (from rev 6540, 3.x/trunk/limb/validation/src/rule/lmbLocaleDateTimeRule.class.php)
===================================================================
--- 3.x/trunk/limb/validation/src/rule/lmbLocaleDateRule.class.php	                        (rev 0)
+++ 3.x/trunk/limb/validation/src/rule/lmbLocaleDateRule.class.php	2007-11-23 07:36:34 UTC (rev 6543)
@@ -0,0 +1,40 @@
+<?php
+/*
+ * Limb PHP Framework
+ *
+ * @link http://limb-project.com
+ * @copyright  Copyright &copy; 2004-2007 BIT(http://bit-creative.com)
+ * @license    LGPL http://www.gnu.org/copyleft/lesser.html
+ */
+lmb_require('limb/validation/src/rule/lmbSingleFieldRule.class.php');
+lmb_require('limb/i18n/src/datetime/lmbLocaleDateTime.class.php');
+
+/**
+ * class lmbLocaleDateRule.
+ *
+ * @package validation
+ * @version $Id$
+ */
+class lmbLocaleDateRule extends lmbSingleFieldRule
+{
+  protected $locale;
+
+  function __construct($field_name, $locale = null)
+  {
+    $this->locale = $locale;
+    parent :: __construct($field_name);
+  }
+
+  function check($value)
+  {
+    $toolkit = lmbToolkit :: instance();
+
+    if(!$this->locale)
+      $this->locale = $toolkit->getLocaleObject();
+
+    if(!lmbLocaleDateTime ::  isLocalStringValid($this->locale, $value))
+      $this->error(lmb_i18n('{Field} must have a valid date format', 'validation'));
+  }
+}
+
+

Deleted: 3.x/trunk/limb/validation/src/rule/lmbLocaleDateTimeRule.class.php
===================================================================
--- 3.x/trunk/limb/validation/src/rule/lmbLocaleDateTimeRule.class.php	2007-11-23 07:21:01 UTC (rev 6542)
+++ 3.x/trunk/limb/validation/src/rule/lmbLocaleDateTimeRule.class.php	2007-11-23 07:36:34 UTC (rev 6543)
@@ -1,40 +0,0 @@
-<?php
-/*
- * Limb PHP Framework
- *
- * @link http://limb-project.com 
- * @copyright  Copyright &copy; 2004-2007 BIT(http://bit-creative.com)
- * @license    LGPL http://www.gnu.org/copyleft/lesser.html 
- */
-lmb_require('limb/validation/src/rule/lmbSingleFieldRule.class.php');
-lmb_require('limb/i18n/src/datetime/lmbLocaleDateTime.class.php');
-
-/**
- * class lmbLocaleDateTimeRule.
- *
- * @package validation
- * @version $Id$
- */
-class lmbLocaleDateTimeRule extends lmbSingleFieldRule
-{
-  protected $locale;
-
-  function __construct($field_name, $locale = null)
-  {
-    $this->locale = $locale;
-    parent :: __construct($field_name);
-  }
-
-  function check($value)
-  {
-    $toolkit = lmbToolkit :: instance();
-
-    if(!$this->locale)
-      $this->locale = $toolkit->getLocaleObject();
-
-    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-23 07:21:01 UTC (rev 6542)
+++ 3.x/trunk/limb/validation/tests/cases/rule/lmbLocaleDateRuleTest.class.php	2007-11-23 07:36:34 UTC (rev 6543)
@@ -2,17 +2,17 @@
 /*
  * Limb PHP Framework
  *
- * @link http://limb-project.com 
+ * @link http://limb-project.com
  * @copyright  Copyright &copy; 2004-2007 BIT(http://bit-creative.com)
- * @license    LGPL http://www.gnu.org/copyleft/lesser.html 
+ * @license    LGPL http://www.gnu.org/copyleft/lesser.html
  */
-lmb_require('limb/validation/src/rule/lmbLocaleDateTimeRule.class.php');
+lmb_require('limb/validation/src/rule/lmbLocaleDateRule.class.php');
 
-class lmbLocaleDateTimeRuleTest extends lmbValidationRuleTestCase
+class lmbLocaleDateRuleTest extends lmbValidationRuleTestCase
 {
   function testLocaleDateRuleCorrect()
   {
-    $rule = new lmbLocaleDateTimeRule('test', new lmbLocale('en', new lmbIni(dirname(__FILE__) . '/en.ini')));
+    $rule = new lmbLocaleDateRule('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 lmbLocaleDateTimeRule('test', new lmbLocale('en', new lmbIni(dirname(__FILE__) . '/en.ini')));
+    $rule = new lmbLocaleDateRule('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 lmbLocaleDateTimeRule('test', new lmbLocale('en', new lmbIni(dirname(__FILE__) . '/en.ini')));
+    $rule = new lmbLocaleDateRule('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 lmbLocaleDateTimeRule('test', new lmbLocale('en', new lmbIni(dirname(__FILE__) . '/en.ini')));
+    $rule = new lmbLocaleDateRule('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 lmbLocaleDateTimeRule('test', new lmbLocale('en', new lmbIni(dirname(__FILE__) . '/en.ini')));
+    $rule = new lmbLocaleDateRule('test', new lmbLocale('en', new lmbIni(dirname(__FILE__) . '/en.ini')));
 
     $data = new lmbSet(array('test' => '02jjklklak/sdsdskj34-sdsdsjkjkj78'));