pradosoft / prado

framework/Data/ActiveRecord/Scaffold/TScaffoldListView.php

Doc Comments +1 added lines

@@ -121,6 +121,7 @@
 
 	/**
 	 * @param string search condition, the SQL string after the WHERE clause.
+	 * @param string|null $value
 	 */
 	public function setSearchCondition($value)
 	{

Spacing +23 added lines, -23 removed lines

@@ -54,14 +54,14 @@ 
 	protected function initializeSort()
 	{
 		$table = $this->getTableInfo();
-		$sorts = array('Sort By', str_repeat('-',15));
+		$sorts = array('Sort By', str_repeat('-', 15));
 		$headers = array();
-		foreach($table->getColumns() as $name=>$colum)
+		foreach ($table->getColumns() as $name=>$colum)
 		{
 			$fname = ucwords(str_replace('_', ' ', $name));
-			$sorts[$name.' ASC'] = $fname .' Ascending';
-			$sorts[$name.' DESC'] = $fname .' Descending';
-			$headers[] = $fname ;
+			$sorts[$name . ' ASC'] = $fname . ' Ascending';
+			$sorts[$name . ' DESC'] = $fname . ' Descending';
+			$headers[] = $fname;
 		}
 		$this->_sort->setDataSource($sorts);
 		$this->_sort->dataBind();
@@ -75,7 +75,7 @@ 
 	public function onPreRender($param)
 	{
 		parent::onPreRender($param);
-		if(!$this->getPage()->getIsPostBack() || $this->getViewState('CurrentClass')!=$this->getRecordClass())
+		if (!$this->getPage()->getIsPostBack() || $this->getViewState('CurrentClass') != $this->getRecordClass())
 		{
 			$this->initializeSort();
 			$this->setViewState('CurrentClass', $this->getRecordClass());
@@ -103,18 +103,18 @@ 
 	{
 		$total = $this->_list->getVirtualItemCount();
 		$limit = $this->_list->getPageSize();
-		$offset = $this->_list->getCurrentPageIndex()*$limit;
-		if($offset + $limit > $total)
+		$offset = $this->_list->getCurrentPageIndex() * $limit;
+		if ($offset + $limit > $total)
 			$limit = $total - $offset;
 		$criteria = new TActiveRecordCriteria($this->getSearchCondition(), $this->getSearchParameters());
-		if($limit > 0)
+		if ($limit > 0)
 		{
 			$criteria->setLimit($limit);
-			if($offset <= $total)
+			if ($offset <= $total)
 				$criteria->setOffset($offset);
 		}
-		$order = explode(' ',$this->_sort->getSelectedValue(), 2);
-		if(is_array($order) && count($order) === 2)
+		$order = explode(' ', $this->_sort->getSelectedValue(), 2);
+		if (is_array($order) && count($order) === 2)
 			$criteria->OrdersBy[$order[0]] = $order[1];
 		return $criteria;
 	}
@@ -140,7 +140,7 @@ 
 	 */
 	public function setSearchParameters($value)
 	{
-		$this->setViewState('SearchParameters', TPropertyValue::ensureArray($value),array());
+		$this->setViewState('SearchParameters', TPropertyValue::ensureArray($value), array());
 	}
 
 	/**
@@ -156,7 +156,7 @@ 
 	 */
 	public function bubbleEvent($sender, $param)
 	{
-		switch(strtolower($param->getCommandName()))
+		switch (strtolower($param->getCommandName()))
 		{
 			case 'delete':
 				return $this->deleteRecord($sender, $param);
@@ -172,9 +172,9 @@ 
 	 */
 	protected function initializeEdit($sender, $param)
 	{
-		if(($ctrl=$this->getEditViewControl())!==null)
+		if (($ctrl = $this->getEditViewControl()) !== null)
 		{
-			if($param instanceof TRepeaterCommandEventParameter)
+			if ($param instanceof TRepeaterCommandEventParameter)
 			{
 				$pk = $param->getItem()->getCustomData();
 				$ctrl->setRecordPk($pk);
@@ -188,7 +188,7 @@ 
 	 */
 	protected function deleteRecord($sender, $param)
 	{
-		if($param instanceof TRepeaterCommandEventParameter)
+		if ($param instanceof TRepeaterCommandEventParameter)
 		{
 			$pk = $param->getItem()->getCustomData();
 			$this->getRecordFinder()->deleteByPk($pk);
@@ -201,10 +201,10 @@ 
 	protected function listItemCreated($sender, $param)
 	{
 		$item = $param->getItem();
-		if($item instanceof IItemDataRenderer)
+		if ($item instanceof IItemDataRenderer)
 		{
 			$type = $item->getItemType();
-			if($type==TListItemType::Item || $type==TListItemType::AlternatingItem)
+			if ($type == TListItemType::Item || $type == TListItemType::AlternatingItem)
 				$this->populateField($sender, $param);
 		}
 	}
@@ -216,10 +216,10 @@ 
 	protected function populateField($sender, $param)
 	{
 		$item = $param->getItem();
-		if(($data = $item->getData()) !== null)
+		if (($data = $item->getData()) !== null)
 		{
 			$item->setCustomData($this->getRecordPkValues($data));
-			if(($prop = $item->findControl('_properties'))!==null)
+			if (($prop = $item->findControl('_properties')) !== null)
 			{
 				$item->_properties->setDataSource($this->getRecordPropertyValues($data));
 				$item->_properties->dataBind();
@@ -292,10 +292,10 @@ 
 	 */
 	protected function getEditViewControl()
 	{
-		if(($id=$this->getEditViewID())!==null)
+		if (($id = $this->getEditViewID()) !== null)
 		{
 			$ctrl = $this->getParent()->findControl($id);
-			if($ctrl===null)
+			if ($ctrl === null)
 				throw new TConfigurationException('scaffold_unable_to_find_edit_view', $id);
 			return $ctrl;
 		}

Braces +15 added lines, -10 removed lines

@@ -104,18 +104,21 @@ 
 		$total = $this->_list->getVirtualItemCount();
 		$limit = $this->_list->getPageSize();
 		$offset = $this->_list->getCurrentPageIndex()*$limit;
-		if($offset + $limit > $total)
-			$limit = $total - $offset;
+		if($offset + $limit > $total) {
+					$limit = $total - $offset;
+		}
 		$criteria = new TActiveRecordCriteria($this->getSearchCondition(), $this->getSearchParameters());
 		if($limit > 0)
 		{
 			$criteria->setLimit($limit);
-			if($offset <= $total)
-				$criteria->setOffset($offset);
+			if($offset <= $total) {
+							$criteria->setOffset($offset);
+			}
 		}
 		$order = explode(' ',$this->_sort->getSelectedValue(), 2);
-		if(is_array($order) && count($order) === 2)
-			$criteria->OrdersBy[$order[0]] = $order[1];
+		if(is_array($order) && count($order) === 2) {
+					$criteria->OrdersBy[$order[0]] = $order[1];
+		}
 		return $criteria;
 	}
 
@@ -204,8 +207,9 @@ 
 		if($item instanceof IItemDataRenderer)
 		{
 			$type = $item->getItemType();
-			if($type==TListItemType::Item || $type==TListItemType::AlternatingItem)
-				$this->populateField($sender, $param);
+			if($type==TListItemType::Item || $type==TListItemType::AlternatingItem) {
+							$this->populateField($sender, $param);
+			}
 		}
 	}
 
@@ -295,8 +299,9 @@ 
 		if(($id=$this->getEditViewID())!==null)
 		{
 			$ctrl = $this->getParent()->findControl($id);
-			if($ctrl===null)
-				throw new TConfigurationException('scaffold_unable_to_find_edit_view', $id);
+			if($ctrl===null) {
+							throw new TConfigurationException('scaffold_unable_to_find_edit_view', $id);
+			}
 			return $ctrl;
 		}
 	}

framework/Data/ActiveRecord/TActiveRecord.php

Doc Comments +6 added lines, -1 removed lines

@@ -651,6 +651,7 @@ 
 	 * class.
 	 * @param string select SQL
 	 * @param array $parameters
+	 * @param string $sql
 	 * @return TActiveRecord, null if no result is returned.
 	 */
 	public function findBySql($sql,$parameters=array())
@@ -715,6 +716,7 @@ 
 	 * value equal to the $property value.
 	 * @param string relationship/property name corresponding to keys in $RELATION array.
 	 * @param array method call arguments.
+	 * @param string $name
 	 * @return TActiveRecordRelation, null if the context or the handler doesn't exist
 	 */
 	protected function getRelationHandler($name,$args=array())
@@ -939,6 +941,7 @@ 
 	 * Raised before the record attempt to insert its data into the database.
 	 * To prevent the insert operation, set the TActiveRecordChangeEventParameter::IsValid parameter to false.
 	 * @param TActiveRecordChangeEventParameter event parameter to be passed to the event handlers
+	 * @param TActiveRecordChangeEventParameter $param
 	 */
 	public function onInsert($param)
 	{
@@ -949,6 +952,7 @@ 
 	 * Raised before the record attempt to delete its data from the database.
 	 * To prevent the delete operation, set the TActiveRecordChangeEventParameter::IsValid parameter to false.
 	 * @param TActiveRecordChangeEventParameter event parameter to be passed to the event handlers
+	 * @param TActiveRecordChangeEventParameter $param
 	 */
 	public function onDelete($param)
 	{
@@ -959,6 +963,7 @@ 
 	 * Raised before the record attempt to update its data in the database.
 	 * To prevent the update operation, set the TActiveRecordChangeEventParameter::IsValid parameter to false.
 	 * @param TActiveRecordChangeEventParameter event parameter to be passed to the event handlers
+	 * @param TActiveRecordChangeEventParameter $param
 	 */
 	public function onUpdate($param)
 	{
@@ -1042,7 +1047,7 @@ 
     
     	/**
      	* Return record data as JSON
-     	* @return JSON
+     	* @return string
      	* @since 3.2.4
      	*/
     	public function toJSON(){

Indentation +20 added lines, -20 removed lines

@@ -1026,28 +1026,28 @@
 		return isset(self::$_relations[get_class($this)][strtolower($property)]);
 	}
 	
-        /**
-        * Return record data as array
-        * @return array of column name and column values
-        * @since 3.2.4
-        */
-        public function toArray(){
-        	$result=array();
-        	foreach($this->getRecordTableInfo()->getLowerCaseColumnNames() as $columnName){
-            		$result[$columnName]=$this->getColumnValue($columnName);
-           	}
+		/**
+		 * Return record data as array
+		 * @return array of column name and column values
+		 * @since 3.2.4
+		 */
+		public function toArray(){
+			$result=array();
+			foreach($this->getRecordTableInfo()->getLowerCaseColumnNames() as $columnName){
+					$result[$columnName]=$this->getColumnValue($columnName);
+		   	}
         
-        	return $result;
-    	}
+			return $result;
+		}
     
-    	/**
-     	* Return record data as JSON
-     	* @return JSON
-     	* @since 3.2.4
-     	*/
-    	public function toJSON(){
-        	return json_encode($this->toArray());
-    	}
+		/**
+		 * Return record data as JSON
+		 * @return JSON
+		 * @since 3.2.4
+		 */
+		public function toJSON(){
+			return json_encode($this->toArray());
+		}
 }
 
 /**

Spacing +141 added lines, -141 removed lines

@@ -146,20 +146,20 @@ 
  */
 abstract class TActiveRecord extends TComponent
 {
-	const BELONGS_TO='BELONGS_TO';
-	const HAS_ONE='HAS_ONE';
-	const HAS_MANY='HAS_MANY';
-	const MANY_TO_MANY='MANY_TO_MANY';
+	const BELONGS_TO = 'BELONGS_TO';
+	const HAS_ONE = 'HAS_ONE';
+	const HAS_MANY = 'HAS_MANY';
+	const MANY_TO_MANY = 'MANY_TO_MANY';
 
-	const STATE_NEW=0;
-	const STATE_LOADED=1;
-	const STATE_DELETED=2;
+	const STATE_NEW = 0;
+	const STATE_LOADED = 1;
+	const STATE_DELETED = 2;
 
 	/**
 	 * @var integer record state: 0 = new, 1 = loaded, 2 = deleted.
 	 * @since 3.1.2
 	 */
-	protected $_recordState=0; // use protected so that serialization is fine
+	protected $_recordState = 0; // use protected so that serialization is fine
 
 	/**
 	 * This static variable defines the column mapping.
@@ -169,8 +169,8 @@ 
 	 * @var array column mapping. Keys: physical column names, values: logical column names.
 	 * @since 3.1.1
 	 */
-	public static $COLUMN_MAPPING=array();
-	private static $_columnMapping=array();
+	public static $COLUMN_MAPPING = array();
+	private static $_columnMapping = array();
 
 	/**
 	 * This static variable defines the relationships.
@@ -179,8 +179,8 @@ 
 	 * @var array relationship.
 	 * @since 3.1.1
 	 */
-	public static $RELATIONS=array();
-	private static $_relations=array();
+	public static $RELATIONS = array();
+	private static $_relations = array();
 
 	/**
 	 * @var TDbConnection database connection object.
@@ -201,7 +201,7 @@ 
 	 */
 	public function __sleep()
 	{
-		return array_diff(parent::__sleep(),array("\0*\0_connection"));
+		return array_diff(parent::__sleep(), array("\0*\0_connection"));
 	}
 
 	/**
@@ -220,13 +220,13 @@ 
 	 * @param array optional name value pair record data.
 	 * @param TDbConnection optional database connection this object record use.
 	 */
-	public function __construct($data=array(), $connection=null)
+	public function __construct($data = array(), $connection = null)
 	{
-		if($connection!==null)
+		if ($connection !== null)
 			$this->setDbConnection($connection);
 		$this->setupColumnMapping();
 		$this->setupRelations();
-		if(!empty($data)) //$data may be an object
+		if (!empty($data)) //$data may be an object
 			$this->copyFrom($data);
 	}
 
@@ -240,7 +240,7 @@ 
 	 */
 	public function __get($name)
 	{
-		if($this->hasRecordRelation($name) && !$this->canGetProperty($name))
+		if ($this->hasRecordRelation($name) && !$this->canGetProperty($name))
 		{
 			$this->fetchResultsFor($name);
 			return $this->$name;
@@ -256,12 +256,12 @@ 
 	 * @param mixed property value.
 	 * @since 3.1.2
 	 */
-	public function __set($name,$value)
+	public function __set($name, $value)
 	{
-		if($this->hasRecordRelation($name) && !$this->canSetProperty($name))
-			$this->$name=$value;
+		if ($this->hasRecordRelation($name) && !$this->canSetProperty($name))
+			$this->$name = $value;
 		else
-			parent::__set($name,$value);
+			parent::__set($name, $value);
 	}
 
 	/**
@@ -269,11 +269,11 @@ 
 	 */
 	private function setupColumnMapping()
 	{
-		$className=get_class($this);
-		if(!isset(self::$_columnMapping[$className]))
+		$className = get_class($this);
+		if (!isset(self::$_columnMapping[$className]))
 		{
-			$class=new ReflectionClass($className);
-			self::$_columnMapping[$className]=$class->getStaticPropertyValue('COLUMN_MAPPING');
+			$class = new ReflectionClass($className);
+			self::$_columnMapping[$className] = $class->getStaticPropertyValue('COLUMN_MAPPING');
 		}
 	}
 
@@ -282,14 +282,14 @@ 
 	 */
 	private function setupRelations()
 	{
-		$className=get_class($this);
-		if(!isset(self::$_relations[$className]))
+		$className = get_class($this);
+		if (!isset(self::$_relations[$className]))
 		{
-			$class=new ReflectionClass($className);
-			$relations=array();
-			foreach($class->getStaticPropertyValue('RELATIONS') as $key=>$value)
-				$relations[strtolower($key)]=array($key,$value);
-			self::$_relations[$className]=$relations;
+			$class = new ReflectionClass($className);
+			$relations = array();
+			foreach ($class->getStaticPropertyValue('RELATIONS') as $key=>$value)
+				$relations[strtolower($key)] = array($key, $value);
+			self::$_relations[$className] = $relations;
 		}
 	}
 
@@ -299,18 +299,18 @@ 
 	 */
 	public function copyFrom($data)
 	{
-		if(is_object($data))
-			$data=get_object_vars($data);
-		if(!is_array($data))
+		if (is_object($data))
+			$data = get_object_vars($data);
+		if (!is_array($data))
 			throw new TActiveRecordException('ar_data_invalid', get_class($this));
-		foreach($data as $name=>$value)
-			$this->setColumnValue($name,$value);
+		foreach ($data as $name=>$value)
+			$this->setColumnValue($name, $value);
 	}
 
 
 	public static function getActiveDbConnection()
 	{
-		if(($db=self::getRecordManager()->getDbConnection())!==null)
+		if (($db = self::getRecordManager()->getDbConnection()) !== null)
 			$db->setActive(true);
 		return $db;
 	}
@@ -322,8 +322,8 @@ 
 	 */
 	public function getDbConnection()
 	{
-		if($this->_connection===null)
-			$this->_connection=self::getActiveDbConnection();
+		if ($this->_connection === null)
+			$this->_connection = self::getActiveDbConnection();
 		return $this->_connection;
 	}
 
@@ -332,7 +332,7 @@ 
 	 */
 	public function setDbConnection($connection)
 	{
-		$this->_connection=$connection;
+		$this->_connection = $connection;
 	}
 
 	/**
@@ -351,21 +351,21 @@ 
 	 * @param boolean true to perform strict identity comparison
 	 * @return boolean true if $record equals, false otherwise.
 	 */
-	public function equals(TActiveRecord $record, $strict=false)
+	public function equals(TActiveRecord $record, $strict = false)
 	{
-		if($record===null || get_class($this)!==get_class($record))
+		if ($record === null || get_class($this) !== get_class($record))
 			return false;
 		$tableInfo = $this->getRecordTableInfo();
 		$pks = $tableInfo->getPrimaryKeys();
 		$properties = count($pks) > 0 ? $pks : $tableInfo->getColumns()->getKeys();
-		$equals=true;
-		foreach($properties as $prop)
+		$equals = true;
+		foreach ($properties as $prop)
 		{
-			if($strict)
+			if ($strict)
 				$equals = $equals && $this->getColumnValue($prop) === $record->getColumnValue($prop);
 			else
 				$equals = $equals && $this->getColumnValue($prop) == $record->getColumnValue($prop);
-			if(!$equals)
+			if (!$equals)
 				return false;
 		}
 		return $equals;
@@ -380,13 +380,13 @@ 
 	 * @param string active record class name.
 	 * @return TActiveRecord active record finder instance.
 	 */
-	public static function finder($className=__CLASS__)
+	public static function finder($className = __CLASS__)
 	{
 		static $finders = array();
-		if(!isset($finders[$className]))
+		if (!isset($finders[$className]))
 		{
 			$f = Prado::createComponent($className);
-			$finders[$className]=$f;
+			$finders[$className] = $f;
 		}
 		return $finders[$className];
 	}
@@ -417,19 +417,19 @@ 
 	{
 		$gateway = $this->getRecordGateway();
 		$param = new TActiveRecordChangeEventParameter();
-		if($this->_recordState===self::STATE_NEW)
+		if ($this->_recordState === self::STATE_NEW)
 		{
 			$this->onInsert($param);
-			if($param->getIsValid() && $gateway->insert($this))
+			if ($param->getIsValid() && $gateway->insert($this))
 			{
 				$this->_recordState = self::STATE_LOADED;
 				return true;
 			}
 		}
-		else if($this->_recordState===self::STATE_LOADED)
+		else if ($this->_recordState === self::STATE_LOADED)
 		{
 			$this->onUpdate($param);
-			if($param->getIsValid() && $gateway->update($this))
+			if ($param->getIsValid() && $gateway->update($this))
 				return true;
 		}
 		else
@@ -445,14 +445,14 @@ 
 	 */
 	public function delete()
 	{
-		if($this->_recordState===self::STATE_LOADED)
+		if ($this->_recordState === self::STATE_LOADED)
 		{
 			$gateway = $this->getRecordGateway();
 			$param = new TActiveRecordChangeEventParameter();
 			$this->onDelete($param);
-			if($param->getIsValid() && $gateway->delete($this))
+			if ($param->getIsValid() && $gateway->delete($this))
 			{
-				$this->_recordState=self::STATE_DELETED;
+				$this->_recordState = self::STATE_DELETED;
 				return true;
 			}
 		}
@@ -487,9 +487,9 @@ 
 	 */
 	public function deleteByPk($keys)
 	{
-		if(func_num_args() > 1)
+		if (func_num_args() > 1)
 			$keys = func_get_args();
-		return $this->getRecordGateway()->deleteRecordsByPk($this,(array)$keys);
+		return $this->getRecordGateway()->deleteRecordsByPk($this, (array) $keys);
 	}
 
 	/**
@@ -497,7 +497,7 @@ 
 	 */
 	public function deleteAllByPks($keys)
 	{
-		if(func_num_args() > 1)
+		if (func_num_args() > 1)
 			$keys = func_get_args();
 		return $this->deleteByPk($keys);
 	}
@@ -507,10 +507,10 @@ 
 	 * @param mixed parameter values.
 	 * @return int number of records deleted.
 	 */
-	public function deleteAll($criteria=null, $parameters=array())
+	public function deleteAll($criteria = null, $parameters = array())
 	{
-		$args = func_num_args() > 1 ? array_slice(func_get_args(),1) : null;
-		$criteria = $this->getRecordCriteria($criteria,$parameters, $args);
+		$args = func_num_args() > 1 ? array_slice(func_get_args(), 1) : null;
+		$criteria = $this->getRecordCriteria($criteria, $parameters, $args);
 		return $this->getRecordGateway()->deleteRecordsByCriteria($this, $criteria);
 	}
 
@@ -532,8 +532,8 @@ 
 	 */
 	protected function populateObjects($reader)
 	{
-		$result=array();
-		foreach($reader as $data)
+		$result = array();
+		foreach ($reader as $data)
 			$result[] = $this->populateObject($data);
 		return $result;
 	}
@@ -549,10 +549,10 @@ 
 	 */
 	public static function createRecord($type, $data)
 	{
-		if(empty($data))
+		if (empty($data))
 			return null;
-		$record=new $type($data);
-		$record->_recordState=self::STATE_LOADED;
+		$record = new $type($data);
+		$record->_recordState = self::STATE_LOADED;
 		return $record;
 	}
 
@@ -573,12 +573,12 @@ 
 	 * @param mixed parameter values.
 	 * @return TActiveRecord matching record object. Null if no result is found.
 	 */
-	public function find($criteria,$parameters=array())
+	public function find($criteria, $parameters = array())
 	{
-		$args = func_num_args() > 1 ? array_slice(func_get_args(),1) : null;
-		$criteria = $this->getRecordCriteria($criteria,$parameters, $args);
+		$args = func_num_args() > 1 ? array_slice(func_get_args(), 1) : null;
+		$criteria = $this->getRecordCriteria($criteria, $parameters, $args);
 		$criteria->setLimit(1);
-		$data = $this->getRecordGateway()->findRecordsByCriteria($this,$criteria);
+		$data = $this->getRecordGateway()->findRecordsByCriteria($this, $criteria);
 		return $this->populateObject($data);
 	}
 
@@ -589,12 +589,12 @@ 
 	 * @param mixed parameter values.
 	 * @return array matching record objects. Empty array if no result is found.
 	 */
-	public function findAll($criteria=null,$parameters=array())
+	public function findAll($criteria = null, $parameters = array())
 	{
-		$args = func_num_args() > 1 ? array_slice(func_get_args(),1) : null;
-		if($criteria!==null)
-			$criteria = $this->getRecordCriteria($criteria,$parameters, $args);
-		$result = $this->getRecordGateway()->findRecordsByCriteria($this,$criteria,true);
+		$args = func_num_args() > 1 ? array_slice(func_get_args(), 1) : null;
+		if ($criteria !== null)
+			$criteria = $this->getRecordCriteria($criteria, $parameters, $args);
+		$result = $this->getRecordGateway()->findRecordsByCriteria($this, $criteria, true);
 		return $this->populateObjects($result);
 	}
 
@@ -612,11 +612,11 @@ 
 	 */
 	public function findByPk($keys)
 	{
-		if($keys === null)
+		if ($keys === null)
 			return null;
-		if(func_num_args() > 1)
+		if (func_num_args() > 1)
 			$keys = func_get_args();
-		$data = $this->getRecordGateway()->findRecordByPK($this,$keys);
+		$data = $this->getRecordGateway()->findRecordByPK($this, $keys);
 		return $this->populateObject($data);
 	}
 
@@ -639,9 +639,9 @@ 
 	 */
 	public function findAllByPks($keys)
 	{
-		if(func_num_args() > 1)
+		if (func_num_args() > 1)
 			$keys = func_get_args();
-		$result = $this->getRecordGateway()->findRecordsByPks($this,(array)$keys);
+		$result = $this->getRecordGateway()->findRecordsByPks($this, (array) $keys);
 		return $this->populateObjects($result);
 	}
 
@@ -653,12 +653,12 @@ 
 	 * @param array $parameters
 	 * @return TActiveRecord, null if no result is returned.
 	 */
-	public function findBySql($sql,$parameters=array())
+	public function findBySql($sql, $parameters = array())
 	{
-		$args = func_num_args() > 1 ? array_slice(func_get_args(),1) : null;
-		$criteria = $this->getRecordCriteria($sql,$parameters, $args);
+		$args = func_num_args() > 1 ? array_slice(func_get_args(), 1) : null;
+		$criteria = $this->getRecordCriteria($sql, $parameters, $args);
 		$criteria->setLimit(1);
-		$data = $this->getRecordGateway()->findRecordBySql($this,$criteria);
+		$data = $this->getRecordGateway()->findRecordBySql($this, $criteria);
 		return $this->populateObject($data);
 	}
 
@@ -670,11 +670,11 @@ 
 	 * @param array $parameters
 	 * @return array matching active records. Empty array is returned if no result is found.
 	 */
-	public function findAllBySql($sql,$parameters=array())
+	public function findAllBySql($sql, $parameters = array())
 	{
-		$args = func_num_args() > 1 ? array_slice(func_get_args(),1) : null;
-		$criteria = $this->getRecordCriteria($sql,$parameters, $args);
-		$result = $this->getRecordGateway()->findRecordsBySql($this,$criteria);
+		$args = func_num_args() > 1 ? array_slice(func_get_args(), 1) : null;
+		$criteria = $this->getRecordCriteria($sql, $parameters, $args);
+		$result = $this->getRecordGateway()->findRecordsBySql($this, $criteria);
 		return $this->populateObjects($result);
 	}
 
@@ -690,9 +690,9 @@ 
 	 * @param array matching field values.
 	 * @return array matching active records. Empty array is returned if no result is found.
 	 */
-	public function findAllByIndex($criteria,$fields,$values)
+	public function findAllByIndex($criteria, $fields, $values)
 	{
-		$result = $this->getRecordGateway()->findRecordsByIndex($this,$criteria,$fields,$values);
+		$result = $this->getRecordGateway()->findRecordsByIndex($this, $criteria, $fields, $values);
 		return $this->populateObjects($result);
 	}
 
@@ -702,12 +702,12 @@ 
 	 * @param mixed parameter values.
 	 * @return int number of records.
 	 */
-	public function count($criteria=null,$parameters=array())
+	public function count($criteria = null, $parameters = array())
 	{
-		$args = func_num_args() > 1 ? array_slice(func_get_args(),1) : null;
-		if($criteria!==null)
-			$criteria = $this->getRecordCriteria($criteria,$parameters, $args);
-		return $this->getRecordGateway()->countRecords($this,$criteria);
+		$args = func_num_args() > 1 ? array_slice(func_get_args(), 1) : null;
+		if ($criteria !== null)
+			$criteria = $this->getRecordCriteria($criteria, $parameters, $args);
+		return $this->getRecordGateway()->countRecords($this, $criteria);
 	}
 
 	/**
@@ -717,11 +717,11 @@ 
 	 * @param array method call arguments.
 	 * @return TActiveRecordRelation, null if the context or the handler doesn't exist
 	 */
-	protected function getRelationHandler($name,$args=array())
+	protected function getRelationHandler($name, $args = array())
 	{
-		if(($context=$this->createRelationContext($name)) !== null)
+		if (($context = $this->createRelationContext($name)) !== null)
 		{
-			$criteria = $this->getRecordCriteria(count($args)>0 ? $args[0] : null, array_slice($args,1));
+			$criteria = $this->getRecordCriteria(count($args) > 0 ? $args[0] : null, array_slice($args, 1));
 			return $context->getRelationHandler($criteria);
 		}
 		else
@@ -739,10 +739,10 @@ 
 	 */
 	protected function createRelationContext($name)
 	{
-		if(($definition=$this->getRecordRelation($name))!==null)
+		if (($definition = $this->getRecordRelation($name)) !== null)
 		{
 			list($property, $relation) = $definition;
-			return new TActiveRecordRelationContext($this,$property,$relation);
+			return new TActiveRecordRelationContext($this, $property, $relation);
 		}
 		else
 			return null;
@@ -785,7 +785,7 @@ 
 	 */
 	protected function fetchResultsFor($property)
 	{
-		if( ($context=$this->createRelationContext($property)) !== null)
+		if (($context = $this->createRelationContext($property)) !== null)
 			return $context->getRelationHandler()->fetchResultsInto($this);
 		else
 			return false;
@@ -820,32 +820,32 @@ 
 	 * @return mixed single record if method name starts with "findBy", 0 or more records
 	 * if method name starts with "findAllBy"
 	 */
-	public function __call($method,$args)
+	public function __call($method, $args)
 	{
-		$delete =false;
-		if(strncasecmp($method,'with',4)===0)
+		$delete = false;
+		if (strncasecmp($method, 'with', 4) === 0)
 		{
-			$property= $method[4]==='_' ? substr($method,5) : substr($method,4);
+			$property = $method[4] === '_' ? substr($method, 5) : substr($method, 4);
 			return $this->getRelationHandler($property, $args);
 		}
-		else if($findOne=strncasecmp($method,'findby',6)===0)
-			$condition = $method[6]==='_' ? substr($method,7) : substr($method,6);
-		else if(strncasecmp($method,'findallby',9)===0)
-			$condition = $method[9]==='_' ? substr($method,10) : substr($method,9);
-		else if($delete=strncasecmp($method,'deleteby',8)===0)
-			$condition = $method[8]==='_' ? substr($method,9) : substr($method,8);
-		else if($delete=strncasecmp($method,'deleteallby',11)===0)
-			$condition = $method[11]==='_' ? substr($method,12) : substr($method,11);
+		else if ($findOne = strncasecmp($method, 'findby', 6) === 0)
+			$condition = $method[6] === '_' ? substr($method, 7) : substr($method, 6);
+		else if (strncasecmp($method, 'findallby', 9) === 0)
+			$condition = $method[9] === '_' ? substr($method, 10) : substr($method, 9);
+		else if ($delete = strncasecmp($method, 'deleteby', 8) === 0)
+			$condition = $method[8] === '_' ? substr($method, 9) : substr($method, 8);
+		else if ($delete = strncasecmp($method, 'deleteallby', 11) === 0)
+			$condition = $method[11] === '_' ? substr($method, 12) : substr($method, 11);
 		else
 		{
-			if($this->getInvalidFinderResult() == TActiveRecordInvalidFinderResult::Exception)
-				throw new TActiveRecordException('ar_invalid_finder_method',$method);
+			if ($this->getInvalidFinderResult() == TActiveRecordInvalidFinderResult::Exception)
+				throw new TActiveRecordException('ar_invalid_finder_method', $method);
 			else
 				return null;
 		}
 
 		$criteria = $this->getRecordGateway()->getCommand($this)->createCriteriaFromString($method, $condition, $args);
-		if($delete)
+		if ($delete)
 			return $this->deleteAll($criteria);
 		else
 			return $findOne ? $this->find($criteria) : $this->findAll($criteria);
@@ -858,7 +858,7 @@ 
 	 */
 	public function getInvalidFinderResult()
 	{
-		if($this->_invalidFinderResult !== null)
+		if ($this->_invalidFinderResult !== null)
 			return $this->_invalidFinderResult;
 
 		return self::getRecordManager()->getInvalidFinderResult();
@@ -873,7 +873,7 @@ 
 	 */
 	public function setInvalidFinderResult($value)
 	{
-		if($value === null)
+		if ($value === null)
 			$this->_invalidFinderResult = null;
 		else
 			$this->_invalidFinderResult = TPropertyValue::ensureEnum($value, 'TActiveRecordInvalidFinderResult');
@@ -888,14 +888,14 @@ 
 	 * @param array additional parameters obtained from function_get_args().
 	 * @return TSqlCriteria criteria object.
 	 */
-	protected function getRecordCriteria($criteria, $parameters, $args=array())
+	protected function getRecordCriteria($criteria, $parameters, $args = array())
 	{
-		if(is_string($criteria))
+		if (is_string($criteria))
 		{
 			$useArgs = !is_array($parameters) && is_array($args);
-			return new TActiveRecordCriteria($criteria,$useArgs ? $args : $parameters);
+			return new TActiveRecordCriteria($criteria, $useArgs ? $args : $parameters);
 		}
-		else if($criteria instanceof TSqlCriteria)
+		else if ($criteria instanceof TSqlCriteria)
 			return $criteria;
 		else
 			return new TActiveRecordCriteria();
@@ -974,9 +974,9 @@ 
 	 */
 	public function getColumnValue($columnName)
 	{
-		$className=get_class($this);
-		if(isset(self::$_columnMapping[$className][$columnName]))
-			$columnName=self::$_columnMapping[$className][$columnName];
+		$className = get_class($this);
+		if (isset(self::$_columnMapping[$className][$columnName]))
+			$columnName = self::$_columnMapping[$className][$columnName];
 		return $this->$columnName;
 	}
 
@@ -987,12 +987,12 @@ 
 	 * @param mixed the corresponding column value
 	 * @since 3.1.1
 	 */
-	public function setColumnValue($columnName,$value)
+	public function setColumnValue($columnName, $value)
 	{
-		$className=get_class($this);
-		if(isset(self::$_columnMapping[$className][$columnName]))
-			$columnName=self::$_columnMapping[$className][$columnName];
-		$this->$columnName=$value;
+		$className = get_class($this);
+		if (isset(self::$_columnMapping[$className][$columnName]))
+			$columnName = self::$_columnMapping[$className][$columnName];
+		$this->$columnName = $value;
 	}
 
 	/**
@@ -1002,9 +1002,9 @@ 
 	 */
 	public function getRecordRelation($property)
 	{
-		$className=get_class($this);
-		$property=strtolower($property);
-		return isset(self::$_relations[$className][$property])?self::$_relations[$className][$property]:null;
+		$className = get_class($this);
+		$property = strtolower($property);
+		return isset(self::$_relations[$className][$property]) ? self::$_relations[$className][$property] : null;
 	}
 
 	/**
@@ -1031,10 +1031,10 @@ 
         * @return array of column name and column values
         * @since 3.2.4
         */
-        public function toArray(){
-        	$result=array();
-        	foreach($this->getRecordTableInfo()->getLowerCaseColumnNames() as $columnName){
-            		$result[$columnName]=$this->getColumnValue($columnName);
+        public function toArray() {
+        	$result = array();
+        	foreach ($this->getRecordTableInfo()->getLowerCaseColumnNames() as $columnName) {
+            		$result[$columnName] = $this->getColumnValue($columnName);
            	}
         
         	return $result;
@@ -1045,7 +1045,7 @@ 
      	* @return JSON
      	* @since 3.2.4
      	*/
-    	public function toJSON(){
+    	public function toJSON() {
         	return json_encode($this->toArray());
     	}
 }
@@ -1065,7 +1065,7 @@ 
  */
 class TActiveRecordChangeEventParameter extends TEventParameter
 {
-	private $_isValid=true;
+	private $_isValid = true;
 
 	/**
 	 * @return boolean whether the event should be performed.

Braces +121 added lines, -93 removed lines

@@ -222,12 +222,15 @@ 
 	 */
 	public function __construct($data=array(), $connection=null)
 	{
-		if($connection!==null)
-			$this->setDbConnection($connection);
+		if($connection!==null) {
+					$this->setDbConnection($connection);
+		}
 		$this->setupColumnMapping();
 		$this->setupRelations();
-		if(!empty($data)) //$data may be an object
+		if(!empty($data)) {
+			//$data may be an object
 			$this->copyFrom($data);
+		}
 	}
 
 	/**
@@ -258,10 +261,11 @@ 
 	 */
 	public function __set($name,$value)
 	{
-		if($this->hasRecordRelation($name) && !$this->canSetProperty($name))
-			$this->$name=$value;
-		else
-			parent::__set($name,$value);
+		if($this->hasRecordRelation($name) && !$this->canSetProperty($name)) {
+					$this->$name=$value;
+		} else {
+					parent::__set($name,$value);
+		}
 	}
 
 	/**
@@ -287,8 +291,9 @@ 
 		{
 			$class=new ReflectionClass($className);
 			$relations=array();
-			foreach($class->getStaticPropertyValue('RELATIONS') as $key=>$value)
-				$relations[strtolower($key)]=array($key,$value);
+			foreach($class->getStaticPropertyValue('RELATIONS') as $key=>$value) {
+							$relations[strtolower($key)]=array($key,$value);
+			}
 			self::$_relations[$className]=$relations;
 		}
 	}
@@ -299,19 +304,23 @@ 
 	 */
 	public function copyFrom($data)
 	{
-		if(is_object($data))
-			$data=get_object_vars($data);
-		if(!is_array($data))
-			throw new TActiveRecordException('ar_data_invalid', get_class($this));
-		foreach($data as $name=>$value)
-			$this->setColumnValue($name,$value);
+		if(is_object($data)) {
+					$data=get_object_vars($data);
+		}
+		if(!is_array($data)) {
+					throw new TActiveRecordException('ar_data_invalid', get_class($this));
+		}
+		foreach($data as $name=>$value) {
+					$this->setColumnValue($name,$value);
+		}
 	}
 
 
 	public static function getActiveDbConnection()
 	{
-		if(($db=self::getRecordManager()->getDbConnection())!==null)
-			$db->setActive(true);
+		if(($db=self::getRecordManager()->getDbConnection())!==null) {
+					$db->setActive(true);
+		}
 		return $db;
 	}
 
@@ -322,8 +331,9 @@ 
 	 */
 	public function getDbConnection()
 	{
-		if($this->_connection===null)
-			$this->_connection=self::getActiveDbConnection();
+		if($this->_connection===null) {
+					$this->_connection=self::getActiveDbConnection();
+		}
 		return $this->_connection;
 	}
 
@@ -353,20 +363,23 @@ 
 	 */
 	public function equals(TActiveRecord $record, $strict=false)
 	{
-		if($record===null || get_class($this)!==get_class($record))
-			return false;
+		if($record===null || get_class($this)!==get_class($record)) {
+					return false;
+		}
 		$tableInfo = $this->getRecordTableInfo();
 		$pks = $tableInfo->getPrimaryKeys();
 		$properties = count($pks) > 0 ? $pks : $tableInfo->getColumns()->getKeys();
 		$equals=true;
 		foreach($properties as $prop)
 		{
-			if($strict)
-				$equals = $equals && $this->getColumnValue($prop) === $record->getColumnValue($prop);
-			else
-				$equals = $equals && $this->getColumnValue($prop) == $record->getColumnValue($prop);
-			if(!$equals)
-				return false;
+			if($strict) {
+							$equals = $equals && $this->getColumnValue($prop) === $record->getColumnValue($prop);
+			} else {
+							$equals = $equals && $this->getColumnValue($prop) == $record->getColumnValue($prop);
+			}
+			if(!$equals) {
+							return false;
+			}
 		}
 		return $equals;
 	}
@@ -425,15 +438,15 @@ 
 				$this->_recordState = self::STATE_LOADED;
 				return true;
 			}
-		}
-		else if($this->_recordState===self::STATE_LOADED)
+		} else if($this->_recordState===self::STATE_LOADED)
 		{
 			$this->onUpdate($param);
-			if($param->getIsValid() && $gateway->update($this))
-				return true;
+			if($param->getIsValid() && $gateway->update($this)) {
+							return true;
+			}
+		} else {
+					throw new TActiveRecordException('ar_save_invalid', get_class($this));
 		}
-		else
-			throw new TActiveRecordException('ar_save_invalid', get_class($this));
 
 		return false;
 	}
@@ -455,9 +468,9 @@ 
 				$this->_recordState=self::STATE_DELETED;
 				return true;
 			}
+		} else {
+					throw new TActiveRecordException('ar_delete_invalid', get_class($this));
 		}
-		else
-			throw new TActiveRecordException('ar_delete_invalid', get_class($this));
 
 		return false;
 	}
@@ -487,8 +500,9 @@ 
 	 */
 	public function deleteByPk($keys)
 	{
-		if(func_num_args() > 1)
-			$keys = func_get_args();
+		if(func_num_args() > 1) {
+					$keys = func_get_args();
+		}
 		return $this->getRecordGateway()->deleteRecordsByPk($this,(array)$keys);
 	}
 
@@ -497,8 +511,9 @@ 
 	 */
 	public function deleteAllByPks($keys)
 	{
-		if(func_num_args() > 1)
-			$keys = func_get_args();
+		if(func_num_args() > 1) {
+					$keys = func_get_args();
+		}
 		return $this->deleteByPk($keys);
 	}
 	/**
@@ -533,8 +548,9 @@ 
 	protected function populateObjects($reader)
 	{
 		$result=array();
-		foreach($reader as $data)
-			$result[] = $this->populateObject($data);
+		foreach($reader as $data) {
+					$result[] = $this->populateObject($data);
+		}
 		return $result;
 	}
 
@@ -549,8 +565,9 @@ 
 	 */
 	public static function createRecord($type, $data)
 	{
-		if(empty($data))
-			return null;
+		if(empty($data)) {
+					return null;
+		}
 		$record=new $type($data);
 		$record->_recordState=self::STATE_LOADED;
 		return $record;
@@ -592,8 +609,9 @@ 
 	public function findAll($criteria=null,$parameters=array())
 	{
 		$args = func_num_args() > 1 ? array_slice(func_get_args(),1) : null;
-		if($criteria!==null)
-			$criteria = $this->getRecordCriteria($criteria,$parameters, $args);
+		if($criteria!==null) {
+					$criteria = $this->getRecordCriteria($criteria,$parameters, $args);
+		}
 		$result = $this->getRecordGateway()->findRecordsByCriteria($this,$criteria,true);
 		return $this->populateObjects($result);
 	}
@@ -612,10 +630,12 @@ 
 	 */
 	public function findByPk($keys)
 	{
-		if($keys === null)
-			return null;
-		if(func_num_args() > 1)
-			$keys = func_get_args();
+		if($keys === null) {
+					return null;
+		}
+		if(func_num_args() > 1) {
+					$keys = func_get_args();
+		}
 		$data = $this->getRecordGateway()->findRecordByPK($this,$keys);
 		return $this->populateObject($data);
 	}
@@ -639,8 +659,9 @@ 
 	 */
 	public function findAllByPks($keys)
 	{
-		if(func_num_args() > 1)
-			$keys = func_get_args();
+		if(func_num_args() > 1) {
+					$keys = func_get_args();
+		}
 		$result = $this->getRecordGateway()->findRecordsByPks($this,(array)$keys);
 		return $this->populateObjects($result);
 	}
@@ -705,8 +726,9 @@ 
 	public function count($criteria=null,$parameters=array())
 	{
 		$args = func_num_args() > 1 ? array_slice(func_get_args(),1) : null;
-		if($criteria!==null)
-			$criteria = $this->getRecordCriteria($criteria,$parameters, $args);
+		if($criteria!==null) {
+					$criteria = $this->getRecordCriteria($criteria,$parameters, $args);
+		}
 		return $this->getRecordGateway()->countRecords($this,$criteria);
 	}
 
@@ -723,9 +745,9 @@ 
 		{
 			$criteria = $this->getRecordCriteria(count($args)>0 ? $args[0] : null, array_slice($args,1));
 			return $context->getRelationHandler($criteria);
+		} else {
+					return null;
 		}
-		else
-			return null;
 	}
 
 	/**
@@ -743,9 +765,9 @@ 
 		{
 			list($property, $relation) = $definition;
 			return new TActiveRecordRelationContext($this,$property,$relation);
+		} else {
+					return null;
 		}
-		else
-			return null;
 	}
 
 	/**
@@ -785,10 +807,11 @@ 
 	 */
 	protected function fetchResultsFor($property)
 	{
-		if( ($context=$this->createRelationContext($property)) !== null)
-			return $context->getRelationHandler()->fetchResultsInto($this);
-		else
-			return false;
+		if( ($context=$this->createRelationContext($property)) !== null) {
+					return $context->getRelationHandler()->fetchResultsInto($this);
+		} else {
+					return false;
+		}
 	}
 
 	/**
@@ -827,28 +850,29 @@ 
 		{
 			$property= $method[4]==='_' ? substr($method,5) : substr($method,4);
 			return $this->getRelationHandler($property, $args);
-		}
-		else if($findOne=strncasecmp($method,'findby',6)===0)
-			$condition = $method[6]==='_' ? substr($method,7) : substr($method,6);
-		else if(strncasecmp($method,'findallby',9)===0)
-			$condition = $method[9]==='_' ? substr($method,10) : substr($method,9);
-		else if($delete=strncasecmp($method,'deleteby',8)===0)
-			$condition = $method[8]==='_' ? substr($method,9) : substr($method,8);
-		else if($delete=strncasecmp($method,'deleteallby',11)===0)
-			$condition = $method[11]==='_' ? substr($method,12) : substr($method,11);
-		else
+		} else if($findOne=strncasecmp($method,'findby',6)===0) {
+					$condition = $method[6]==='_' ? substr($method,7) : substr($method,6);
+		} else if(strncasecmp($method,'findallby',9)===0) {
+					$condition = $method[9]==='_' ? substr($method,10) : substr($method,9);
+		} else if($delete=strncasecmp($method,'deleteby',8)===0) {
+					$condition = $method[8]==='_' ? substr($method,9) : substr($method,8);
+		} else if($delete=strncasecmp($method,'deleteallby',11)===0) {
+					$condition = $method[11]==='_' ? substr($method,12) : substr($method,11);
+		} else
 		{
-			if($this->getInvalidFinderResult() == TActiveRecordInvalidFinderResult::Exception)
-				throw new TActiveRecordException('ar_invalid_finder_method',$method);
-			else
-				return null;
+			if($this->getInvalidFinderResult() == TActiveRecordInvalidFinderResult::Exception) {
+							throw new TActiveRecordException('ar_invalid_finder_method',$method);
+			} else {
+							return null;
+			}
 		}
 
 		$criteria = $this->getRecordGateway()->getCommand($this)->createCriteriaFromString($method, $condition, $args);
-		if($delete)
-			return $this->deleteAll($criteria);
-		else
-			return $findOne ? $this->find($criteria) : $this->findAll($criteria);
+		if($delete) {
+					return $this->deleteAll($criteria);
+		} else {
+					return $findOne ? $this->find($criteria) : $this->findAll($criteria);
+		}
 	}
 
 	/**
@@ -858,8 +882,9 @@ 
 	 */
 	public function getInvalidFinderResult()
 	{
-		if($this->_invalidFinderResult !== null)
-			return $this->_invalidFinderResult;
+		if($this->_invalidFinderResult !== null) {
+					return $this->_invalidFinderResult;
+		}
 
 		return self::getRecordManager()->getInvalidFinderResult();
 	}
@@ -873,10 +898,11 @@ 
 	 */
 	public function setInvalidFinderResult($value)
 	{
-		if($value === null)
-			$this->_invalidFinderResult = null;
-		else
-			$this->_invalidFinderResult = TPropertyValue::ensureEnum($value, 'TActiveRecordInvalidFinderResult');
+		if($value === null) {
+					$this->_invalidFinderResult = null;
+		} else {
+					$this->_invalidFinderResult = TPropertyValue::ensureEnum($value, 'TActiveRecordInvalidFinderResult');
+		}
 	}
 
 	/**
@@ -894,11 +920,11 @@ 
 		{
 			$useArgs = !is_array($parameters) && is_array($args);
 			return new TActiveRecordCriteria($criteria,$useArgs ? $args : $parameters);
+		} else if($criteria instanceof TSqlCriteria) {
+					return $criteria;
+		} else {
+					return new TActiveRecordCriteria();
 		}
-		else if($criteria instanceof TSqlCriteria)
-			return $criteria;
-		else
-			return new TActiveRecordCriteria();
 			//throw new TActiveRecordException('ar_invalid_criteria');
 	}
 
@@ -975,8 +1001,9 @@ 
 	public function getColumnValue($columnName)
 	{
 		$className=get_class($this);
-		if(isset(self::$_columnMapping[$className][$columnName]))
-			$columnName=self::$_columnMapping[$className][$columnName];
+		if(isset(self::$_columnMapping[$className][$columnName])) {
+					$columnName=self::$_columnMapping[$className][$columnName];
+		}
 		return $this->$columnName;
 	}
 
@@ -990,8 +1017,9 @@ 
 	public function setColumnValue($columnName,$value)
 	{
 		$className=get_class($this);
-		if(isset(self::$_columnMapping[$className][$columnName]))
-			$columnName=self::$_columnMapping[$className][$columnName];
+		if(isset(self::$_columnMapping[$className][$columnName])) {
+					$columnName=self::$_columnMapping[$className][$columnName];
+		}
 		$this->$columnName=$value;
 	}
 

framework/Data/ActiveRecord/TActiveRecordGateway.php

Doc Comments +7 added lines, -3 removed lines

@@ -201,7 +201,7 @@ 
 	 * Returns records matching the list of given primary keys.
 	 * @param TActiveRecord active record instance.
 	 * @param array list of primary name value pairs
-	 * @return array matching data.
+	 * @return TDbDataReader matching data.
 	 */
 	public function findRecordsByPks(TActiveRecord $record, $keys)
 	{
@@ -227,7 +227,8 @@ 
 	 * Return record data from sql query.
 	 * @param TActiveRecord active record finder instance.
 	 * @param TActiveRecordCriteria sql query
-	 * @return array result.
+	 * @param TSqlCriteria $criteria
+	 * @return TDbDataReader result.
 	 */
 	public function findRecordBySql(TActiveRecord $record, $criteria)
 	{
@@ -238,6 +239,7 @@ 
 	 * Return record data from sql query.
 	 * @param TActiveRecord active record finder instance.
 	 * @param TActiveRecordCriteria sql query
+	 * @param TSqlCriteria $criteria
 	 * @return TDbDataReader result iterator.
 	 */
 	public function findRecordsBySql(TActiveRecord $record, $criteria)
@@ -264,7 +266,7 @@ 
 	/**
 	 * Insert a new record.
 	 * @param TActiveRecord new record.
-	 * @return int number of rows affected.
+	 * @return string|boolean number of rows affected.
 	 */
 	public function insert(TActiveRecord $record)
 	{
@@ -279,6 +281,7 @@ 
 	/**
 	 * Sets the last insert ID to the corresponding property of the record if available.
 	 * @param TActiveRecord record for insertion
+	 * @param TActiveRecord $record
 	 */
 	protected function updatePostInsert($record)
 	{
@@ -396,6 +399,7 @@ 
 	 * Delete multiple records by criteria.
 	 * @param TActiveRecord active record finder instance.
 	 * @param TActiveRecordCriteria search criteria
+	 * @param TSqlCriteria $criteria
 	 * @return int number of records.
 	 */
 	public function deleteRecordsByCriteria(TActiveRecord $record, $criteria)

Spacing +48 added lines, -48 removed lines

@@ -20,19 +20,19 @@ 
 class TActiveRecordGateway extends TComponent
 {
 	private $_manager;
-	private $_tables=array(); //table cache
-	private $_meta=array(); //meta data cache.
-	private $_commandBuilders=array();
+	private $_tables = array(); //table cache
+	private $_meta = array(); //meta data cache.
+	private $_commandBuilders = array();
 	private $_currentRecord;
 
 	/**
 	 * Constant name for specifying optional table name in TActiveRecord.
 	 */
-	const TABLE_CONST='TABLE';
+	const TABLE_CONST = 'TABLE';
 	/**
 	 * Method name for returning optional table name in in TActiveRecord
 	 */
-	const TABLE_METHOD='table';
+	const TABLE_METHOD = 'table';
 
 	/**
 	 * Record gateway constructor.
@@ -40,7 +40,7 @@ 
 	 */
 	public function __construct(TActiveRecordManager $manager)
 	{
-		$this->_manager=$manager;
+		$this->_manager = $manager;
 	}
 
 	/**
@@ -60,20 +60,20 @@ 
 	protected function getRecordTableName(TActiveRecord $record)
 	{
 		$class = new ReflectionClass($record);
-		if($class->hasConstant(self::TABLE_CONST))
+		if ($class->hasConstant(self::TABLE_CONST))
 		{
 			$value = $class->getConstant(self::TABLE_CONST);
-			if(empty($value))
+			if (empty($value))
 				throw new TActiveRecordException('ar_invalid_tablename_property',
-					get_class($record),self::TABLE_CONST);
+					get_class($record), self::TABLE_CONST);
 			return $value;
 		}
 		elseif ($class->hasMethod(self::TABLE_METHOD))
 		{
 			$value = $record->{self::TABLE_METHOD}();
-			if(empty($value))
+			if (empty($value))
 				throw new TActiveRecordException('ar_invalid_tablename_method',
-					get_class($record),self::TABLE_METHOD);
+					get_class($record), self::TABLE_METHOD);
 			return $value;
 		}
 		else
@@ -100,24 +100,24 @@ 
 	public function getTableInfo(TDbConnection $connection, $tableName)
 	{
 		$connStr = $connection->getConnectionString();
-		$key = $connStr.$tableName;
-		if(!isset($this->_tables[$key]))
+		$key = $connStr . $tableName;
+		if (!isset($this->_tables[$key]))
 		{
 			//call this first to ensure that unserializing the cache
 			//will find the correct driver dependent classes.
-			if(!isset($this->_meta[$connStr]))
+			if (!isset($this->_meta[$connStr]))
 			{
 				Prado::using('System.Data.Common.TDbMetaData');
 				$this->_meta[$connStr] = TDbMetaData::getInstance($connection);
 			}
 
 			$tableInfo = null;
-			if(($cache=$this->getManager()->getCache())!==null)
+			if (($cache = $this->getManager()->getCache()) !== null)
 				$tableInfo = $cache->get($key);
-			if(empty($tableInfo))
+			if (empty($tableInfo))
 			{
 				$tableInfo = $this->_meta[$connStr]->getTableInfo($tableName);
-				if($cache!==null)
+				if ($cache !== null)
 					$cache->set($key, $tableInfo);
 			}
 			$this->_tables[$key] = $tableInfo;
@@ -134,7 +134,7 @@ 
 		$conn = $record->getDbConnection();
 		$connStr = $conn->getConnectionString();
 		$tableInfo = $this->getRecordTableInfo($record);
-		if(!isset($this->_commandBuilders[$connStr]))
+		if (!isset($this->_commandBuilders[$connStr]))
 		{
 			$builder = $tableInfo->createCommandBuilder($record->getDbConnection());
 			Prado::using('System.Data.DataGateway.TDataGatewayCommand');
@@ -145,7 +145,7 @@ 
 
 		}
 		$this->_commandBuilders[$connStr]->getBuilder()->setTableInfo($tableInfo);
-		$this->_currentRecord=$record;
+		$this->_currentRecord = $record;
 		return $this->_commandBuilders[$connStr];
 	}
 
@@ -162,7 +162,7 @@ 
 	public function onCreateCommand($sender, $param)
 	{
 		$this->raiseEvent('OnCreateCommand', $this, $param);
-		if($this->_currentRecord!==null)
+		if ($this->_currentRecord !== null)
 			$this->_currentRecord->onCreateCommand($param);
 	}
 
@@ -180,7 +180,7 @@ 
 	public function onExecuteCommand($sender, $param)
 	{
 		$this->raiseEvent('OnExecuteCommand', $this, $param);
-		if($this->_currentRecord!==null)
+		if ($this->_currentRecord !== null)
 			$this->_currentRecord->onExecuteCommand($param);
 	}
 
@@ -191,7 +191,7 @@ 
 	 * @param array primary name value pairs
 	 * @return array record data
 	 */
-	public function findRecordByPK(TActiveRecord $record,$keys)
+	public function findRecordByPK(TActiveRecord $record, $keys)
 	{
 		$command = $this->getCommand($record);
 		return $command->findByPk($keys);
@@ -217,7 +217,7 @@ 
 	 * @param boolean true to return multiple rows as iterator, false returns first row.
 	 * @return mixed matching data.
 	 */
-	public function findRecordsByCriteria(TActiveRecord $record, $criteria, $iterator=false)
+	public function findRecordsByCriteria(TActiveRecord $record, $criteria, $iterator = false)
 	{
 		$command = $this->getCommand($record);
 		return $iterator ? $command->findAll($criteria) : $command->find($criteria);
@@ -247,7 +247,7 @@ 
 
 	public function findRecordsByIndex(TActiveRecord $record, $criteria, $fields, $values)
 	{
-		return $this->getCommand($record)->findAllByIndex($criteria,$fields,$values);
+		return $this->getCommand($record)->findAllByIndex($criteria, $fields, $values);
 	}
 
 	/**
@@ -270,7 +270,7 @@ 
 	{
 		//$this->updateAssociatedRecords($record,true);
 		$result = $this->getCommand($record)->insert($this->getInsertValues($record));
-		if($result)
+		if ($result)
 			$this->updatePostInsert($record);
 		//$this->updateAssociatedRecords($record);
 		return $result;
@@ -284,10 +284,10 @@ 
 	{
 		$command = $this->getCommand($record);
 		$tableInfo = $command->getTableInfo();
-		foreach($tableInfo->getColumns() as $name => $column)
+		foreach ($tableInfo->getColumns() as $name => $column)
 		{
-			if($column->hasSequence())
-				$record->setColumnValue($name,$command->getLastInsertID($column->getSequenceName()));
+			if ($column->hasSequence())
+				$record->setColumnValue($name, $command->getLastInsertID($column->getSequenceName()));
 		}
 	}
 
@@ -297,20 +297,20 @@ 
 	 */
 	protected function getInsertValues(TActiveRecord $record)
 	{
-		$values=array();
+		$values = array();
 		$tableInfo = $this->getCommand($record)->getTableInfo();
-		foreach($tableInfo->getColumns() as $name=>$column)
+		foreach ($tableInfo->getColumns() as $name=>$column)
 		{
-			if($column->getIsExcluded())
+			if ($column->getIsExcluded())
 				continue;
 			$value = $record->getColumnValue($name);
-			if(!$column->getAllowNull() && $value===null && !$column->hasSequence() && ($column->getDefaultValue() === TDbTableColumn::UNDEFINED_VALUE))
+			if (!$column->getAllowNull() && $value === null && !$column->hasSequence() && ($column->getDefaultValue() === TDbTableColumn::UNDEFINED_VALUE))
 			{
 				throw new TActiveRecordException(
 					'ar_value_must_not_be_null', get_class($record),
 					$tableInfo->getTableFullName(), $name);
 			}
-			if($value!==null)
+			if ($value !== null)
 				$values[$name] = $value;
 		}
 		return $values;
@@ -332,29 +332,29 @@ 
 
 	protected function getUpdateValues(TActiveRecord $record)
 	{
-		$values=array();
+		$values = array();
 		$tableInfo = $this->getCommand($record)->getTableInfo();
-		$primary=array();
-		foreach($tableInfo->getColumns() as $name=>$column)
+		$primary = array();
+		foreach ($tableInfo->getColumns() as $name=>$column)
 		{
-			if($column->getIsExcluded())
+			if ($column->getIsExcluded())
 				continue;
 			$value = $record->getColumnValue($name);
-			if(!$column->getAllowNull() && $value===null && ($column->getDefaultValue() === TDbTableColumn::UNDEFINED_VALUE))
+			if (!$column->getAllowNull() && $value === null && ($column->getDefaultValue() === TDbTableColumn::UNDEFINED_VALUE))
 			{
 				throw new TActiveRecordException(
 					'ar_value_must_not_be_null', get_class($record),
 					$tableInfo->getTableFullName(), $name);
 			}
-			if($column->getIsPrimaryKey())
+			if ($column->getIsPrimaryKey())
 				$primary[$name] = $value;
 			else
 				$values[$name] = $value;
 		}
-		return array($values,$primary);
+		return array($values, $primary);
 	}
 
-	protected function updateAssociatedRecords(TActiveRecord $record,$updateBelongsTo=false)
+	protected function updateAssociatedRecords(TActiveRecord $record, $updateBelongsTo = false)
 	{
 		$context = new TActiveRecordRelationContext($record);
 		return $context->updateAssociatedRecords($updateBelongsTo);
@@ -373,10 +373,10 @@ 
 	protected function getPrimaryKeyValues(TActiveRecord $record)
 	{
 		$tableInfo = $this->getCommand($record)->getTableInfo();
-		$primary=array();
-		foreach($tableInfo->getColumns() as $name=>$column)
+		$primary = array();
+		foreach ($tableInfo->getColumns() as $name=>$column)
 		{
-			if($column->getIsPrimaryKey())
+			if ($column->getIsPrimaryKey())
 				$primary[$name] = $record->getColumnValue($name);
 		}
 		return $primary;
@@ -410,11 +410,11 @@ 
 	 * @param TActiveRecord active record
 	 * @param TActiveRecordCriteria data for the command.
 	 */
-	protected function raiseCommandEvent($event,$command,$record,$criteria)
+	protected function raiseCommandEvent($event, $command, $record, $criteria)
 	{
-		if(!($criteria instanceof TSqlCriteria))
-			$criteria = new TActiveRecordCriteria(null,$criteria);
-		$param = new TActiveRecordEventParameter($command,$record,$criteria);
+		if (!($criteria instanceof TSqlCriteria))
+			$criteria = new TActiveRecordCriteria(null, $criteria);
+		$param = new TActiveRecordEventParameter($command, $record, $criteria);
 		$manager = $record->getRecordManager();
 		$manager->{$event}($param);
 		$record->{$event}($param);

Braces +47 added lines, -34 removed lines

@@ -63,21 +63,22 @@ 
 		if($class->hasConstant(self::TABLE_CONST))
 		{
 			$value = $class->getConstant(self::TABLE_CONST);
-			if(empty($value))
-				throw new TActiveRecordException('ar_invalid_tablename_property',
+			if(empty($value)) {
+							throw new TActiveRecordException('ar_invalid_tablename_property',
 					get_class($record),self::TABLE_CONST);
+			}
 			return $value;
-		}
-		elseif ($class->hasMethod(self::TABLE_METHOD))
+		} elseif ($class->hasMethod(self::TABLE_METHOD))
 		{
 			$value = $record->{self::TABLE_METHOD}();
-			if(empty($value))
-				throw new TActiveRecordException('ar_invalid_tablename_method',
+			if(empty($value)) {
+							throw new TActiveRecordException('ar_invalid_tablename_method',
 					get_class($record),self::TABLE_METHOD);
+			}
 			return $value;
+		} else {
+					return strtolower(get_class($record));
 		}
-		else
-			return strtolower(get_class($record));
 	}
 
 	/**
@@ -112,13 +113,15 @@ 
 			}
 
 			$tableInfo = null;
-			if(($cache=$this->getManager()->getCache())!==null)
-				$tableInfo = $cache->get($key);
+			if(($cache=$this->getManager()->getCache())!==null) {
+							$tableInfo = $cache->get($key);
+			}
 			if(empty($tableInfo))
 			{
 				$tableInfo = $this->_meta[$connStr]->getTableInfo($tableName);
-				if($cache!==null)
-					$cache->set($key, $tableInfo);
+				if($cache!==null) {
+									$cache->set($key, $tableInfo);
+				}
 			}
 			$this->_tables[$key] = $tableInfo;
 		}
@@ -162,8 +165,9 @@ 
 	public function onCreateCommand($sender, $param)
 	{
 		$this->raiseEvent('OnCreateCommand', $this, $param);
-		if($this->_currentRecord!==null)
-			$this->_currentRecord->onCreateCommand($param);
+		if($this->_currentRecord!==null) {
+					$this->_currentRecord->onCreateCommand($param);
+		}
 	}
 
 	/**
@@ -180,8 +184,9 @@ 
 	public function onExecuteCommand($sender, $param)
 	{
 		$this->raiseEvent('OnExecuteCommand', $this, $param);
-		if($this->_currentRecord!==null)
-			$this->_currentRecord->onExecuteCommand($param);
+		if($this->_currentRecord!==null) {
+					$this->_currentRecord->onExecuteCommand($param);
+		}
 	}
 
 	/**
@@ -270,8 +275,9 @@ 
 	{
 		//$this->updateAssociatedRecords($record,true);
 		$result = $this->getCommand($record)->insert($this->getInsertValues($record));
-		if($result)
-			$this->updatePostInsert($record);
+		if($result) {
+					$this->updatePostInsert($record);
+		}
 		//$this->updateAssociatedRecords($record);
 		return $result;
 	}
@@ -286,8 +292,9 @@ 
 		$tableInfo = $command->getTableInfo();
 		foreach($tableInfo->getColumns() as $name => $column)
 		{
-			if($column->hasSequence())
-				$record->setColumnValue($name,$command->getLastInsertID($column->getSequenceName()));
+			if($column->hasSequence()) {
+							$record->setColumnValue($name,$command->getLastInsertID($column->getSequenceName()));
+			}
 		}
 	}
 
@@ -301,8 +308,9 @@ 
 		$tableInfo = $this->getCommand($record)->getTableInfo();
 		foreach($tableInfo->getColumns() as $name=>$column)
 		{
-			if($column->getIsExcluded())
-				continue;
+			if($column->getIsExcluded()) {
+							continue;
+			}
 			$value = $record->getColumnValue($name);
 			if(!$column->getAllowNull() && $value===null && !$column->hasSequence() && ($column->getDefaultValue() === TDbTableColumn::UNDEFINED_VALUE))
 			{
@@ -310,8 +318,9 @@ 
 					'ar_value_must_not_be_null', get_class($record),
 					$tableInfo->getTableFullName(), $name);
 			}
-			if($value!==null)
-				$values[$name] = $value;
+			if($value!==null) {
+							$values[$name] = $value;
+			}
 		}
 		return $values;
 	}
@@ -337,8 +346,9 @@ 
 		$primary=array();
 		foreach($tableInfo->getColumns() as $name=>$column)
 		{
-			if($column->getIsExcluded())
-				continue;
+			if($column->getIsExcluded()) {
+							continue;
+			}
 			$value = $record->getColumnValue($name);
 			if(!$column->getAllowNull() && $value===null && ($column->getDefaultValue() === TDbTableColumn::UNDEFINED_VALUE))
 			{
@@ -346,10 +356,11 @@ 
 					'ar_value_must_not_be_null', get_class($record),
 					$tableInfo->getTableFullName(), $name);
 			}
-			if($column->getIsPrimaryKey())
-				$primary[$name] = $value;
-			else
-				$values[$name] = $value;
+			if($column->getIsPrimaryKey()) {
+							$primary[$name] = $value;
+			} else {
+							$values[$name] = $value;
+			}
 		}
 		return array($values,$primary);
 	}
@@ -376,8 +387,9 @@ 
 		$primary=array();
 		foreach($tableInfo->getColumns() as $name=>$column)
 		{
-			if($column->getIsPrimaryKey())
-				$primary[$name] = $record->getColumnValue($name);
+			if($column->getIsPrimaryKey()) {
+							$primary[$name] = $record->getColumnValue($name);
+			}
 		}
 		return $primary;
 	}
@@ -412,8 +424,9 @@ 
 	 */
 	protected function raiseCommandEvent($event,$command,$record,$criteria)
 	{
-		if(!($criteria instanceof TSqlCriteria))
-			$criteria = new TActiveRecordCriteria(null,$criteria);
+		if(!($criteria instanceof TSqlCriteria)) {
+					$criteria = new TActiveRecordCriteria(null,$criteria);
+		}
 		$param = new TActiveRecordEventParameter($command,$record,$criteria);
 		$manager = $record->getRecordManager();
 		$manager->{$event}($param);

framework/Data/ActiveRecord/TActiveRecordManager.php

Doc Comments +3 added lines

@@ -67,6 +67,7 @@ 
 
 	/**
 	 * @param ICache application cache
+	 * @param ICache $value
 	 */
 	public function setCache($value)
 	{
@@ -90,6 +91,7 @@ 
 	}
 
 	/**
+	 * @param TComponent $self
 	 * @return TActiveRecordManager static instance of record manager.
 	 */
 	public static function getInstance($self=null)
@@ -152,6 +154,7 @@ 
 	/**
 	 * Define the way an active record finder react if an invalid magic-finder invoked
 	 * @param TActiveRecordInvalidFinderResult
+	 * @param TActiveRecordInvalidFinderResult $value
 	 * @since 3.1.5
 	 * @see getInvalidFinderResult
 	 */

Indentation +8 added lines, -8 removed lines

@@ -1,13 +1,13 @@
 <?php
 /**
- * TActiveRecordManager class file.
- *
- * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @link https://github.com/pradosoft/prado
- * @copyright Copyright &copy; 2005-2015 The PRADO Group
- * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
- * @package System.Data.ActiveRecord
- */
+	 * TActiveRecordManager class file.
+	 *
+	 * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
+	 * @link https://github.com/pradosoft/prado
+	 * @copyright Copyright &copy; 2005-2015 The PRADO Group
+	 * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
+	 * @package System.Data.ActiveRecord
+	 */
 
 Prado::using('System.Data.TDbConnection');
 Prado::using('System.Data.ActiveRecord.TActiveRecord');

Spacing +9 added lines, -9 removed lines

@@ -44,7 +44,7 @@ 
 	private $_gatewayClass = self::DEFAULT_GATEWAY_CLASS;
 
 	private $_gateway;
-	private $_meta=array();
+	private $_meta = array();
 	private $_connection;
 
 	private $_cache;
@@ -70,7 +70,7 @@ 
 	 */
 	public function setCache($value)
 	{
-		$this->_cache=$value;
+		$this->_cache = $value;
 	}
 
 	/**
@@ -78,7 +78,7 @@ 
 	 */
 	public function setDbConnection($conn)
 	{
-		$this->_connection=$conn;
+		$this->_connection = $conn;
 	}
 
 	/**
@@ -92,12 +92,12 @@ 
 	/**
 	 * @return TActiveRecordManager static instance of record manager.
 	 */
-	public static function getInstance($self=null)
+	public static function getInstance($self = null)
 	{
 		static $instance;
-		if($self!==null)
-			$instance=$self;
-		else if($instance===null)
+		if ($self !== null)
+			$instance = $self;
+		else if ($instance === null)
 			$instance = new self;
 		return $instance;
 	}
@@ -107,7 +107,7 @@ 
 	 */
 	public function getRecordGateway()
 	{
-		if($this->_gateway === null) {
+		if ($this->_gateway === null) {
 			$this->_gateway = $this->createRecordGateway();
 		}
 		return $this->_gateway;
@@ -128,7 +128,7 @@ 
 	public function setGatewayClass($value)
 	{
 		$this->_gateway = null;
-		$this->_gatewayClass = (string)$value;
+		$this->_gatewayClass = (string) $value;
 	}
 
 	/**

Braces +5 added lines, -4 removed lines

@@ -95,10 +95,11 @@
 	public static function getInstance($self=null)
 	{
 		static $instance;
-		if($self!==null)
-			$instance=$self;
-		else if($instance===null)
-			$instance = new self;
+		if($self!==null) {
+					$instance=$self;
+		} else if($instance===null) {
+					$instance = new self;
+		}
 		return $instance;
 	}
 

framework/Data/Common/Mssql/TMssqlMetaData.php

Doc Comments +1 added lines

@@ -123,6 +123,7 @@
 	/**
 	 * @param TMssqlTableInfo table information.
 	 * @param array column information.
+	 * @param TMssqlTableInfo $tableInfo
 	 */
 	protected function processColumn($tableInfo, $col)
 	{

Indentation +7 added lines, -7 removed lines

@@ -259,15 +259,15 @@
 		return false;
 	}
 
-        /**
-	 * Returns all table names in the database.
-	 * @param string $schema the schema of the tables. Defaults to empty string, meaning the current or default schema.
-	 * If not empty, the returned table names will be prefixed with the schema name.
-	 * @return array all table names in the database.
-	 */
+		/**
+		 * Returns all table names in the database.
+		 * @param string $schema the schema of the tables. Defaults to empty string, meaning the current or default schema.
+		 * If not empty, the returned table names will be prefixed with the schema name.
+		 * @return array all table names in the database.
+		 */
 	public function findTableNames($schema='dbo')
 	{
-                $condition="TABLE_TYPE='BASE TABLE'";
+				$condition="TABLE_TYPE='BASE TABLE'";
 		$sql=<<<EOD
 SELECT TABLE_NAME, TABLE_SCHEMA FROM [INFORMATION_SCHEMA].[TABLES]
 WHERE TABLE_SCHEMA=:schema AND $condition

Spacing +41 added lines, -41 removed lines

@@ -69,7 +69,7 @@ 
 	 */
 	protected function createTableInfo($table)
 	{
-		list($catalogName,$schemaName,$tableName) = $this->getCatalogSchemaTableName($table);
+		list($catalogName, $schemaName, $tableName) = $this->getCatalogSchemaTableName($table);
 		$this->getDbConnection()->setActive(true);
 		$sql = <<<EOD
 				SELECT t.*,
@@ -80,26 +80,26 @@ 
 									WHERE t.table_name = c.table_name
 										AND t.table_name = :table
 EOD;
-		if($schemaName!==null)
+		if ($schemaName !== null)
 			$sql .= ' AND t.table_schema = :schema';
-		if($catalogName!==null)
+		if ($catalogName !== null)
 			$sql .= ' AND t.table_catalog = :catalog';
 
 		$command = $this->getDbConnection()->createCommand($sql);
 		$command->bindValue(':table', $tableName);
-		if($schemaName!==null)
+		if ($schemaName !== null)
 			$command->bindValue(':schema', $schemaName);
-		if($catalogName!==null)
+		if ($catalogName !== null)
 			$command->bindValue(':catalog', $catalogName);
 
-		$tableInfo=null;
-		foreach($command->query() as $col)
+		$tableInfo = null;
+		foreach ($command->query() as $col)
 		{
-			if($tableInfo===null)
+			if ($tableInfo === null)
 				$tableInfo = $this->createNewTableInfo($col);
-			$this->processColumn($tableInfo,$col);
+			$this->processColumn($tableInfo, $col);
 		}
-		if($tableInfo===null)
+		if ($tableInfo === null)
 			throw new TDbException('dbmetadata_invalid_table_view', $table);
 		return $tableInfo;
 	}
@@ -112,12 +112,12 @@ 
 	{
 		//remove possible delimiters
 		$result = explode('.', preg_replace('/\[|\]|"/', '', $table));
-		if(count($result)===1)
-			return array(null,null,$result[0]);
-		if(count($result)===2)
-			return array(null,$result[0],$result[1]);
-		if(count($result)>2)
-			return array($result[0],$result[1],$result[2]);
+		if (count($result) === 1)
+			return array(null, null, $result[0]);
+		if (count($result) === 2)
+			return array(null, $result[0], $result[1]);
+		if (count($result) > 2)
+			return array($result[0], $result[1], $result[2]);
 	}
 
 	/**
@@ -130,25 +130,25 @@ 
 
 		$info['ColumnName'] = "[$columnId]"; //quote the column names!
 		$info['ColumnId'] = $columnId;
-		$info['ColumnIndex'] = intval($col['ORDINAL_POSITION'])-1; //zero-based index
-		if($col['IS_NULLABLE']!=='NO')
+		$info['ColumnIndex'] = intval($col['ORDINAL_POSITION']) - 1; //zero-based index
+		if ($col['IS_NULLABLE'] !== 'NO')
 			$info['AllowNull'] = true;
-		if($col['COLUMN_DEFAULT']!==null)
+		if ($col['COLUMN_DEFAULT'] !== null)
 			$info['DefaultValue'] = $col['COLUMN_DEFAULT'];
 
-		if(in_array($columnId, $tableInfo->getPrimaryKeys()))
+		if (in_array($columnId, $tableInfo->getPrimaryKeys()))
 			$info['IsPrimaryKey'] = true;
-		if($this->isForeignKeyColumn($columnId, $tableInfo))
+		if ($this->isForeignKeyColumn($columnId, $tableInfo))
 			$info['IsForeignKey'] = true;
 
-		if($col['IsIdentity']==='1')
+		if ($col['IsIdentity'] === '1')
 			$info['AutoIncrement'] = true;
 		$info['DbType'] = $col['DATA_TYPE'];
-		if($col['CHARACTER_MAXIMUM_LENGTH']!==null)
+		if ($col['CHARACTER_MAXIMUM_LENGTH'] !== null)
 			$info['ColumnSize'] = intval($col['CHARACTER_MAXIMUM_LENGTH']);
-		if($col['NUMERIC_PRECISION'] !== null)
+		if ($col['NUMERIC_PRECISION'] !== null)
 			$info['NumericPrecision'] = intval($col['NUMERIC_PRECISION']);
-		if($col['NUMERIC_SCALE']!==null)
+		if ($col['NUMERIC_SCALE'] !== null)
 			$info['NumericScale'] = intval($col['NUMERIC_SCALE']);
 		$tableInfo->Columns[$columnId] = new TMssqlTableColumn($info);
 	}
@@ -163,11 +163,11 @@ 
 		$info['CatalogName'] = $col['TABLE_CATALOG'];
 		$info['SchemaName'] = $col['TABLE_SCHEMA'];
 		$info['TableName'] = $col['TABLE_NAME'];
-		if($col['TABLE_TYPE']==='VIEW')
+		if ($col['TABLE_TYPE'] === 'VIEW')
 			$info['IsView'] = true;
 		list($primary, $foreign) = $this->getConstraintKeys($col);
 		$class = $this->getTableInfoClass();
-		return new $class($info,$primary,$foreign);
+		return new $class($info, $primary, $foreign);
 	}
 
 	/**
@@ -192,10 +192,10 @@ 
 		$command = $this->getDbConnection()->createCommand($sql);
 		$command->bindValue(':table', $col['TABLE_NAME']);
 		$primary = array();
-		foreach($command->query()->readAll() as $field)
+		foreach ($command->query()->readAll() as $field)
 			$primary[] = $field['field_name'];
 		$foreign = $this->getForeignConstraints($col);
-		return array($primary,$foreign);
+		return array($primary, $foreign);
 	}
 
 	/**
@@ -234,9 +234,9 @@ 
 EOD;
 		$command = $this->getDbConnection()->createCommand($sql);
 		$command->bindValue(':table', $col['TABLE_NAME']);
-		$fkeys=array();
+		$fkeys = array();
 		$catalogSchema = "[{$col['TABLE_CATALOG']}].[{$col['TABLE_SCHEMA']}]";
-		foreach($command->query() as $info)
+		foreach ($command->query() as $info)
 		{
 			$fkeys[$info['FK_CONSTRAINT_NAME']]['keys'][$info['FK_COLUMN_NAME']] = $info['UQ_COLUMN_NAME'];
 			$fkeys[$info['FK_CONSTRAINT_NAME']]['table'] = $info['UQ_TABLE_NAME'];
@@ -251,9 +251,9 @@ 
 	 */
 	protected function isForeignKeyColumn($columnId, $tableInfo)
 	{
-		foreach($tableInfo->getForeignKeys() as $fk)
+		foreach ($tableInfo->getForeignKeys() as $fk)
 		{
-			if(in_array($columnId, array_keys($fk['keys'])))
+			if (in_array($columnId, array_keys($fk['keys'])))
 				return true;
 		}
 		return false;
@@ -265,23 +265,23 @@ 
 	 * If not empty, the returned table names will be prefixed with the schema name.
 	 * @return array all table names in the database.
 	 */
-	public function findTableNames($schema='dbo')
+	public function findTableNames($schema = 'dbo')
 	{
-                $condition="TABLE_TYPE='BASE TABLE'";
-		$sql=<<<EOD
+                $condition = "TABLE_TYPE='BASE TABLE'";
+		$sql = <<<EOD
 SELECT TABLE_NAME, TABLE_SCHEMA FROM [INFORMATION_SCHEMA].[TABLES]
 WHERE TABLE_SCHEMA=:schema AND $condition
 EOD;
-		$command=$this->getDbConnection()->createCommand($sql);
+		$command = $this->getDbConnection()->createCommand($sql);
 		$command->bindParam(":schema", $schema);
-		$rows=$command->queryAll();
-		$names=array();
+		$rows = $command->queryAll();
+		$names = array();
 		foreach ($rows as $row)
 		{
 			if ($schema == self::DEFAULT_SCHEMA)
-				$names[]=$row['TABLE_NAME'];
+				$names[] = $row['TABLE_NAME'];
 			else
-				$names[]=$schema.'.'.$row['TABLE_SCHEMA'].'.'.$row['TABLE_NAME'];
+				$names[] = $schema . '.' . $row['TABLE_SCHEMA'] . '.' . $row['TABLE_NAME'];
 		}
 
 		return $names;

Braces +65 added lines, -44 removed lines

@@ -80,27 +80,33 @@ 
 									WHERE t.table_name = c.table_name
 										AND t.table_name = :table
 EOD;
-		if($schemaName!==null)
-			$sql .= ' AND t.table_schema = :schema';
-		if($catalogName!==null)
-			$sql .= ' AND t.table_catalog = :catalog';
+		if($schemaName!==null) {
+					$sql .= ' AND t.table_schema = :schema';
+		}
+		if($catalogName!==null) {
+					$sql .= ' AND t.table_catalog = :catalog';
+		}
 
 		$command = $this->getDbConnection()->createCommand($sql);
 		$command->bindValue(':table', $tableName);
-		if($schemaName!==null)
-			$command->bindValue(':schema', $schemaName);
-		if($catalogName!==null)
-			$command->bindValue(':catalog', $catalogName);
+		if($schemaName!==null) {
+					$command->bindValue(':schema', $schemaName);
+		}
+		if($catalogName!==null) {
+					$command->bindValue(':catalog', $catalogName);
+		}
 
 		$tableInfo=null;
 		foreach($command->query() as $col)
 		{
-			if($tableInfo===null)
-				$tableInfo = $this->createNewTableInfo($col);
+			if($tableInfo===null) {
+							$tableInfo = $this->createNewTableInfo($col);
+			}
 			$this->processColumn($tableInfo,$col);
 		}
-		if($tableInfo===null)
-			throw new TDbException('dbmetadata_invalid_table_view', $table);
+		if($tableInfo===null) {
+					throw new TDbException('dbmetadata_invalid_table_view', $table);
+		}
 		return $tableInfo;
 	}
 
@@ -112,12 +118,15 @@ 
 	{
 		//remove possible delimiters
 		$result = explode('.', preg_replace('/\[|\]|"/', '', $table));
-		if(count($result)===1)
-			return array(null,null,$result[0]);
-		if(count($result)===2)
-			return array(null,$result[0],$result[1]);
-		if(count($result)>2)
-			return array($result[0],$result[1],$result[2]);
+		if(count($result)===1) {
+					return array(null,null,$result[0]);
+		}
+		if(count($result)===2) {
+					return array(null,$result[0],$result[1]);
+		}
+		if(count($result)>2) {
+					return array($result[0],$result[1],$result[2]);
+		}
 	}
 
 	/**
@@ -131,25 +140,33 @@ 
 		$info['ColumnName'] = "[$columnId]"; //quote the column names!
 		$info['ColumnId'] = $columnId;
 		$info['ColumnIndex'] = intval($col['ORDINAL_POSITION'])-1; //zero-based index
-		if($col['IS_NULLABLE']!=='NO')
-			$info['AllowNull'] = true;
-		if($col['COLUMN_DEFAULT']!==null)
-			$info['DefaultValue'] = $col['COLUMN_DEFAULT'];
+		if($col['IS_NULLABLE']!=='NO') {
+					$info['AllowNull'] = true;
+		}
+		if($col['COLUMN_DEFAULT']!==null) {
+					$info['DefaultValue'] = $col['COLUMN_DEFAULT'];
+		}
 
-		if(in_array($columnId, $tableInfo->getPrimaryKeys()))
-			$info['IsPrimaryKey'] = true;
-		if($this->isForeignKeyColumn($columnId, $tableInfo))
-			$info['IsForeignKey'] = true;
+		if(in_array($columnId, $tableInfo->getPrimaryKeys())) {
+					$info['IsPrimaryKey'] = true;
+		}
+		if($this->isForeignKeyColumn($columnId, $tableInfo)) {
+					$info['IsForeignKey'] = true;
+		}
 
-		if($col['IsIdentity']==='1')
-			$info['AutoIncrement'] = true;
+		if($col['IsIdentity']==='1') {
+					$info['AutoIncrement'] = true;
+		}
 		$info['DbType'] = $col['DATA_TYPE'];
-		if($col['CHARACTER_MAXIMUM_LENGTH']!==null)
-			$info['ColumnSize'] = intval($col['CHARACTER_MAXIMUM_LENGTH']);
-		if($col['NUMERIC_PRECISION'] !== null)
-			$info['NumericPrecision'] = intval($col['NUMERIC_PRECISION']);
-		if($col['NUMERIC_SCALE']!==null)
-			$info['NumericScale'] = intval($col['NUMERIC_SCALE']);
+		if($col['CHARACTER_MAXIMUM_LENGTH']!==null) {
+					$info['ColumnSize'] = intval($col['CHARACTER_MAXIMUM_LENGTH']);
+		}
+		if($col['NUMERIC_PRECISION'] !== null) {
+					$info['NumericPrecision'] = intval($col['NUMERIC_PRECISION']);
+		}
+		if($col['NUMERIC_SCALE']!==null) {
+					$info['NumericScale'] = intval($col['NUMERIC_SCALE']);
+		}
 		$tableInfo->Columns[$columnId] = new TMssqlTableColumn($info);
 	}
 
@@ -163,8 +180,9 @@ 
 		$info['CatalogName'] = $col['TABLE_CATALOG'];
 		$info['SchemaName'] = $col['TABLE_SCHEMA'];
 		$info['TableName'] = $col['TABLE_NAME'];
-		if($col['TABLE_TYPE']==='VIEW')
-			$info['IsView'] = true;
+		if($col['TABLE_TYPE']==='VIEW') {
+					$info['IsView'] = true;
+		}
 		list($primary, $foreign) = $this->getConstraintKeys($col);
 		$class = $this->getTableInfoClass();
 		return new $class($info,$primary,$foreign);
@@ -192,8 +210,9 @@ 
 		$command = $this->getDbConnection()->createCommand($sql);
 		$command->bindValue(':table', $col['TABLE_NAME']);
 		$primary = array();
-		foreach($command->query()->readAll() as $field)
-			$primary[] = $field['field_name'];
+		foreach($command->query()->readAll() as $field) {
+					$primary[] = $field['field_name'];
+		}
 		$foreign = $this->getForeignConstraints($col);
 		return array($primary,$foreign);
 	}
@@ -253,8 +272,9 @@ 
 	{
 		foreach($tableInfo->getForeignKeys() as $fk)
 		{
-			if(in_array($columnId, array_keys($fk['keys'])))
-				return true;
+			if(in_array($columnId, array_keys($fk['keys']))) {
+							return true;
+			}
 		}
 		return false;
 	}
@@ -278,10 +298,11 @@ 
 		$names=array();
 		foreach ($rows as $row)
 		{
-			if ($schema == self::DEFAULT_SCHEMA)
-				$names[]=$row['TABLE_NAME'];
-			else
-				$names[]=$schema.'.'.$row['TABLE_SCHEMA'].'.'.$row['TABLE_NAME'];
+			if ($schema == self::DEFAULT_SCHEMA) {
+							$names[]=$row['TABLE_NAME'];
+			} else {
+							$names[]=$schema.'.'.$row['TABLE_SCHEMA'].'.'.$row['TABLE_NAME'];
+			}
 		}
 
 		return $names;

framework/Data/Common/Mssql/TMssqlTableColumn.php

Doc Comments +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
 
 	/**
 	 * Overrides parent implementation, returns PHP type from the db type.
-	 * @return boolean derived PHP primitive type from the column db type.
+	 * @return string derived PHP primitive type from the column db type.
 	 */
 	public function getPHPType()
 	{

Spacing +2 added lines, -2 removed lines

@@ -40,7 +40,7 @@ 
 	 */
 	public function getAutoIncrement()
 	{
-		return $this->getInfo('AutoIncrement',false);
+		return $this->getInfo('AutoIncrement', false);
 	}
 
 	/**
@@ -56,7 +56,7 @@ 
 	 */
 	public function getIsExcluded()
 	{
-		return strtolower($this->getDbType())==='timestamp';
+		return strtolower($this->getDbType()) === 'timestamp';
 	}
 }
 

framework/Data/Common/Mysql/TMysqlMetaData.php

Doc Comments +1 added lines

@@ -114,6 +114,7 @@
 	/**
 	 * @param TMysqlTableInfo table information.
 	 * @param array column information.
+	 * @param TMysqlTableInfo $tableInfo
 	 */
 	protected function processColumn($tableInfo, $col)
 	{

Spacing +67 added lines, -67 removed lines

@@ -27,7 +27,7 @@ 
  */
 class TMysqlMetaData extends TDbMetaData
 {
-	private $_serverVersion=0;
+	private $_serverVersion = 0;
 
 	/**
 	 * @return string TDbTableInfo class name.
@@ -74,24 +74,24 @@ 
 	 */
 	protected function createTableInfo($table)
 	{
-		list($schemaName,$tableName) = $this->getSchemaTableName($table);
-		$find = $schemaName===null ? "`{$tableName}`" : "`{$schemaName}`.`{$tableName}`";
+		list($schemaName, $tableName) = $this->getSchemaTableName($table);
+		$find = $schemaName === null ? "`{$tableName}`" : "`{$schemaName}`.`{$tableName}`";
 		$colCase = $this->getDbConnection()->getColumnCase();
-		if($colCase != TDbColumnCaseMode::Preserved)
+		if ($colCase != TDbColumnCaseMode::Preserved)
 			$this->getDbConnection()->setColumnCase('Preserved');
 		$this->getDbConnection()->setActive(true);
 		$sql = "SHOW FULL FIELDS FROM {$find}";
 		$command = $this->getDbConnection()->createCommand($sql);
 		$tableInfo = $this->createNewTableInfo($table);
-		$index=0;
-		foreach($command->query() as $col)
+		$index = 0;
+		foreach ($command->query() as $col)
 		{
 			$col['index'] = $index++;
-			$this->processColumn($tableInfo,$col);
+			$this->processColumn($tableInfo, $col);
 		}
-		if($index===0)
+		if ($index === 0)
 			throw new TDbException('dbmetadata_invalid_table_view', $table);
-		if($colCase != TDbColumnCaseMode::Preserved)
+		if ($colCase != TDbColumnCaseMode::Preserved)
 			$this->getDbConnection()->setColumnCase($colCase);
 		return $tableInfo;
 	}
@@ -101,12 +101,12 @@ 
 	 */
 	protected function getServerVersion()
 	{
-		if(!$this->_serverVersion)
+		if (!$this->_serverVersion)
 		{
 			$version = $this->getDbConnection()->getAttribute(PDO::ATTR_SERVER_VERSION);
-			$digits=array();
+			$digits = array();
 			preg_match('/(\d+)\.(\d+)\.(\d+)/', $version, $digits);
-			$this->_serverVersion=floatval($digits[1].'.'.$digits[2].$digits[3]);
+			$this->_serverVersion = floatval($digits[1] . '.' . $digits[2] . $digits[3]);
 		}
 		return $this->_serverVersion;
 	}
@@ -122,37 +122,37 @@ 
 		$info['ColumnName'] = "`$columnId`"; //quote the column names!
 		$info['ColumnId'] = $columnId;
 		$info['ColumnIndex'] = $col['index'];
-		if($col['Null']==='YES')
+		if ($col['Null'] === 'YES')
 			$info['AllowNull'] = true;
-		if(is_int(strpos(strtolower($col['Extra']), 'auto_increment')))
-			$info['AutoIncrement']=true;
-		if($col['Default']!=="")
+		if (is_int(strpos(strtolower($col['Extra']), 'auto_increment')))
+			$info['AutoIncrement'] = true;
+		if ($col['Default'] !== "")
 			$info['DefaultValue'] = $col['Default'];
 
-		if($col['Key']==='PRI' || in_array($columnId, $tableInfo->getPrimaryKeys()))
+		if ($col['Key'] === 'PRI' || in_array($columnId, $tableInfo->getPrimaryKeys()))
 			$info['IsPrimaryKey'] = true;
-		if($this->isForeignKeyColumn($columnId, $tableInfo))
+		if ($this->isForeignKeyColumn($columnId, $tableInfo))
 			$info['IsForeignKey'] = true;
 
 		$info['DbType'] = $col['Type'];
-		$match=array();
+		$match = array();
 		//find SET/ENUM values, column size, precision, and scale
-		if(preg_match('/\((.*)\)/', $col['Type'], $match))
+		if (preg_match('/\((.*)\)/', $col['Type'], $match))
 		{
-			$info['DbType']= preg_replace('/\(.*\)/', '', $col['Type']);
+			$info['DbType'] = preg_replace('/\(.*\)/', '', $col['Type']);
 
 			//find SET/ENUM values
-			if($this->isEnumSetType($info['DbType']))
+			if ($this->isEnumSetType($info['DbType']))
 				$info['DbTypeValues'] = preg_split("/[',]/S", $match[1], -1, PREG_SPLIT_NO_EMPTY);
 
 			//find column size, precision and scale
 			$pscale = array();
-			if(preg_match('/(\d+)(?:,(\d+))?+/', $match[1], $pscale))
+			if (preg_match('/(\d+)(?:,(\d+))?+/', $match[1], $pscale))
 			{
-				if($this->isPrecisionType($info['DbType']))
+				if ($this->isPrecisionType($info['DbType']))
 				{
 					$info['NumericPrecision'] = intval($pscale[1]);
-					if(count($pscale) > 2)
+					if (count($pscale) > 2)
 						$info['NumericScale'] = intval($pscale[2]);
 				}
 				else
@@ -169,9 +169,9 @@ 
 	protected function isPrecisionType($type)
 	{
 		$type = strtolower(trim($type));
-		return $type==='decimal' || $type==='dec'
-				|| $type==='float' || $type==='double'
-				|| $type==='double precision' || $type==='real';
+		return $type === 'decimal' || $type === 'dec'
+				|| $type === 'float' || $type === 'double'
+				|| $type === 'double precision' || $type === 'real';
 	}
 
 	/**
@@ -180,7 +180,7 @@ 
 	protected function isEnumSetType($type)
 	{
 		$type = strtolower(trim($type));
-		return $type==='set' || $type==='enum';
+		return $type === 'set' || $type === 'enum';
 	}
 
 	/**
@@ -192,9 +192,9 @@ 
 	{
 		//remove the back ticks and separate out the "database.table"
 		$result = explode('.', str_replace('`', '', $table));
-		foreach($result as $name)
+		foreach ($result as $name)
 		{
-			if(!$this->isValidIdentifier($name))
+			if (!$this->isValidIdentifier($name))
 			{
 				$ref = 'http://dev.mysql.com/doc/refman/5.0/en/identifiers.html';
 				throw new TDbException('dbcommon_invalid_identifier_name', $table, $ref);
@@ -220,14 +220,14 @@ 
 	 */
 	protected function createNewTableInfo($table)
 	{
-		list($schemaName,$tableName) = $this->getSchemaTableName($table);
+		list($schemaName, $tableName) = $this->getSchemaTableName($table);
 		$info['SchemaName'] = $schemaName;
 		$info['TableName'] = $tableName;
-		if($this->getIsView($schemaName,$tableName))
+		if ($this->getIsView($schemaName, $tableName))
 			$info['IsView'] = true;
 		list($primary, $foreign) = $this->getConstraintKeys($schemaName, $tableName);
 		$class = $this->getTableInfoClass();
-		return new $class($info,$primary,$foreign);
+		return new $class($info, $primary, $foreign);
 	}
 
 	/**
@@ -240,11 +240,11 @@ 
 	 * @return boolean true if is view, false otherwise.
 	 * @throws TDbException if table or view does not exist.
 	 */
-	protected function getIsView($schemaName,$tableName)
+	protected function getIsView($schemaName, $tableName)
 	{
-		if($this->getServerVersion()<5.01)
+		if ($this->getServerVersion() < 5.01)
 			return false;
-		if($schemaName!==null)
+		if ($schemaName !== null)
 			$sql = "SHOW FULL TABLES FROM `{$schemaName}` LIKE :table";
 		else
 			$sql = "SHOW FULL TABLES LIKE :table";
@@ -253,12 +253,12 @@ 
 		$command->bindValue(':table', $tableName);
 		try
 		{
-			return count($result = $command->queryRow()) > 0 && $result['Table_type']==='VIEW';
+			return count($result = $command->queryRow()) > 0 && $result['Table_type'] === 'VIEW';
 		}
-		catch(TDbException $e)
+		catch (TDbException $e)
 		{
-			$table = $schemaName===null?$tableName:$schemaName.'.'.$tableName;
-			throw new TDbException('dbcommon_invalid_table_name',$table,$e->getMessage());
+			$table = $schemaName === null ? $tableName : $schemaName . '.' . $tableName;
+			throw new TDbException('dbcommon_invalid_table_name', $table, $e->getMessage());
 		}
 	}
 
@@ -270,22 +270,22 @@ 
 	 */
 	protected function getConstraintKeys($schemaName, $tableName)
 	{
-		$table = $schemaName===null ? "`{$tableName}`" : "`{$schemaName}`.`{$tableName}`";
+		$table = $schemaName === null ? "`{$tableName}`" : "`{$schemaName}`.`{$tableName}`";
 		$sql = "SHOW INDEX FROM {$table}";
 		$command = $this->getDbConnection()->createCommand($sql);
 		$primary = array();
-		foreach($command->query() as $row)
+		foreach ($command->query() as $row)
 		{
-			if($row['Key_name']==='PRIMARY')
+			if ($row['Key_name'] === 'PRIMARY')
 				$primary[] = $row['Column_name'];
 		}
 				// MySQL version was increased to >=5.1.21 instead of 5.x
 				// due to a MySQL bug (http://bugs.mysql.com/bug.php?id=19588)
-		if($this->getServerVersion() >= 5.121)
-			$foreign = $this->getForeignConstraints($schemaName,$tableName);
+		if ($this->getServerVersion() >= 5.121)
+			$foreign = $this->getForeignConstraints($schemaName, $tableName);
 		else
-			$foreign = $this->findForeignConstraints($schemaName,$tableName);
-		return array($primary,$foreign);
+			$foreign = $this->findForeignConstraints($schemaName, $tableName);
+		return array($primary, $foreign);
 	}
 
 	/**
@@ -313,10 +313,10 @@ 
 EOD;
 		$command = $this->getDbConnection()->createCommand($sql);
 		$command->bindValue(':table', $tableName);
-		if($schemaName!==null)
+		if ($schemaName !== null)
 			$command->bindValue(':schema', $schemaName);
-		$fkeys=array();
-		foreach($command->query() as $col)
+		$fkeys = array();
+		foreach ($command->query() as $col)
 		{
 			$fkeys[$col['con']]['keys'][$col['col']] = $col['fkcol'];
 			$fkeys[$col['con']]['table'] = $col['fktable'];
@@ -332,12 +332,12 @@ 
 	 */
 	protected function getShowCreateTable($schemaName, $tableName)
 	{
-		if(version_compare(PHP_VERSION,'5.1.3','<'))
+		if (version_compare(PHP_VERSION, '5.1.3', '<'))
 			throw new TDbException('dbmetadata_requires_php_version', 'Mysql 4.1.x', '5.1.3');
 
 		//See http://netevil.org/node.php?nid=795&SC=1
 		$this->getDbConnection()->setAttribute(PDO::ATTR_EMULATE_PREPARES, true);
-		if($schemaName!==null)
+		if ($schemaName !== null)
 			$sql = "SHOW CREATE TABLE `{$schemaName}`.`{$tableName}`";
 		else
 			$sql = "SHOW CREATE TABLE `{$tableName}`";
@@ -355,16 +355,16 @@ 
 	protected function findForeignConstraints($schemaName, $tableName)
 	{
 		$sql = $this->getShowCreateTable($schemaName, $tableName);
-		$matches =array();
+		$matches = array();
 		$regexp = '/FOREIGN KEY\s+\(([^\)]+)\)\s+REFERENCES\s+`?([^`]+)`?\s\(([^\)]+)\)/mi';
-		preg_match_all($regexp,$sql,$matches,PREG_SET_ORDER);
+		preg_match_all($regexp, $sql, $matches, PREG_SET_ORDER);
 		$foreign = array();
-		foreach($matches as $match)
+		foreach ($matches as $match)
 		{
-			$fields = array_map('trim',explode(',',str_replace('`','',$match[1])));
-			$fk_fields = array_map('trim',explode(',',str_replace('`','',$match[3])));
-			$keys=array();
-			foreach($fields as $k=>$v)
+			$fields = array_map('trim', explode(',', str_replace('`', '', $match[1])));
+			$fk_fields = array_map('trim', explode(',', str_replace('`', '', $match[3])));
+			$keys = array();
+			foreach ($fields as $k=>$v)
 				$keys[$v] = $fk_fields[$k];
 			$foreign[] = array('keys' => $keys, 'table' => trim($match[2]));
 		}
@@ -378,9 +378,9 @@ 
 	 */
 	protected function isForeignKeyColumn($columnId, $tableInfo)
 	{
-		foreach($tableInfo->getForeignKeys() as $fk)
+		foreach ($tableInfo->getForeignKeys() as $fk)
 		{
-			if(in_array($columnId, array_keys($fk['keys'])))
+			if (in_array($columnId, array_keys($fk['keys'])))
 				return true;
 		}
 		return false;
@@ -392,13 +392,13 @@ 
 	 * If not empty, the returned table names will be prefixed with the schema name.
 	 * @return array all table names in the database.
 	 */
-	public function findTableNames($schema='')
+	public function findTableNames($schema = '')
 	{
-		if($schema==='')
+		if ($schema === '')
 			return $this->getDbConnection()->createCommand('SHOW TABLES')->queryColumn();
-		$names=$this->getDbConnection()->createCommand('SHOW TABLES FROM '.$this->quoteTableName($schema))->queryColumn();
-		foreach($names as &$name)
-			$name=$schema.'.'.$name;
+		$names = $this->getDbConnection()->createCommand('SHOW TABLES FROM ' . $this->quoteTableName($schema))->queryColumn();
+		foreach ($names as &$name)
+			$name = $schema . '.' . $name;
 		return $names;
 	}
 }

Braces +75 added lines, -54 removed lines

@@ -77,8 +77,9 @@ 
 		list($schemaName,$tableName) = $this->getSchemaTableName($table);
 		$find = $schemaName===null ? "`{$tableName}`" : "`{$schemaName}`.`{$tableName}`";
 		$colCase = $this->getDbConnection()->getColumnCase();
-		if($colCase != TDbColumnCaseMode::Preserved)
-			$this->getDbConnection()->setColumnCase('Preserved');
+		if($colCase != TDbColumnCaseMode::Preserved) {
+					$this->getDbConnection()->setColumnCase('Preserved');
+		}
 		$this->getDbConnection()->setActive(true);
 		$sql = "SHOW FULL FIELDS FROM {$find}";
 		$command = $this->getDbConnection()->createCommand($sql);
@@ -89,10 +90,12 @@ 
 			$col['index'] = $index++;
 			$this->processColumn($tableInfo,$col);
 		}
-		if($index===0)
-			throw new TDbException('dbmetadata_invalid_table_view', $table);
-		if($colCase != TDbColumnCaseMode::Preserved)
-			$this->getDbConnection()->setColumnCase($colCase);
+		if($index===0) {
+					throw new TDbException('dbmetadata_invalid_table_view', $table);
+		}
+		if($colCase != TDbColumnCaseMode::Preserved) {
+					$this->getDbConnection()->setColumnCase($colCase);
+		}
 		return $tableInfo;
 	}
 
@@ -122,17 +125,22 @@ 
 		$info['ColumnName'] = "`$columnId`"; //quote the column names!
 		$info['ColumnId'] = $columnId;
 		$info['ColumnIndex'] = $col['index'];
-		if($col['Null']==='YES')
-			$info['AllowNull'] = true;
-		if(is_int(strpos(strtolower($col['Extra']), 'auto_increment')))
-			$info['AutoIncrement']=true;
-		if($col['Default']!=="")
-			$info['DefaultValue'] = $col['Default'];
+		if($col['Null']==='YES') {
+					$info['AllowNull'] = true;
+		}
+		if(is_int(strpos(strtolower($col['Extra']), 'auto_increment'))) {
+					$info['AutoIncrement']=true;
+		}
+		if($col['Default']!=="") {
+					$info['DefaultValue'] = $col['Default'];
+		}
 
-		if($col['Key']==='PRI' || in_array($columnId, $tableInfo->getPrimaryKeys()))
-			$info['IsPrimaryKey'] = true;
-		if($this->isForeignKeyColumn($columnId, $tableInfo))
-			$info['IsForeignKey'] = true;
+		if($col['Key']==='PRI' || in_array($columnId, $tableInfo->getPrimaryKeys())) {
+					$info['IsPrimaryKey'] = true;
+		}
+		if($this->isForeignKeyColumn($columnId, $tableInfo)) {
+					$info['IsForeignKey'] = true;
+		}
 
 		$info['DbType'] = $col['Type'];
 		$match=array();
@@ -142,8 +150,9 @@ 
 			$info['DbType']= preg_replace('/\(.*\)/', '', $col['Type']);
 
 			//find SET/ENUM values
-			if($this->isEnumSetType($info['DbType']))
-				$info['DbTypeValues'] = preg_split("/[',]/S", $match[1], -1, PREG_SPLIT_NO_EMPTY);
+			if($this->isEnumSetType($info['DbType'])) {
+							$info['DbTypeValues'] = preg_split("/[',]/S", $match[1], -1, PREG_SPLIT_NO_EMPTY);
+			}
 
 			//find column size, precision and scale
 			$pscale = array();
@@ -152,11 +161,12 @@ 
 				if($this->isPrecisionType($info['DbType']))
 				{
 					$info['NumericPrecision'] = intval($pscale[1]);
-					if(count($pscale) > 2)
-						$info['NumericScale'] = intval($pscale[2]);
+					if(count($pscale) > 2) {
+											$info['NumericScale'] = intval($pscale[2]);
+					}
+				} else {
+									$info['ColumnSize'] = intval($pscale[1]);
 				}
-				else
-					$info['ColumnSize'] = intval($pscale[1]);
 			}
 		}
 
@@ -223,8 +233,9 @@ 
 		list($schemaName,$tableName) = $this->getSchemaTableName($table);
 		$info['SchemaName'] = $schemaName;
 		$info['TableName'] = $tableName;
-		if($this->getIsView($schemaName,$tableName))
-			$info['IsView'] = true;
+		if($this->getIsView($schemaName,$tableName)) {
+					$info['IsView'] = true;
+		}
 		list($primary, $foreign) = $this->getConstraintKeys($schemaName, $tableName);
 		$class = $this->getTableInfoClass();
 		return new $class($info,$primary,$foreign);
@@ -242,20 +253,21 @@ 
 	 */
 	protected function getIsView($schemaName,$tableName)
 	{
-		if($this->getServerVersion()<5.01)
-			return false;
-		if($schemaName!==null)
-			$sql = "SHOW FULL TABLES FROM `{$schemaName}` LIKE :table";
-		else
-			$sql = "SHOW FULL TABLES LIKE :table";
+		if($this->getServerVersion()<5.01) {
+					return false;
+		}
+		if($schemaName!==null) {
+					$sql = "SHOW FULL TABLES FROM `{$schemaName}` LIKE :table";
+		} else {
+					$sql = "SHOW FULL TABLES LIKE :table";
+		}
 
 		$command = $this->getDbConnection()->createCommand($sql);
 		$command->bindValue(':table', $tableName);
 		try
 		{
 			return count($result = $command->queryRow()) > 0 && $result['Table_type']==='VIEW';
-		}
-		catch(TDbException $e)
+		} catch(TDbException $e)
 		{
 			$table = $schemaName===null?$tableName:$schemaName.'.'.$tableName;
 			throw new TDbException('dbcommon_invalid_table_name',$table,$e->getMessage());
@@ -276,15 +288,17 @@ 
 		$primary = array();
 		foreach($command->query() as $row)
 		{
-			if($row['Key_name']==='PRIMARY')
-				$primary[] = $row['Column_name'];
+			if($row['Key_name']==='PRIMARY') {
+							$primary[] = $row['Column_name'];
+			}
 		}
 				// MySQL version was increased to >=5.1.21 instead of 5.x
 				// due to a MySQL bug (http://bugs.mysql.com/bug.php?id=19588)
-		if($this->getServerVersion() >= 5.121)
-			$foreign = $this->getForeignConstraints($schemaName,$tableName);
-		else
-			$foreign = $this->findForeignConstraints($schemaName,$tableName);
+		if($this->getServerVersion() >= 5.121) {
+					$foreign = $this->getForeignConstraints($schemaName,$tableName);
+		} else {
+					$foreign = $this->findForeignConstraints($schemaName,$tableName);
+		}
 		return array($primary,$foreign);
 	}
 
@@ -313,8 +327,9 @@ 
 EOD;
 		$command = $this->getDbConnection()->createCommand($sql);
 		$command->bindValue(':table', $tableName);
-		if($schemaName!==null)
-			$command->bindValue(':schema', $schemaName);
+		if($schemaName!==null) {
+					$command->bindValue(':schema', $schemaName);
+		}
 		$fkeys=array();
 		foreach($command->query() as $col)
 		{
@@ -332,15 +347,17 @@ 
 	 */
 	protected function getShowCreateTable($schemaName, $tableName)
 	{
-		if(version_compare(PHP_VERSION,'5.1.3','<'))
-			throw new TDbException('dbmetadata_requires_php_version', 'Mysql 4.1.x', '5.1.3');
+		if(version_compare(PHP_VERSION,'5.1.3','<')) {
+					throw new TDbException('dbmetadata_requires_php_version', 'Mysql 4.1.x', '5.1.3');
+		}
 
 		//See http://netevil.org/node.php?nid=795&SC=1
 		$this->getDbConnection()->setAttribute(PDO::ATTR_EMULATE_PREPARES, true);
-		if($schemaName!==null)
-			$sql = "SHOW CREATE TABLE `{$schemaName}`.`{$tableName}`";
-		else
-			$sql = "SHOW CREATE TABLE `{$tableName}`";
+		if($schemaName!==null) {
+					$sql = "SHOW CREATE TABLE `{$schemaName}`.`{$tableName}`";
+		} else {
+					$sql = "SHOW CREATE TABLE `{$tableName}`";
+		}
 		$command = $this->getDbConnection()->createCommand($sql);
 		$result = $command->queryRow();
 		return isset($result['Create Table']) ? $result['Create Table'] : (isset($result['Create View']) ? $result['Create View'] : '');
@@ -364,8 +381,9 @@ 
 			$fields = array_map('trim',explode(',',str_replace('`','',$match[1])));
 			$fk_fields = array_map('trim',explode(',',str_replace('`','',$match[3])));
 			$keys=array();
-			foreach($fields as $k=>$v)
-				$keys[$v] = $fk_fields[$k];
+			foreach($fields as $k=>$v) {
+							$keys[$v] = $fk_fields[$k];
+			}
 			$foreign[] = array('keys' => $keys, 'table' => trim($match[2]));
 		}
 		return $foreign;
@@ -380,8 +398,9 @@ 
 	{
 		foreach($tableInfo->getForeignKeys() as $fk)
 		{
-			if(in_array($columnId, array_keys($fk['keys'])))
-				return true;
+			if(in_array($columnId, array_keys($fk['keys']))) {
+							return true;
+			}
 		}
 		return false;
 	}
@@ -394,11 +413,13 @@ 
 	 */
 	public function findTableNames($schema='')
 	{
-		if($schema==='')
-			return $this->getDbConnection()->createCommand('SHOW TABLES')->queryColumn();
+		if($schema==='') {
+					return $this->getDbConnection()->createCommand('SHOW TABLES')->queryColumn();
+		}
 		$names=$this->getDbConnection()->createCommand('SHOW TABLES FROM '.$this->quoteTableName($schema))->queryColumn();
-		foreach($names as &$name)
-			$name=$schema.'.'.$name;
+		foreach($names as &$name) {
+					$name=$schema.'.'.$name;
+		}
 		return $names;
 	}
 }

Indentation +6 added lines, -6 removed lines

@@ -417,12 +417,12 @@
 		return false;
 	}
 
-        /**
-	 * Returns all table names in the database.
-	 * @param string $schema the schema of the tables. Defaults to empty string, meaning the current or default schema.
-	 * If not empty, the returned table names will be prefixed with the schema name.
-	 * @return array all table names in the database.
-	 */
+		/**
+		 * Returns all table names in the database.
+		 * @param string $schema the schema of the tables. Defaults to empty string, meaning the current or default schema.
+		 * If not empty, the returned table names will be prefixed with the schema name.
+		 * @return array all table names in the database.
+		 */
 	public function findTableNames($schema='public')
 	{
 		if($schema==='')

framework/Data/Common/Oracle/TOracleMetaData.php

Doc Comments +3 added lines, -1 removed lines

@@ -145,7 +145,7 @@ 
 	/**
 	 * @param string table schema name
 	 * @param string table name.
-	 * @return boolean true if the table is a view.
+	 * @return integer true if the table is a view.
 	 */
 	protected function getIsView($schemaName,$tableName)
 	{
@@ -167,6 +167,7 @@ 
 	/**
 	 * @param TOracleTableInfo table information.
 	 * @param array column information.
+	 * @param TOracleTableInfo $tableInfo
 	 */
 	protected function processColumn($tableInfo, $col)
 	{
@@ -322,6 +323,7 @@ 
 	/**
 	 * @param string column name.
 	 * @param TOracleTableInfo table information.
+	 * @param string $columnId
 	 * @return boolean true if column is a foreign key.
 	 */
 	protected function isForeignKeyColumn($columnId, $tableInfo)

Spacing +56 added lines, -56 removed lines

@@ -41,7 +41,7 @@ 
 	 */
 	public function setDefaultSchema($schema)
 	{
-		$this->_defaultSchema=$schema;
+		$this->_defaultSchema = $schema;
 	}
 
 	/**
@@ -58,10 +58,10 @@ 
 	 */
 	protected function getSchemaTableName($table)
 	{
-		if(count($parts= explode('.', str_replace('"','',$table))) > 1)
+		if (count($parts = explode('.', str_replace('"', '', $table))) > 1)
 			return array($parts[0], $parts[1]);
 		else
-			return array($this->getDefaultSchema(),$parts[0]);
+			return array($this->getDefaultSchema(), $parts[0]);
 	}
 
 	/**
@@ -71,7 +71,7 @@ 
 	 */
 	protected function createTableInfo($table)
 	{
-		list($schemaName,$tableName) = $this->getSchemaTableName($table);
+		list($schemaName, $tableName) = $this->getSchemaTableName($table);
 
 		// This query is made much more complex by the addition of the 'attisserial' field.
 		// The subquery to get that field checks to see if there is an internally dependent
@@ -100,13 +100,13 @@ 
 		//$command->bindValue(':table', $tableName);
 		//$command->bindValue(':schema', $schemaName);
 		$tableInfo = $this->createNewTableInfo($schemaName, $tableName);
-		$index=0;
-		foreach($command->query() as $col)
+		$index = 0;
+		foreach ($command->query() as $col)
 		{
 			$col['index'] = $index++;
 			$this->processColumn($tableInfo, $col);
 		}
-		if($index===0)
+		if ($index === 0)
 			throw new TDbException('dbmetadata_invalid_table_view', $table);
 		return $tableInfo;
 	}
@@ -116,15 +116,15 @@ 
 	 * @param string table name.
 	 * @return TOracleTableInfo
 	 */
-	protected function createNewTableInfo($schemaName,$tableName)
+	protected function createNewTableInfo($schemaName, $tableName)
 	{
 		$info['SchemaName'] = $this->assertIdentifier($schemaName);
-		$info['TableName']	= $this->assertIdentifier($tableName);
-		$info['IsView'] 	= false;
-		if($this->getIsView($schemaName,$tableName)) $info['IsView'] = true;
+		$info['TableName'] = $this->assertIdentifier($tableName);
+		$info['IsView'] = false;
+		if ($this->getIsView($schemaName, $tableName)) $info['IsView'] = true;
 		list($primary, $foreign) = $this->getConstraintKeys($schemaName, $tableName);
 		$class = $this->getTableInfoClass();
-		return new $class($info,$primary,$foreign);
+		return new $class($info, $primary, $foreign);
 	}
 
 	/**
@@ -134,7 +134,7 @@ 
 	 */
 	protected function assertIdentifier($name)
 	{
-		if(strpos($name, '"')!==false)
+		if (strpos($name, '"') !== false)
 		{
 			$ref = 'http://www.oracle.com';
 			throw new TDbException('dbcommon_invalid_identifier_name', $name, $ref);
@@ -147,7 +147,7 @@ 
 	 * @param string table name.
 	 * @return boolean true if the table is a view.
 	 */
-	protected function getIsView($schemaName,$tableName)
+	protected function getIsView($schemaName, $tableName)
 	{
 		$this->getDbConnection()->setAttribute(PDO::ATTR_CASE, PDO::CASE_LOWER);
 		$sql =
@@ -173,14 +173,14 @@ 
 		$columnId = strtolower($col['attname']); //use column name as column Id
 
 		//$info['ColumnName'] 	= '"'.$columnId.'"'; //quote the column names!
-		$info['ColumnName'] 	= $columnId; //NOT quote the column names!
-		$info['ColumnId'] 		= $columnId;
-		$info['ColumnIndex'] 	= $col['index'];
-		if(! (bool)$col['attnotnull'] ) $info['AllowNull'] = true;
-		if(in_array($columnId, $tableInfo->getPrimaryKeys())) $info['IsPrimaryKey'] = true;
-		if($this->isForeignKeyColumn($columnId, $tableInfo)) $info['IsForeignKey'] = true;
-		if( (int)$col['atttypmod'] > 0 ) $info['ColumnSize'] =  $col['atttypmod']; // - 4;
-		if( (bool)$col['atthasdef'] ) $info['DefaultValue'] = $col['adsrc'];
+		$info['ColumnName'] = $columnId; //NOT quote the column names!
+		$info['ColumnId'] = $columnId;
+		$info['ColumnIndex'] = $col['index'];
+		if (!(bool) $col['attnotnull']) $info['AllowNull'] = true;
+		if (in_array($columnId, $tableInfo->getPrimaryKeys())) $info['IsPrimaryKey'] = true;
+		if ($this->isForeignKeyColumn($columnId, $tableInfo)) $info['IsForeignKey'] = true;
+		if ((int) $col['atttypmod'] > 0) $info['ColumnSize'] = $col['atttypmod']; // - 4;
+		if ((bool) $col['atthasdef']) $info['DefaultValue'] = $col['adsrc'];
 		//
 		// For a while Oracle Tables has no  associated AutoIncrement Triggers
 		//
@@ -195,13 +195,13 @@ 
 		}
 		*/
 		$matches = array();
-		if(preg_match('/\((\d+)(?:,(\d+))?+\)/', $col['type'], $matches))
+		if (preg_match('/\((\d+)(?:,(\d+))?+\)/', $col['type'], $matches))
 		{
-			$info['DbType'] = preg_replace('/\(\d+(?:,\d+)?\)/','',$col['type']);
-			if($this->isPrecisionType($info['DbType']))
+			$info['DbType'] = preg_replace('/\(\d+(?:,\d+)?\)/', '', $col['type']);
+			if ($this->isPrecisionType($info['DbType']))
 			{
 				$info['NumericPrecision'] = intval($matches[1]);
-				if(count($matches) > 2)
+				if (count($matches) > 2)
 					$info['NumericScale'] = intval($matches[2]);
 			}
 			else
@@ -215,15 +215,15 @@ 
 	/**
 	 * @return string serial name if found, null otherwise.
 	 */
-	protected function getSequenceName($tableInfo,$src)
+	protected function getSequenceName($tableInfo, $src)
 	{
 		$matches = array();
-		if(preg_match('/nextval\([^\']*\'([^\']+)\'[^\)]*\)/i',$src,$matches))
+		if (preg_match('/nextval\([^\']*\'([^\']+)\'[^\)]*\)/i', $src, $matches))
 		{
-			if(is_int(strpos($matches[1], '.')))
+			if (is_int(strpos($matches[1], '.')))
 				return $matches[1];
 			else
-				return $tableInfo->getSchemaName().'.'.$matches[1];
+				return $tableInfo->getSchemaName() . '.' . $matches[1];
 		}
 	}
 
@@ -233,7 +233,7 @@ 
 	protected function isPrecisionType($type)
 	{
 		$type = strtolower(trim($type));
-		return $type==='number'; // || $type==='interval' || strpos($type, 'time')===0;
+		return $type === 'number'; // || $type==='interval' || strpos($type, 'time')===0;
 	}
 
 	/**
@@ -262,19 +262,19 @@ 
 		//$command->bindValue(':schema', $schemaName);
 		$primary = array();
 		$foreign = array();
-		foreach($command->query() as $row)
+		foreach ($command->query() as $row)
 		{
-			switch( strtolower( $row['contype'] ) )
+			switch (strtolower($row['contype']))
 			{
 				case 'p':
-					$primary = array_merge( $primary, array(strtolower( $row['consrc'] )) );
+					$primary = array_merge($primary, array(strtolower($row['consrc'])));
 					/*
 					$arr = $this->getPrimaryKeys($row['consrc']);
 					$primary = array_merge( $primary, array(strtolower( $arr[0] )) );
 					*/
 					break;
 				case 'r':
-					$foreign = array_merge( $foreign, array(strtolower( $row['consrc'] )) );
+					$foreign = array_merge($foreign, array(strtolower($row['consrc'])));
 					/*
 					// if(($fkey = $this->getForeignKeys($row['consrc']))!==null)
 					$fkey = $this->getForeignKeys( $row['consrc'] );
@@ -283,7 +283,7 @@ 
 					break;
 			}
 		}
-		return array($primary,$foreign);
+		return array($primary, $foreign);
 	}
 
 	/**
@@ -294,8 +294,8 @@ 
 	protected function getPrimaryKeys($src)
 	{
 		$matches = array();
-		if(preg_match('/PRIMARY\s+KEY\s+\(([^\)]+)\)/i', $src, $matches))
-			return preg_split('/,\s+/',$matches[1]);
+		if (preg_match('/PRIMARY\s+KEY\s+\(([^\)]+)\)/i', $src, $matches))
+			return preg_split('/,\s+/', $matches[1]);
 		return array();
 	}
 
@@ -309,13 +309,13 @@ 
 		$matches = array();
 		$brackets = '\(([^\)]+)\)';
 		$find = "/FOREIGN\s+KEY\s+{$brackets}\s+REFERENCES\s+([^\(]+){$brackets}/i";
-		if(preg_match($find, $src, $matches))
+		if (preg_match($find, $src, $matches))
 		{
 			$keys = preg_split('/,\s+/', $matches[1]);
 			$fkeys = array();
-			foreach(preg_split('/,\s+/', $matches[3]) as $i => $fkey)
+			foreach (preg_split('/,\s+/', $matches[3]) as $i => $fkey)
 				$fkeys[$keys[$i]] = $fkey;
-			return array('table' => str_replace('"','',$matches[2]), 'keys' => $fkeys);
+			return array('table' => str_replace('"', '', $matches[2]), 'keys' => $fkeys);
 		}
 	}
 
@@ -326,9 +326,9 @@ 
 	 */
 	protected function isForeignKeyColumn($columnId, $tableInfo)
 	{
-		foreach($tableInfo->getForeignKeys() as $fk)
+		foreach ($tableInfo->getForeignKeys() as $fk)
 		{
-			if( $fk==$columnId )
+			if ($fk == $columnId)
 			//if(in_array($columnId, array_keys($fk['keys'])))
 				return true;
 		}
@@ -341,33 +341,33 @@ 
 	 * If not empty, the returned table names will be prefixed with the schema name.
 	 * @return array all table names in the database.
 	 */
-	public function findTableNames($schema='')
+	public function findTableNames($schema = '')
 	{
-		if($schema==='')
+		if ($schema === '')
 		{
-			$sql=<<<EOD
+			$sql = <<<EOD
 SELECT table_name, '{$schema}' as table_schema FROM user_tables
 EOD;
-			$command=$this->getDbConnection()->createCommand($sql);
+			$command = $this->getDbConnection()->createCommand($sql);
 		}
 		else
 		{
-			$sql=<<<EOD
+			$sql = <<<EOD
 SELECT object_name as table_name, owner as table_schema FROM all_objects
 WHERE object_type = 'TABLE' AND owner=:schema
 EOD;
-			$command=$this->getDbConnection()->createCommand($sql);
-			$command->bindParam(':schema',$schema);
+			$command = $this->getDbConnection()->createCommand($sql);
+			$command->bindParam(':schema', $schema);
 		}
 
-		$rows=$command->queryAll();
-		$names=array();
-		foreach($rows as $row)
+		$rows = $command->queryAll();
+		$names = array();
+		foreach ($rows as $row)
 		{
-			if($schema===$this->getDefaultSchema() || $schema==='')
-				$names[]=$row['TABLE_NAME'];
+			if ($schema === $this->getDefaultSchema() || $schema === '')
+				$names[] = $row['TABLE_NAME'];
 			else
-				$names[]=$row['TABLE_SCHEMA'].'.'.$row['TABLE_NAME'];
+				$names[] = $row['TABLE_SCHEMA'] . '.' . $row['TABLE_NAME'];
 		}
 		return $names;
 	}

Braces +54 added lines, -34 removed lines

@@ -58,10 +58,11 @@ 
 	 */
 	protected function getSchemaTableName($table)
 	{
-		if(count($parts= explode('.', str_replace('"','',$table))) > 1)
-			return array($parts[0], $parts[1]);
-		else
-			return array($this->getDefaultSchema(),$parts[0]);
+		if(count($parts= explode('.', str_replace('"','',$table))) > 1) {
+					return array($parts[0], $parts[1]);
+		} else {
+					return array($this->getDefaultSchema(),$parts[0]);
+		}
 	}
 
 	/**
@@ -106,8 +107,9 @@ 
 			$col['index'] = $index++;
 			$this->processColumn($tableInfo, $col);
 		}
-		if($index===0)
-			throw new TDbException('dbmetadata_invalid_table_view', $table);
+		if($index===0) {
+					throw new TDbException('dbmetadata_invalid_table_view', $table);
+		}
 		return $tableInfo;
 	}
 
@@ -121,7 +123,9 @@ 
 		$info['SchemaName'] = $this->assertIdentifier($schemaName);
 		$info['TableName']	= $this->assertIdentifier($tableName);
 		$info['IsView'] 	= false;
-		if($this->getIsView($schemaName,$tableName)) $info['IsView'] = true;
+		if($this->getIsView($schemaName,$tableName)) {
+			$info['IsView'] = true;
+		}
 		list($primary, $foreign) = $this->getConstraintKeys($schemaName, $tableName);
 		$class = $this->getTableInfoClass();
 		return new $class($info,$primary,$foreign);
@@ -176,11 +180,22 @@ 
 		$info['ColumnName'] 	= $columnId; //NOT quote the column names!
 		$info['ColumnId'] 		= $columnId;
 		$info['ColumnIndex'] 	= $col['index'];
-		if(! (bool)$col['attnotnull'] ) $info['AllowNull'] = true;
-		if(in_array($columnId, $tableInfo->getPrimaryKeys())) $info['IsPrimaryKey'] = true;
-		if($this->isForeignKeyColumn($columnId, $tableInfo)) $info['IsForeignKey'] = true;
-		if( (int)$col['atttypmod'] > 0 ) $info['ColumnSize'] =  $col['atttypmod']; // - 4;
-		if( (bool)$col['atthasdef'] ) $info['DefaultValue'] = $col['adsrc'];
+		if(! (bool)$col['attnotnull'] ) {
+			$info['AllowNull'] = true;
+		}
+		if(in_array($columnId, $tableInfo->getPrimaryKeys())) {
+			$info['IsPrimaryKey'] = true;
+		}
+		if($this->isForeignKeyColumn($columnId, $tableInfo)) {
+			$info['IsForeignKey'] = true;
+		}
+		if( (int)$col['atttypmod'] > 0 ) {
+			$info['ColumnSize'] =  $col['atttypmod'];
+		}
+		// - 4;
+		if( (bool)$col['atthasdef'] ) {
+			$info['DefaultValue'] = $col['adsrc'];
+		}
 		//
 		// For a while Oracle Tables has no  associated AutoIncrement Triggers
 		//
@@ -201,14 +216,15 @@ 
 			if($this->isPrecisionType($info['DbType']))
 			{
 				$info['NumericPrecision'] = intval($matches[1]);
-				if(count($matches) > 2)
-					$info['NumericScale'] = intval($matches[2]);
+				if(count($matches) > 2) {
+									$info['NumericScale'] = intval($matches[2]);
+				}
+			} else {
+							$info['ColumnSize'] = intval($matches[1]);
 			}
-			else
-				$info['ColumnSize'] = intval($matches[1]);
+		} else {
+					$info['DbType'] = $col['type'];
 		}
-		else
-			$info['DbType'] = $col['type'];
 		$tableInfo->Columns[$columnId] = new TOracleTableColumn($info);
 	}
 
@@ -220,10 +236,11 @@ 
 		$matches = array();
 		if(preg_match('/nextval\([^\']*\'([^\']+)\'[^\)]*\)/i',$src,$matches))
 		{
-			if(is_int(strpos($matches[1], '.')))
-				return $matches[1];
-			else
-				return $tableInfo->getSchemaName().'.'.$matches[1];
+			if(is_int(strpos($matches[1], '.'))) {
+							return $matches[1];
+			} else {
+							return $tableInfo->getSchemaName().'.'.$matches[1];
+			}
 		}
 	}
 
@@ -294,8 +311,9 @@ 
 	protected function getPrimaryKeys($src)
 	{
 		$matches = array();
-		if(preg_match('/PRIMARY\s+KEY\s+\(([^\)]+)\)/i', $src, $matches))
-			return preg_split('/,\s+/',$matches[1]);
+		if(preg_match('/PRIMARY\s+KEY\s+\(([^\)]+)\)/i', $src, $matches)) {
+					return preg_split('/,\s+/',$matches[1]);
+		}
 		return array();
 	}
 
@@ -313,8 +331,9 @@ 
 		{
 			$keys = preg_split('/,\s+/', $matches[1]);
 			$fkeys = array();
-			foreach(preg_split('/,\s+/', $matches[3]) as $i => $fkey)
-				$fkeys[$keys[$i]] = $fkey;
+			foreach(preg_split('/,\s+/', $matches[3]) as $i => $fkey) {
+							$fkeys[$keys[$i]] = $fkey;
+			}
 			return array('table' => str_replace('"','',$matches[2]), 'keys' => $fkeys);
 		}
 	}
@@ -328,9 +347,10 @@ 
 	{
 		foreach($tableInfo->getForeignKeys() as $fk)
 		{
-			if( $fk==$columnId )
-			//if(in_array($columnId, array_keys($fk['keys'])))
+			if( $fk==$columnId ) {
+						//if(in_array($columnId, array_keys($fk['keys'])))
 				return true;
+			}
 		}
 		return false;
 	}
@@ -349,8 +369,7 @@ 
 SELECT table_name, '{$schema}' as table_schema FROM user_tables
 EOD;
 			$command=$this->getDbConnection()->createCommand($sql);
-		}
-		else
+		} else
 		{
 			$sql=<<<EOD
 SELECT object_name as table_name, owner as table_schema FROM all_objects
@@ -364,10 +383,11 @@ 
 		$names=array();
 		foreach($rows as $row)
 		{
-			if($schema===$this->getDefaultSchema() || $schema==='')
-				$names[]=$row['TABLE_NAME'];
-			else
-				$names[]=$row['TABLE_SCHEMA'].'.'.$row['TABLE_NAME'];
+			if($schema===$this->getDefaultSchema() || $schema==='') {
+							$names[]=$row['TABLE_NAME'];
+			} else {
+							$names[]=$row['TABLE_SCHEMA'].'.'.$row['TABLE_NAME'];
+			}
 		}
 		return $names;
 	}

Indentation +6 added lines, -6 removed lines

@@ -417,12 +417,12 @@
 		return false;
 	}
 
-        /**
-	 * Returns all table names in the database.
-	 * @param string $schema the schema of the tables. Defaults to empty string, meaning the current or default schema.
-	 * If not empty, the returned table names will be prefixed with the schema name.
-	 * @return array all table names in the database.
-	 */
+		/**
+		 * Returns all table names in the database.
+		 * @param string $schema the schema of the tables. Defaults to empty string, meaning the current or default schema.
+		 * If not empty, the returned table names will be prefixed with the schema name.
+		 * @return array all table names in the database.
+		 */
 	public function findTableNames($schema='public')
 	{
 		if($schema==='')

framework/Data/Common/Oracle/TOracleTableInfo.php

Doc Comments +2 added lines

@@ -53,6 +53,8 @@
 	/**
 	 * @param string information array key name
 	 * @param mixed default value if information array value is null
+	 * @param string $name
+	 * @param boolean $default
 	 * @return mixed information array value.
 	 */
 	public function getInfo($name,$default=null)

Spacing +17 added lines, -17 removed lines

@@ -19,7 +19,7 @@ 
  */
 class TOracleTableInfo extends TComponent
 {
-	private $_info=array();
+	private $_info = array();
 
 	private $_primaryKeys;
 	private $_foreignKeys;
@@ -32,12 +32,12 @@ 
 	 * Sets the database table meta data information.
 	 * @param array table column information.
 	 */
-	public function __construct($tableInfo=array(),$primary=array(),$foreign=array())
+	public function __construct($tableInfo = array(), $primary = array(), $foreign = array())
 	{
-		$this->_info=$tableInfo;
-		$this->_primaryKeys=$primary;
-		$this->_foreignKeys=$foreign;
-		$this->_columns=new TMap;
+		$this->_info = $tableInfo;
+		$this->_primaryKeys = $primary;
+		$this->_foreignKeys = $foreign;
+		$this->_columns = new TMap;
 	}
 
 	/**
@@ -47,7 +47,7 @@ 
 	public function createCommandBuilder($connection)
 	{
 		Prado::using('System.Data.Common.Oracle.TOracleCommandBuilder');
-		return new TOracleCommandBuilder($connection,$this);
+		return new TOracleCommandBuilder($connection, $this);
 	}
 
 	/**
@@ -55,7 +55,7 @@ 
 	 * @param mixed default value if information array value is null
 	 * @return mixed information array value.
 	 */
-	public function getInfo($name,$default=null)
+	public function getInfo($name, $default = null)
 	{
 		return isset($this->_info[$name]) ? $this->_info[$name] : $default;
 	}
@@ -64,9 +64,9 @@ 
 	 * @param string information array key name
 	 * @param mixed new information array value.
 	 */
-	protected function setInfo($name,$value)
+	protected function setInfo($name, $value)
 	{
-		$this->_info[$name]=$value;
+		$this->_info[$name] = $value;
 	}
 
 	/**
@@ -82,7 +82,7 @@ 
 	 */
 	public function getTableFullName()
 	{
-		return $this->_info['SchemaName'].'.'.$this->getTableName();
+		return $this->_info['SchemaName'] . '.' . $this->getTableName();
 	}
 
 	/**
@@ -90,7 +90,7 @@ 
 	 */
 	public function getIsView()
 	{
-		return $this->getInfo('IsView',false);
+		return $this->getInfo('IsView', false);
 	}
 
 	/**
@@ -107,7 +107,7 @@ 
 	 */
 	public function getColumn($name)
 	{
-		if(($column = $this->_columns->itemAt($name))!==null)
+		if (($column = $this->_columns->itemAt($name)) !== null)
 			return $column;
 		throw new TDbException('dbtableinfo_invalid_column_name', $name, $this->getTableFullName());
 	}
@@ -118,7 +118,7 @@ 
 	 */
 	public function getColumnNames()
 	{
-		foreach($this->getColumns() as $column)
+		foreach ($this->getColumns() as $column)
 			$names[] = $column->getColumnName();
 		return $names;
 	}
@@ -144,10 +144,10 @@ 
 	 */
 	public function getLowerCaseColumnNames()
 	{
-		if($this->_lowercase===null)
+		if ($this->_lowercase === null)
 		{
-			$this->_lowercase=array();
-			foreach($this->getColumns()->getKeys() as $key)
+			$this->_lowercase = array();
+			foreach ($this->getColumns()->getKeys() as $key)
 				$this->_lowercase[strtolower($key)] = $key;
 		}
 		return $this->_lowercase;

Braces +9 added lines, -6 removed lines

@@ -107,8 +107,9 @@ 
 	 */
 	public function getColumn($name)
 	{
-		if(($column = $this->_columns->itemAt($name))!==null)
-			return $column;
+		if(($column = $this->_columns->itemAt($name))!==null) {
+					return $column;
+		}
 		throw new TDbException('dbtableinfo_invalid_column_name', $name, $this->getTableFullName());
 	}
 
@@ -118,8 +119,9 @@ 
 	 */
 	public function getColumnNames()
 	{
-		foreach($this->getColumns() as $column)
-			$names[] = $column->getColumnName();
+		foreach($this->getColumns() as $column) {
+					$names[] = $column->getColumnName();
+		}
 		return $names;
 	}
 
@@ -147,8 +149,9 @@ 
 		if($this->_lowercase===null)
 		{
 			$this->_lowercase=array();
-			foreach($this->getColumns()->getKeys() as $key)
-				$this->_lowercase[strtolower($key)] = $key;
+			foreach($this->getColumns()->getKeys() as $key) {
+							$this->_lowercase[strtolower($key)] = $key;
+			}
 		}
 		return $this->_lowercase;
 	}