Вызов Form::markCustom addCustomLabel одним методом

core/Form/Form.class.php

@@ -120,17 +120,17 @@ public function disableImportFiltering()
 		/**
 		 * @return Form
 		**/
-		public function markMissing($primitiveName)
+		public function markMissing($primitiveName, $label = null)
 		{
-			return $this->markCustom($primitiveName, Form::MISSING);
+			return $this->markCustom($primitiveName, Form::MISSING, $label);
 		}
 
 		/**
 		 * rule or primitive
 		 * 
 		 * @return Form
 		**/
-		public function markWrong($name)
+		public function markWrong($name, $label = null)
 		{
 			if (isset($this->primitives[$name]))
 				$this->errors[$name] = self::WRONG;
@@ -141,6 +141,9 @@ public function markWrong($name)
 					$name.' does not match known primitives or rules'
 				);
 
+			if ($label !== null)
+				$this->addWrongLabel($name, $label);
+
 			return $this;
 		}
 
@@ -166,12 +169,15 @@ public function markGood($primitiveName)
 		 * 
 		 * @return Form
 		**/
-		public function markCustom($primitiveName, $customMark)
+		public function markCustom($primitiveName, $customMark, $label = null)
 		{
 			Assert::isInteger($customMark);
 
 			$this->errors[$this->get($primitiveName)->getName()] = $customMark;
 
+			if ($label !== null)
+				$this->addCustomLabel($primitiveName, $customMark, $label);
+
 			return $this;
 		}
 		//@}

doc/ChangeLog

@@ -1,3 +1,9 @@
+2012-09-26	Alexey S. Denisov
+
+	* core/Form/Form.class.php:
+		added to Form methods markMissing, markWrong, markCustom
+		optional argument "label" to set it without calling special method add*Label
+
 2012-09-19	Evgeny V. Kokovikhin
 
 	* main/Monitoring/PinbedMemcached.class.php: cosmetics