refactor & add new features

Author: suquant

core/Form/Primitives/PrimitiveEnum.class.php

@@ -12,14 +12,14 @@
 	/**
 	 * @ingroup Primitives
 	**/
-	class PrimitiveEnum extends IdentifiablePrimitive
+	class PrimitiveEnum extends IdentifiablePrimitive implements ListedPrimitive
 	{
 		public function getList()
 		{
 			if ($this->value)
-				return ClassUtils::callStaticMethod(get_class($this->value).'::getObjectList');
+				return ClassUtils::callStaticMethod(get_class($this->value).'::getList');
 			elseif ($this->default)
-				return ClassUtils::callStaticMethod(get_class($this->default).'::getObjectList');
+				return ClassUtils::callStaticMethod(get_class($this->default).'::getList');
 			else {
 				$object = new $this->className(
 					ClassUtils::callStaticMethod($this->className.'::getAnyId')
@@ -60,16 +60,11 @@ public function importValue(/* Identifiable */ $value)
 
 		public function import($scope)
 		{
-			if (!$this->className)
-				throw new WrongStateException(
-					"no class defined for PrimitiveEnum '{$this->name}'"
-				);
-			
 			$result = parent::import($scope);
 
 			if ($result === true) {
 				try {
-					$this->value = new $this->className($this->value);
+					$this->value = $this->makeEnumById($this->value);
 				} catch (MissingElementException $e) {
 					$this->value = null;
 
@@ -81,5 +76,57 @@ public function import($scope)
 
 			return $result;
 		}
+
+		/**
+		 * @param $list
+		 * @throws UnsupportedMethodException
+		 */
+		public function setList($list)
+		{
+			throw new UnsupportedMethodException('you cannot set list here, it is impossible, because list getted from enum classes');
+		}
+
+		/**
+		 * @return null|string
+		 */
+		public function getChoiceValue()
+		{
+			if(
+				($value = $this->getValue() ) &&
+				$value instanceof Enum
+			)
+				return $value->getName();
+
+			return null;
+		}
+
+
+		/**
+		 * @return Enum|mixed|null
+		 */
+		public function getActualChoiceValue()
+		{
+			if(
+				!$this->getChoiceValue() &&
+				$this->getDefault()
+			)
+				return $this->getDefault()->getName();
+
+			return null;
+		}
+
+		/**
+		 * @param $id
+		 * @return Enum|mixed
+		 */
+		protected function makeEnumById($id)
+		{
+			if (!$this->className)
+				throw new WrongStateException(
+					"no class defined for PrimitiveEnum '{$this->name}'"
+				);
+
+			return new $this->className($id);
+		}
 	}
 ?>

test/core/PrimitiveEnumTest.class.php

@@ -13,16 +13,35 @@ final class PrimitiveEnumTest extends TestCase
 	{
 		public function testIntegerValues()
 		{
+			$defaultId = 2;
+			$importId = 1;
+
+			$default = MimeType::wrap($defaultId);
+			$imported = MimeType::wrap($importId);
+
 			$form =
 				Form::create()->
 				add(
-					Primitive::enum('enum')->of('MimeType')
+					Primitive::enum('enum')
+						->of('MimeType')
+						->setDefault($default)
 				);
 
-			$form->import(array('enum' => '1'));
+			$form->import(array('enum' => $importId));
 
-			$this->assertEquals($form->getValue('enum')->getId(), 1);
-			$this->assertSame($form->getValue('enum')->getId(), 1);
+			$this->assertEquals($form->getValue('enum')->getId(), $importId);
+			$this->assertSame($form->getValue('enum')->getId(), $importId);
+
+			$this->assertEquals($form->getChoiceValue('enum'), $imported->getName());
+			$this->assertSame($form->getChoiceValue('enum'), $imported->getName());
+
+			$form->clean();
+
+			$this->assertNull($form->getValue('enum'));
+			$this->assertNull($form->getChoiceValue('enum'));
+			$this->assertEquals($form->getActualValue('enum')->getId(), $defaultId);
+			$this->assertEquals($form->getActualChoiceValue('enum'), $default->getName());
+
 		}
 
 		public function testGetList()