add PrimitiveRule

Author: suquant

core/Form/Form.class.php

@@ -51,7 +51,7 @@ public function getErrors()
 				if ($error = $prm->getError())
 					$errors[$name] = $error;
 
-			return array_merge($errors, $this->violated);
+			return $errors;
 		}
 
 		public function hasError($name)
@@ -99,8 +99,6 @@ public function dropAllErrors()
 		{
 			foreach ($this->primitives as $prm)
 				$prm->dropError();
-
-			$this->violated	= array();
 
 			return $this;
 		}
@@ -152,15 +150,8 @@ public function markWrong($name)
 		**/
 		public function markGood($primitiveName)
 		{
-			if($this->exists($primitiveName))
-				$this->get($primitiveName)->dropError();
-			elseif (isset($this->rules[$primitiveName]))
-				unset($this->violated[$primitiveName]);
-			else
-				throw new MissingElementException(
-					$primitiveName.' does not match known primitives or rules'
-				);
-			
+			$this->get($primitiveName)->dropError();
+
 			return $this;
 		}
 
@@ -171,14 +162,7 @@ public function markGood($primitiveName)
 		**/
 		public function markCustom($name, $customMark)
 		{
-			if ($this->exists($name))
-				$this->get($name)->setError($customMark);
-			elseif (isset($this->rules[$name]))
-				$this->violated[$name] = $customMark;
-			else
-				throw new MissingElementException(
-					$name.' does not match known primitives or rules'
-				);
+			$this->get($name)->setError($customMark);
 
 			return $this;
 		}
@@ -201,55 +185,20 @@ public function getTextualErrors()
 
 		public function getTextualErrorFor($name)
 		{
-			if (
-				isset(
-					$this->violated[$name],
-					$this->labels[$name][$this->violated[$name]]
-				)
-			)
-				return $this->labels[$name][$this->violated[$name]];
-			elseif (
-				($error = $this->getError($name) )
-				&& isset($this->labels[$name][$error])
-			)
-				return $this->labels[$name][$error];
-			else
-				return null;
+			return $this->get($name)->getActualErrorLabel();
 		}
 
 		public function getErrorDescriptionFor($name)
 		{
-			if (
-				isset(
-					$this->violated[$name],
-					$this->describedLabels[$name][$this->violated[$name]]
-				)
-			)
-				return $this->describedLabels[$name][$this->violated[$name]];
-			elseif (
-				($error = $this->getError($name) )
-				&& isset($this->describedLabels[$name][$error])
-			)
-				return $this->describedLabels[$name][$error];
-			else
-				return null;
+			return $this->get($name)->getActualErrorDescription();
 		}
 
 		/**
 		 * @return Form
 		**/
 		public function addErrorDescription($name, $errorType, $description)
 		{
-			
-			if (
-				!isset($this->rules[$name])
-				&& !$this->get($name)->getName()
-			)
-				throw new MissingElementException(
-					"knows nothing about '{$name}'"
-				);
-			
-			$this->describedLabels[$name][$errorType] = $description;
+			$this->get($name)->setErrorDescription($errorType, $description);
 
 			return $this;
 		}
@@ -259,15 +208,15 @@ public function addErrorDescription($name, $errorType, $description)
 		**/
 		public function addWrongLabel($primitiveName, $label)
 		{
-			return $this->addErrorLabel($primitiveName, Form::WRONG, $label);
+			return $this->addErrorLabel($primitiveName, BasePrimitive::WRONG, $label);
 		}
 
 		/**
 		 * @return Form
 		**/
 		public function addMissingLabel($primitiveName, $label)
 		{
-			return $this->addErrorLabel($primitiveName, Form::MISSING, $label);
+			return $this->addErrorLabel($primitiveName, BasePrimitive::MISSING, $label);
 		}
 
 		/**
@@ -280,12 +229,12 @@ public function addCustomLabel($primitiveName, $customMark, $label)
 
 		public function getWrongLabel($primitiveName)
 		{
-			return $this->getErrorLabel($primitiveName, Form::WRONG);
+			return $this->getErrorLabel($primitiveName, BasePrimitive::WRONG);
 		}
 
 		public function getMissingLabel($primitiveName)
 		{
-			return $this->getErrorLabel($primitiveName, Form::MISSING);
+			return $this->getErrorLabel($primitiveName, BasePrimitive::MISSING);
 		}
 
 		/**
@@ -294,7 +243,7 @@ public function getMissingLabel($primitiveName)
 		public function import($scope)
 		{
 			foreach ($this->primitives as $prm)
-				$this->importPrimitive($scope, $prm);
+					$this->importPrimitive($scope, $prm);
 
 			return $this;
 		}
@@ -393,6 +342,13 @@ public function getProto()
 		**/
 		private function importPrimitive($scope, BasePrimitive $prm)
 		{
+			/**
+			 * Because we check its lazy
+			 * @see RegulatedForm::checkRules
+			 */
+			if($prm instanceof PrimitiveRule)
+				return $this;
+
 			if (!$this->importFiltering) {
 				if ($prm instanceof FiltrablePrimitive) {
 
@@ -430,7 +386,7 @@ private function checkImportResult(BasePrimitive $prm, $result)
 
 			if(
 				$prm instanceof PrimitiveAlias
-				&& !($result === null)
+				&& $result !== null
 			)
 				$this->markGood($prm->getInner()->getName());
 
@@ -462,28 +418,14 @@ private function checkImportResult(BasePrimitive $prm, $result)
 		**/
 		private function addErrorLabel($name, $errorType, $label)
 		{
-			if (
-				!isset($this->rules[$name])
-				&& !$this->get($name)->getName()
-			)
-				throw new MissingElementException(
-					"knows nothing about '{$name}'"
-				);
-			
-			$this->labels[$name][$errorType] = $label;
+			$this->get($name)->setErrorLabel($errorType, $label);
 
 			return $this;
 		}
 
 		private function getErrorLabel($name, $errorType)
 		{
-			// checks for primitive's existence
-			$this->get($name);
-			
-			if (isset($this->labels[$name][$errorType]))
-				return $this->labels[$name][$errorType];
-			
-			return null;
+			return $this->get($name)->getErrorLabel($errorType);
 		}
 	}
 ?>

core/Form/Primitive.class.php

@@ -386,5 +386,13 @@ public static function enumList($name)
 		{
 			return new PrimitiveEnumList($name);
 		}
+
+		/**
+		 * @return PrimitiveRule
+		**/
+		public static function rule($name)
+		{
+			return new PrimitiveRule($name);
+		}
 	}
 ?>