Code clean

Author: suquant

core/Base/Enum.class.php

@@ -33,7 +33,7 @@ public static function create($id)
 			return new $className($id);
 		}
 
-		final public function __construct($id)
+		public function __construct($id)
 		{
 			$this->setId($id);
 		}
@@ -51,9 +51,18 @@ public function unserialize($serialized)
 		}
 		//@}
 
+		/**
+		 * Array of object
+		 * @static
+		 * @return array
+		 */
 		public static function getList()
 		{
-			return static::$names;
+			$list = array();
+			foreach (array_keys(static::$names) as $id)
+				$list[] = static::create($id);
+
+			return $list;
 		}
 
 		/**
@@ -71,15 +80,16 @@ public function getId()
 			return $this->id;
 		}
 
+
+		/**
+		 * Alias for getList()
+		 * @static
+		 * @deprecated
+		 * @return array
+		 */
 		public static function getObjectList()
 		{
-			$list = array();
-			$names = static::$names;
-
-			foreach (array_keys($names) as $id)
-				$list[] = static::create($id);
-
-			return $list;
+			return static::getList();
 		}
 
 		public function toString()

main/Base/MimeType.class.php

@@ -790,43 +790,35 @@ public static function wrap($id)
 		/**
 		 * Return MimeType object by mime-type string
 		 * @param string $value
-		 * @throws ObjectNotFoundException
+		 * @throws MissingElementException
 		 * @return MimeType
 		 */
 		public static function getByMimeType($value)
 		{
 			$list = static::getNameList();
-			foreach ( $list as $key => $mimeType )
-			{
-				if( mb_strtolower($mimeType) === mb_strtolower($value) )
-					return new self($key);
 
-			}
+			$id = array_search(mb_strtolower($value), $list);
+			if ($id === false)
+				throw new MissingElementException('Can not find similar mime type "'.$value.'" !');
 
-			throw new ObjectNotFoundException(
-				'Can not find similar mime type "'.$value.'" !'
-			);
+			return new self($id);
 		}
 
 		/**
 		 * Return MimeType object by extension without [dot] prefix
 		 * @param string $value
-		 * @throws ObjectNotFoundException
+		 * @throws MissingElementException
 		 * @return MimeType
 		 */
 		public static function getByExtension($value)
 		{
 			$list = static::getExtensionList();
-			foreach ( $list as $key => $extension )
-			{
-				if( mb_strtolower( $extension ) === mb_strtolower($value) )
-					return new self($key);
 
-			}
+			$id = array_search(mb_strtolower($value), $list);
+			if ($id === false)
+				throw new MissingElementException('Can not find similar extension "'.$value.'" !');
 
-			throw new ObjectNotFoundException(
-				'Can not find similar extension "'.$value.'" !'
-			);
+			return new self($id);
 		}
 
 
@@ -841,17 +833,17 @@ public static function getExtensionList()
 
 		/**
 		 * Return extension without [dot] prefix.
-		 * @throws ObjectNotFoundException
+		 * @throws MissingElementException
 		 * @return string
 		 */
 		public function getExtension()
 		{
 			if(
-				isset( $this->extensions[$this->id] )
+				isset( static::$extensions[$this->id] )
 			)
-				return $this->extensions[$this->id];
+				return static::$extensions[$this->id];
 
-			throw new ObjectNotFoundException(
+			throw new MissingElementException(
 				'Can not find "'.$this->id.'" in extensions map!'
 			);
 		}

meta/classes/MetaConfiguration.class.php

@@ -505,16 +505,14 @@ class_exists($class->getName(), true)
 
 						if ($this->checkEnumerationRefIntegrity)
 						{
-							if($object instanceof Enumeration)
+							if(
+								$object instanceof Enumeration
+								|| $object instanceof Enum
+							)
 								$this->checkEnumerationReferentialIntegrity(
 									$object,
 									$class->getTableName()
 								);
-							elseif($object instanceof Enum)
-								$this->checkEnumReferentialIntegrity(
-									$object,
-									$class->getTableName()
-								);
 						}
 
 
@@ -1334,18 +1332,29 @@ private function checkClassSanity(
 		}
 
 		private function checkEnumerationReferentialIntegrity(
-			Enumeration $enumeration, $tableName
+			$enumeration, $tableName
 		)
 		{
+			Assert::isTrue(
+				(
+					$enumeration instanceof Enumeration
+					|| $enumeration instanceof Enum
+				),
+				'argument enumeation must be instacne of Enumeration or Enum! gived, "'.gettype($enumeration).'"'
+			);
+
 			$updateQueries = null;
 
 			$db = DBPool::me()->getLink();
 
 			$class = get_class($enumeration);
 
 			$ids = array();
-			
-			$list = $enumeration->getObjectList();
+
+			if ($enumeration instanceof Enumeration)
+				$list = $enumeration->getList();
+			elseif ($enumeration instanceof Enum)
+				$list = ClassUtils::callStaticMethod($class.'::getList');
 
 			foreach ($list as $enumerationObject)
 				$ids[$enumerationObject->getId()] = $enumerationObject->getName();
@@ -1383,56 +1392,5 @@ private function checkEnumerationReferentialIntegrity(
 
 			return $this;
 		}
-
-		private function checkEnumReferentialIntegrity(
-			Enum $enum, $tableName
-		)
-		{
-			$updateQueries = null;
-
-			$db = DBPool::me()->getLink();
-
-			$class = get_class($enum);
-
-			$ids = array();
-
-			$list = ClassUtils::callStaticMethod($class.'::'.'getObjectList');
-
-			foreach ($list as $enumerationObject)
-				$ids[$enumerationObject->getId()] = $enumerationObject->getName();
-
-			$rows =
-				$db->querySet(
-					OSQL::select()->from($tableName)->
-					multiGet('id', 'name')
-				);
-
-			echo "\n";
-
-			foreach ($rows as $row) {
-				if (!isset($ids[$row['id']]))
-					echo "Class '{$class}', strange id: {$row['id']} found. \n";
-				else {
-					if ($ids[$row['id']] != $row['name']) {
-						echo "Class '{$class}',id: {$row['id']} sync names. \n";
-
-						$updateQueries .=
-							OSQL::update($tableName)->
-							set('name', $ids[$row['id']])->
-							where(Expression::eq('id', $row['id']))->
-							toDialectString($db->getDialect()) . ";\n";
-					}
-
-					unset($ids[$row['id']]);
-				}
-			}
-
-			foreach ($ids as $id => $name)
-				echo "Class '{$class}', id: {$id} not present in database. \n";
-
-			echo $updateQueries;
-
-			return $this;
-		}
 	}
 ?>