Changeset 12876

Timestamp:

11/10/08 13:53:18 (8 months ago)

Author:

nicolas

Message:

[1.2] Added a way to define default messages for required and invalid error codes in sfValidatorBase class

Files:

• branches/1.2/UPGRADE_TO_1_2 (modified) (2 diffs)
• branches/1.2/lib/validator/sfValidatorBase.class.php (modified) (3 diffs)
• branches/1.2/test/unit/validator/sfValidatorBaseTest.php (modified) (2 diffs)

branches/1.2/UPGRADE_TO_1_2

@@ -279 +279 @@
-backward compatibility but you don't need to provide it anymore.
-
-
-
-
-
-
+
+
+
+
+
+
-
-Widgets
@@ -669 +670 @@
-method:
-
-
-
-
-
-
+  
+  
+  
+  
+  
-
-The `orm` setting is deprecated in `settings.yml` as it is now automatically

branches/1.2/lib/validator/sfValidatorBase.class.php

@@ -22 +22 @@
-{
-  protected static
-
+
+
+
-
-  protected
@@ -51 +53 @@
-  {
-    $this->options  = array_merge(array('required' => true, 'trim' => false, 'empty_value' => null), $this->options);
-'Required.', 'invalid' => 'Invalid.'
+self::$requiredMessage, 'invalid' => self::$invalidMessage
-
-    $this->configure($options, $messages);
@@ -247 +249 @@
-  {
-    return $this->requiredOptions;
+  }
+
+  /**
+   * Sets the default invalid message
+   *
+   * @param string $message
+   */
+  static public function setInvalidMessage($message)
+  {
+    self::$invalidMessage = $message;
+  }
+
+  /**
+   * Sets the default required message
+   *
+   * @param string $message
+   */
+  static public function setRequiredMessage($message)
+  {
+    self::$requiredMessage = $message;
-  }
-

branches/1.2/test/unit/validator/sfValidatorBaseTest.php

@@ -11 +11 @@
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
-
-2
+4
-
-class ValidatorIdentity extends sfValidatorBase
@@ -231 +231 @@
-$v->setMessage('required', 'This is required.');
-$t->is($v->asString(), 'ValidatorIdentity({}, { required: \'This is required.\' })', '->asString() returns a string representation of the validator');
+
+// setRequiredMessage() setInvalidMessage()
+$t->diag('setRequiredMessage() setInvalidMessage()');
+ValidatorIdentity::setRequiredMessage('this is required by default');
+ValidatorIdentity::setInvalidMessage('this is invalid by default');
+$v = new ValidatorIdentity();
+$defaultMessages = $v->getDefaultMessages();
+$t->is($defaultMessages['required'], 'this is required by default', 'setRequiredMessage() sets the default required message');
+$t->is($defaultMessages['invalid'], 'this is invalid by default', 'setInvalidMessage() sets the default required message');