cvs: pear /HTML_QuickForm QuickForm.php /HTML_QuickForm/QuickForm RuleRegistry.php
| From: | Bertrand Mansion | Date: | Tue, 30 Sep 2003 11:39:51 +0000 |
| Subject: | cvs: pear /HTML_QuickForm QuickForm.php /HTML_QuickForm/QuickForm RuleRegistry.php | ||
| Groups: | php.pear.cvs | ||
| Request: | Send a blank email to pear-cvs+get-13185@lists.php.net to get a copy of this message | ||
mansion Tue Sep 30 07:39:51 2003 EDT
Modified files:
/pear/HTML_QuickForm QuickForm.php
/pear/HTML_QuickForm/QuickForm RuleRegistry.php
Log:
singleton() -> getInstance()
Index: pear/HTML_QuickForm/QuickForm.php
diff -u pear/HTML_QuickForm/QuickForm.php:1.119 pear/HTML_QuickForm/QuickForm.php:1.120
--- pear/HTML_QuickForm/QuickForm.php:1.119 Tue Sep 30 07:36:32 2003
+++ pear/HTML_QuickForm/QuickForm.php Tue Sep 30 07:39:50 2003
@@ -17,7 +17,7 @@
// | Bertrand Mansion <bmansion@mamasam.com> |
// +----------------------------------------------------------------------+
//
-// $Id: QuickForm.php,v 1.119 2003/09/30 11:36:32 mansion Exp $
+// $Id: QuickForm.php,v 1.120 2003/09/30 11:39:50 mansion Exp $
require_once('PEAR.php');
require_once('HTML/Common.php');
@@ -283,7 +283,7 @@
function registerRule($ruleName, $type, $data1, $data2 = null)
{
include_once('HTML/QuickForm/RuleRegistry.php');
- $validate =& HTML_QuickForm_RuleRegistry::singleton();
+ $validate =& HTML_QuickForm_RuleRegistry::getInstance();
$validate->registerRule($ruleName, $type, $data1, $data2);
} // end func registerRule
@@ -1393,7 +1393,7 @@
}
include_once('HTML/QuickForm/RuleRegistry.php');
- $validate =& HTML_QuickForm_RuleRegistry::singleton();
+ $validate =& HTML_QuickForm_RuleRegistry::getInstance();
foreach ($this->_rules as $target => $rules) {
$submitValue = $this->getSubmitValue($target);
@@ -1594,7 +1594,7 @@
}
include_once('HTML/QuickForm/RuleRegistry.php');
- $validate =& HTML_QuickForm_RuleRegistry::singleton();
+ $validate =& HTML_QuickForm_RuleRegistry::getInstance();
$html = '';
$test = array();
$js_escape = array(
Index: pear/HTML_QuickForm/QuickForm/RuleRegistry.php
diff -u pear/HTML_QuickForm/QuickForm/RuleRegistry.php:1.1
pear/HTML_QuickForm/QuickForm/RuleRegistry.php:1.2
--- pear/HTML_QuickForm/QuickForm/RuleRegistry.php:1.1 Tue Sep 30 07:33:46 2003
+++ pear/HTML_QuickForm/QuickForm/RuleRegistry.php Tue Sep 30 07:39:51 2003
@@ -18,7 +18,7 @@
// | Bertrand Mansion <bmansion@mamasam.com> |
// +----------------------------------------------------------------------+
//
-// $Id: RuleRegistry.php,v 1.1 2003/09/30 11:33:46 mansion Exp $
+// $Id: RuleRegistry.php,v 1.2 2003/09/30 11:39:51 mansion Exp $
$GLOBALS['_HTML_QuickForm_registered_rules'] = array(
'required' => array('html_quickform_rule_required',
'HTML/QuickForm/Rule/Required.php'),
@@ -59,14 +59,14 @@
* @static
* @return object Reference to the HTML_QuickForm_RuleRegistry singleton
*/
- function &singleton()
+ function &getInstance()
{
static $obj;
if (!isset($obj)) {
$obj = new HTML_QuickForm_Validate();
}
return $obj;
- } // end func singleton
+ } // end func getInstance
/**
* Registers a new validation rule