pradosoft / prado

framework/Data/ActiveRecord/TActiveRecord.php

Braces +7 added lines, -14 removed lines

@@ -425,14 +425,12 @@ 
 				$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;
-		}
-		else
+		} else
 			throw new TActiveRecordException('ar_save_invalid', get_class($this));
 
 		return false;
@@ -455,8 +453,7 @@ 
 				$this->_recordState=self::STATE_DELETED;
 				return true;
 			}
-		}
-		else
+		} else
 			throw new TActiveRecordException('ar_delete_invalid', get_class($this));
 
 		return false;
@@ -723,8 +720,7 @@ 
 		{
 			$criteria = $this->getRecordCriteria(count($args)>0 ? $args[0] : null, array_slice($args,1));
 			return $context->getRelationHandler($criteria);
-		}
-		else
+		} else
 			return null;
 	}
 
@@ -743,8 +739,7 @@ 
 		{
 			list($property, $relation) = $definition;
 			return new TActiveRecordRelationContext($this,$property,$relation);
-		}
-		else
+		} else
 			return null;
 	}
 
@@ -827,8 +822,7 @@ 
 		{
 			$property= $method[4]==='_' ? substr($method,5) : substr($method,4);
 			return $this->getRelationHandler($property, $args);
-		}
-		else if($findOne=strncasecmp($method,'findby',6)===0)
+		} 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);
@@ -894,8 +888,7 @@ 
 		{
 			$useArgs = !is_array($parameters) && is_array($args);
 			return new TActiveRecordCriteria($criteria,$useArgs ? $args : $parameters);
-		}
-		else if($criteria instanceof TSqlCriteria)
+		} else if($criteria instanceof TSqlCriteria)
 			return $criteria;
 		else
 			return new TActiveRecordCriteria();

Doc Comments +10 added lines, -2 removed lines

@@ -324,7 +324,7 @@ 
 	/**
 	 * Gets the current Db connection, the connection object is obtained from
 	 * the TActiveRecordManager if connection is currently null.
-	 * @return TDbConnection current db connection for this object.
+	 * @return \Prado\Data\TDbConnection current db connection for this object.
 	 */
 	public function getDbConnection()
 	{
@@ -511,6 +511,7 @@ 
 	 * Delete multiple records using a criteria.
 	 * @param string|TActiveRecordCriteria SQL condition or criteria object.
 	 * @param mixed parameter values.
+	 * @param TSqlCriteria $criteria
 	 * @return int number of records deleted.
 	 */
 	public function deleteAll($criteria=null, $parameters=array())
@@ -577,6 +578,7 @@ 
 	 *
 	 * @param string|TActiveRecordCriteria SQL condition or criteria object.
 	 * @param mixed parameter values.
+	 * @param TSqlCriteria $criteria
 	 * @return TActiveRecord matching record object. Null if no result is found.
 	 */
 	public function find($criteria,$parameters=array())
@@ -593,6 +595,7 @@ 
 	 *
 	 * @param string|TActiveRecordCriteria SQL condition or criteria object.
 	 * @param mixed parameter values.
+	 * @param TSqlCriteria $criteria
 	 * @return array matching record objects. Empty array if no result is found.
 	 */
 	public function findAll($criteria=null,$parameters=array())
@@ -706,6 +709,7 @@ 
 	 * Find the number of records.
 	 * @param string|TActiveRecordCriteria SQL condition or criteria object.
 	 * @param mixed parameter values.
+	 * @param TActiveRecordCriteria $criteria
 	 * @return int number of records.
 	 */
 	public function count($criteria=null,$parameters=array())
@@ -721,6 +725,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())
@@ -945,6 +950,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)
 	{
@@ -955,6 +961,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)
 	{
@@ -965,6 +972,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)
 	{
@@ -1048,7 +1056,7 @@ 
     
     	/**
      	* Return record data as JSON
-     	* @return JSON
+     	* @return string
      	* @since 3.2.4
      	*/
     	public function toJSON(){

Indentation +20 added lines, -20 removed lines

@@ -1032,26 +1032,26 @@
 		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());
+		}
 }
\ No newline at end of file

Spacing +83 added lines, -83 removed lines

@@ -200,14 +200,14 @@ 
 	 * @var TActiveRecordInvalidFinderResult
 	 * @since 3.1.5
 	 */
-	protected $_invalidFinderResult = null; // use protected so that serialization is fine
+	protected $_invalidFinderResult=null; // use protected so that serialization is fine
 
 	/**
 	 * Prevent __call() method creating __sleep() when serializing.
 	 */
 	public function __sleep()
 	{
-		return array_diff(parent::__sleep(),array("\0*\0_connection"));
+		return array_diff(parent::__sleep(), array("\0*\0_connection"));
 	}
 
 	/**
@@ -262,12 +262,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;
 		else
-			parent::__set($name,$value);
+			parent::__set($name, $value);
 	}
 
 	/**
@@ -294,7 +294,7 @@ 
 			$class=new ReflectionClass($className);
 			$relations=array();
 			foreach($class->getStaticPropertyValue('RELATIONS') as $key=>$value)
-				$relations[strtolower($key)]=array($key,$value);
+				$relations[strtolower($key)]=array($key, $value);
 			self::$_relations[$className]=$relations;
 		}
 	}
@@ -310,7 +310,7 @@ 
 		if(!is_array($data))
 			throw new TActiveRecordException('ar_data_invalid', get_class($this));
 		foreach($data as $name=>$value)
-			$this->setColumnValue($name,$value);
+			$this->setColumnValue($name, $value);
 	}
 
 
@@ -361,16 +361,16 @@ 
 	{
 		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();
+		$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);
+				$equals=$equals && $this->getColumnValue($prop)===$record->getColumnValue($prop);
 			else
-				$equals = $equals && $this->getColumnValue($prop) == $record->getColumnValue($prop);
+				$equals=$equals && $this->getColumnValue($prop)==$record->getColumnValue($prop);
 			if(!$equals)
 				return false;
 		}
@@ -388,10 +388,10 @@ 
 	 */
 	public static function finder($className=__CLASS__)
 	{
-		static $finders = array();
+		static $finders=array();
 		if(!isset($finders[$className]))
 		{
-			$f = Prado::createComponent($className);
+			$f=Prado::createComponent($className);
 			$finders[$className]=$f;
 		}
 		return $finders[$className];
@@ -421,14 +421,14 @@ 
 	 */
 	public function save()
 	{
-		$gateway = $this->getRecordGateway();
-		$param = new TActiveRecordChangeEventParameter();
+		$gateway=$this->getRecordGateway();
+		$param=new TActiveRecordChangeEventParameter();
 		if($this->_recordState===self::STATE_NEW)
 		{
 			$this->onInsert($param);
 			if($param->getIsValid() && $gateway->insert($this))
 			{
-				$this->_recordState = self::STATE_LOADED;
+				$this->_recordState=self::STATE_LOADED;
 				return true;
 			}
 		}
@@ -453,8 +453,8 @@ 
 	{
 		if($this->_recordState===self::STATE_LOADED)
 		{
-			$gateway = $this->getRecordGateway();
-			$param = new TActiveRecordChangeEventParameter();
+			$gateway=$this->getRecordGateway();
+			$param=new TActiveRecordChangeEventParameter();
 			$this->onDelete($param);
 			if($param->getIsValid() && $gateway->delete($this))
 			{
@@ -494,8 +494,8 @@ 
 	public function deleteByPk($keys)
 	{
 		if(func_num_args() > 1)
-			$keys = func_get_args();
-		return $this->getRecordGateway()->deleteRecordsByPk($this,(array)$keys);
+			$keys=func_get_args();
+		return $this->getRecordGateway()->deleteRecordsByPk($this, (array) $keys);
 	}
 
 	/**
@@ -504,7 +504,7 @@ 
 	public function deleteAllByPks($keys)
 	{
 		if(func_num_args() > 1)
-			$keys = func_get_args();
+			$keys=func_get_args();
 		return $this->deleteByPk($keys);
 	}
 	/**
@@ -515,8 +515,8 @@ 
 	 */
 	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);
 	}
 
@@ -540,7 +540,7 @@ 
 	{
 		$result=array();
 		foreach($reader as $data)
-			$result[] = $this->populateObject($data);
+			$result[]=$this->populateObject($data);
 		return $result;
 	}
 
@@ -579,12 +579,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);
 	}
 
@@ -595,12 +595,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;
+		$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);
+			$criteria=$this->getRecordCriteria($criteria, $parameters, $args);
+		$result=$this->getRecordGateway()->findRecordsByCriteria($this, $criteria, true);
 		return $this->populateObjects($result);
 	}
 
@@ -618,11 +618,11 @@ 
 	 */
 	public function findByPk($keys)
 	{
-		if($keys === null)
+		if($keys===null)
 			return null;
 		if(func_num_args() > 1)
-			$keys = func_get_args();
-		$data = $this->getRecordGateway()->findRecordByPK($this,$keys);
+			$keys=func_get_args();
+		$data=$this->getRecordGateway()->findRecordByPK($this, $keys);
 		return $this->populateObject($data);
 	}
 
@@ -646,8 +646,8 @@ 
 	public function findAllByPks($keys)
 	{
 		if(func_num_args() > 1)
-			$keys = func_get_args();
-		$result = $this->getRecordGateway()->findRecordsByPks($this,(array)$keys);
+			$keys=func_get_args();
+		$result=$this->getRecordGateway()->findRecordsByPks($this, (array) $keys);
 		return $this->populateObjects($result);
 	}
 
@@ -659,12 +659,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);
 	}
 
@@ -676,11 +676,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);
 	}
 
@@ -696,9 +696,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);
 	}
 
@@ -708,12 +708,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;
+		$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);
+			$criteria=$this->getRecordCriteria($criteria, $parameters, $args);
+		return $this->getRecordGateway()->countRecords($this, $criteria);
 	}
 
 	/**
@@ -723,11 +723,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
@@ -747,8 +747,8 @@ 
 	{
 		if(($definition=$this->getRecordRelation($name))!==null)
 		{
-			list($property, $relation) = $definition;
-			return new TActiveRecordRelationContext($this,$property,$relation);
+			list($property, $relation)=$definition;
+			return new TActiveRecordRelationContext($this, $property, $relation);
 		}
 		else
 			return null;
@@ -791,7 +791,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;
@@ -826,31 +826,31 @@ 
 	 * @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);
+		$criteria=$this->getRecordGateway()->getCommand($this)->createCriteriaFromString($method, $condition, $args);
 		if($delete)
 			return $this->deleteAll($criteria);
 		else
@@ -864,7 +864,7 @@ 
 	 */
 	public function getInvalidFinderResult()
 	{
-		if($this->_invalidFinderResult !== null)
+		if($this->_invalidFinderResult!==null)
 			return $this->_invalidFinderResult;
 
 		return self::getRecordManager()->getInvalidFinderResult();
@@ -879,10 +879,10 @@ 
 	 */
 	public function setInvalidFinderResult($value)
 	{
-		if($value === null)
-			$this->_invalidFinderResult = null;
+		if($value===null)
+			$this->_invalidFinderResult=null;
 		else
-			$this->_invalidFinderResult = TPropertyValue::ensureEnum($value, 'Prado\\Data\\ActiveRecord\\TActiveRecordInvalidFinderResult');
+			$this->_invalidFinderResult=TPropertyValue::ensureEnum($value, 'Prado\\Data\\ActiveRecord\\TActiveRecordInvalidFinderResult');
 	}
 
 	/**
@@ -898,8 +898,8 @@ 
 	{
 		if(is_string($criteria))
 		{
-			$useArgs = !is_array($parameters) && is_array($args);
-			return new TActiveRecordCriteria($criteria,$useArgs ? $args : $parameters);
+			$useArgs=!is_array($parameters) && is_array($args);
+			return new TActiveRecordCriteria($criteria, $useArgs ? $args : $parameters);
 		}
 		else if($criteria instanceof TSqlCriteria)
 			return $criteria;
@@ -993,7 +993,7 @@ 
 	 * @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]))
@@ -1010,7 +1010,7 @@ 
 	{
 		$className=get_class($this);
 		$property=strtolower($property);
-		return isset(self::$_relations[$className][$property])?self::$_relations[$className][$property]:null;
+		return isset(self::$_relations[$className][$property]) ?self::$_relations[$className][$property] : null;
 	}
 
 	/**
@@ -1037,9 +1037,9 @@ 
         * @return array of column name and column values
         * @since 3.2.4
         */
-        public function toArray(){
+        public function toArray() {
         	$result=array();
-        	foreach($this->getRecordTableInfo()->getLowerCaseColumnNames() as $columnName){
+        	foreach($this->getRecordTableInfo()->getLowerCaseColumnNames() as $columnName) {
             		$result[$columnName]=$this->getColumnValue($columnName);
            	}
         
@@ -1051,7 +1051,7 @@ 
      	* @return JSON
      	* @since 3.2.4
      	*/
-    	public function toJSON(){
+    	public function toJSON() {
         	return json_encode($this->toArray());
     	}
 }
\ No newline at end of file

framework/Data/ActiveRecord/Relations/TActiveRecordBelongsTo.php

Spacing +14 added lines, -14 removed lines

@@ -77,13 +77,13 @@ 
 	 */
 	protected function collectForeignObjects(&$results)
 	{
-		$fkeys = $this->getRelationForeignKeys();
+		$fkeys=$this->getRelationForeignKeys();
 
-		$properties = array_keys($fkeys);
-		$fields = array_values($fkeys);
-		$indexValues = $this->getIndexValues($properties, $results);
-		$fkObjects = $this->findForeignObjects($fields, $indexValues);
-		$this->populateResult($results,$properties,$fkObjects,$fields);
+		$properties=array_keys($fkeys);
+		$fields=array_values($fkeys);
+		$indexValues=$this->getIndexValues($properties, $results);
+		$fkObjects=$this->findForeignObjects($fields, $indexValues);
+		$this->populateResult($results, $properties, $fkObjects, $fields);
 	}
 
 	/**
@@ -92,8 +92,8 @@ 
 	 */
 	public function getRelationForeignKeys()
 	{
-		$fkObject = $this->getContext()->getForeignRecordFinder();
-		return $this->findForeignKeys($this->getSourceRecord(),$fkObject);
+		$fkObject=$this->getContext()->getForeignRecordFinder();
+		return $this->findForeignKeys($this->getSourceRecord(), $fkObject);
 	}
 
 	/**
@@ -103,8 +103,8 @@ 
 	 */
 	protected function setObjectProperty($source, $properties, &$collections)
 	{
-		$hash = $this->getObjectHash($source, $properties);
-		$prop = $this->getContext()->getProperty();
+		$hash=$this->getObjectHash($source, $properties);
+		$prop=$this->getContext()->getProperty();
 		if(isset($collections[$hash]) && count($collections[$hash]) > 0)
 		{
 			if(count($collections[$hash]) > 1)
@@ -121,13 +121,13 @@ 
 	 */
 	public function updateAssociatedRecords()
 	{
-		$obj = $this->getContext()->getSourceRecord();
-		$fkObject = $obj->getColumnValue($this->getContext()->getProperty());
+		$obj=$this->getContext()->getSourceRecord();
+		$fkObject=$obj->getColumnValue($this->getContext()->getProperty());
 		if($fkObject!==null)
 		{
 			$fkObject->save();
-			$source = $this->getSourceRecord();
-			$fkeys = $this->findForeignKeys($source, $fkObject);
+			$source=$this->getSourceRecord();
+			$fkeys=$this->findForeignKeys($source, $fkObject);
 			foreach($fkeys as $srcKey => $fKey)
 				$source->setColumnValue($srcKey, $fkObject->getColumnValue($fKey));
 			return true;

Braces +1 added lines, -2 removed lines

@@ -112,8 +112,7 @@
 			if(count($collections[$hash]) > 1)
 				throw new TActiveRecordException('ar_belongs_to_multiple_result');
 			$source->$prop=$collections[$hash][0];
-		}
-		else
+		} else
 			$source->$prop=null;
 	}
 

framework/Data/ActiveRecord/Relations/TActiveRecordRelationContext.php

Spacing +12 added lines, -12 removed lines

@@ -48,7 +48,7 @@ 
 
 	public function getPropertyValue()
 	{
-		$obj = $this->getSourceRecord();
+		$obj=$this->getSourceRecord();
 		return $obj->getColumnValue($this->getProperty());
 	}
 
@@ -111,7 +111,7 @@ 
 	 */
 	public function getCondition()
 	{
-		return isset($this->_relation[3])?$this->_relation[3]:null;
+		return isset($this->_relation[3]) ? $this->_relation[3] : null;
 	}
 
 	/**
@@ -120,7 +120,7 @@ 
 	 */
 	public function getParameters()
 	{
-		return isset($this->_relation[4])?$this->_relation[4]:array();
+		return isset($this->_relation[4]) ? $this->_relation[4] : array();
 	}
 
 	/**
@@ -129,7 +129,7 @@ 
 	 */
 	public function hasFkField()
 	{
-		$notManyToMany = $this->getRelationType() !== TActiveRecord::MANY_TO_MANY;
+		$notManyToMany=$this->getRelationType()!==TActiveRecord::MANY_TO_MANY;
 		return $notManyToMany && isset($this->_relation[2]) && !empty($this->_relation[2]);
 	}
 
@@ -146,7 +146,7 @@ 
 	 */
 	public function hasAssociationTable()
 	{
-		$isManyToMany = $this->getRelationType() === TActiveRecord::MANY_TO_MANY;
+		$isManyToMany=$this->getRelationType()===TActiveRecord::MANY_TO_MANY;
 		return $isManyToMany && isset($this->_relation[2]) && !empty($this->_relation[2]);
 	}
 
@@ -174,7 +174,7 @@ 
 				$this->_property, get_class($this->_record), 'RELATIONS');
 		}
 		if($criteria===null)
-			$criteria = new TActiveRecordCriteria($this->getCondition(), $this->getParameters());
+			$criteria=new TActiveRecordCriteria($this->getCondition(), $this->getParameters());
 		switch($this->getRelationType())
 		{
 			case TActiveRecord::HAS_MANY:
@@ -202,15 +202,15 @@ 
 		$success=true;
 		foreach($this->_record->getRecordRelations() as $data)
 		{
-			list($property, $relation) = $data;
-			$belongsTo = $relation[0]==TActiveRecord::BELONGS_TO;
+			list($property, $relation)=$data;
+			$belongsTo=$relation[0]==TActiveRecord::BELONGS_TO;
 			if(($updateBelongsTo && $belongsTo) || (!$updateBelongsTo && !$belongsTo))
 			{
-				$obj = $this->getSourceRecord();
+				$obj=$this->getSourceRecord();
 				if(!$this->isEmptyFkObject($obj->getColumnValue($property)))
 				{
-					$context = new TActiveRecordRelationContext($this->getSourceRecord(),$property,$relation);
-					$success = $context->getRelationHandler()->updateAssociatedRecords() && $success;
+					$context=new TActiveRecordRelationContext($this->getSourceRecord(), $property, $relation);
+					$success=$context->getRelationHandler()->updateAssociatedRecords() && $success;
 				}
 			}
 		}
@@ -220,7 +220,7 @@ 
 	protected function isEmptyFkObject($obj)
 	{
 		if(is_object($obj))
-			return $obj instanceof TList ? $obj->count() === 0 : false;
+			return $obj instanceof TList ? $obj->count()===0 : false;
 		else if(is_array($obj))
 			return count($obj)===0;
 		else

Doc Comments +5 added lines, -1 removed lines

@@ -35,6 +35,9 @@ 
 	private $_relation; //data from an entry of TActiveRecord::$RELATION
 	private $_fkeys;
 
+	/**
+	 * @param TActiveRecord $record
+	 */
 	public function __construct($record, $property=null, $relation=null)
 	{
 		$this->_record=$record;
@@ -168,6 +171,7 @@ 
 	 * An instance of TActiveRecordHasOne, TActiveRecordBelongsTo, TActiveRecordHasMany,
 	 * or TActiveRecordHasManyAssocation will be returned.
 	 * @param TActiveRecordCriteria search criteria
+	 * @param \Prado\Data\DataGateway\TSqlCriteria $criteria
 	 * @return TActiveRecordRelation record relationship handler instnace.
 	 * @throws TActiveRecordException if property is not defined or missing.
 	 */
@@ -196,7 +200,7 @@ 
 	}
 
 	/**
-	 * @return TActiveRecordRelationCommand
+	 * @return boolean
 	 */
 	public function updateAssociatedRecords($updateBelongsTo=false)
 	{

framework/Data/ActiveRecord/Relations/TActiveRecordHasMany.php

Spacing +14 added lines, -14 removed lines

@@ -75,14 +75,14 @@ 
 	 */
 	protected function collectForeignObjects(&$results)
 	{
-		$fkeys = $this->getRelationForeignKeys();
+		$fkeys=$this->getRelationForeignKeys();
 
-		$properties = array_values($fkeys);
-		$fields = array_keys($fkeys);
+		$properties=array_values($fkeys);
+		$fields=array_keys($fkeys);
 
-		$indexValues = $this->getIndexValues($properties, $results);
-		$fkObjects = $this->findForeignObjects($fields,$indexValues);
-		$this->populateResult($results,$properties,$fkObjects,$fields);
+		$indexValues=$this->getIndexValues($properties, $results);
+		$fkObjects=$this->findForeignObjects($fields, $indexValues);
+		$this->populateResult($results, $properties, $fkObjects, $fields);
 	}
 
 	/**
@@ -91,7 +91,7 @@ 
 	 */
 	public function getRelationForeignKeys()
 	{
-		$fkObject = $this->getContext()->getForeignRecordFinder();
+		$fkObject=$this->getContext()->getForeignRecordFinder();
 		return $this->findForeignKeys($fkObject, $this->getSourceRecord());
 	}
 
@@ -101,18 +101,18 @@ 
 	 */
 	public function updateAssociatedRecords()
 	{
-		$obj = $this->getContext()->getSourceRecord();
-		$fkObjects = &$obj->{$this->getContext()->getProperty()};
+		$obj=$this->getContext()->getSourceRecord();
+		$fkObjects=&$obj->{$this->getContext()->getProperty()};
 		$success=true;
-		if(($total = count($fkObjects))> 0)
+		if(($total=count($fkObjects)) > 0)
 		{
-			$source = $this->getSourceRecord();
-			$fkeys = $this->findForeignKeys($fkObjects[0], $source);
-			for($i=0;$i<$total;$i++)
+			$source=$this->getSourceRecord();
+			$fkeys=$this->findForeignKeys($fkObjects[0], $source);
+			for($i=0; $i < $total; $i++)
 			{
 				foreach($fkeys as $fKey => $srcKey)
 					$fkObjects[$i]->setColumnValue($fKey, $source->getColumnValue($srcKey));
-				$success = $fkObjects[$i]->save() && $success;
+				$success=$fkObjects[$i]->save() && $success;
 			}
 		}
 		return $success;

framework/Data/ActiveRecord/Relations/TActiveRecordHasOne.php

Spacing +12 added lines, -12 removed lines

@@ -92,13 +92,13 @@ 
 	 */
 	protected function collectForeignObjects(&$results)
 	{
-		$fkeys = $this->getRelationForeignKeys();
-		$properties = array_values($fkeys);
-		$fields = array_keys($fkeys);
+		$fkeys=$this->getRelationForeignKeys();
+		$properties=array_values($fkeys);
+		$fields=array_keys($fkeys);
 
-		$indexValues = $this->getIndexValues($properties, $results);
-		$fkObjects = $this->findForeignObjects($fields,$indexValues);
-		$this->populateResult($results,$properties,$fkObjects,$fields);
+		$indexValues=$this->getIndexValues($properties, $results);
+		$fkObjects=$this->findForeignObjects($fields, $indexValues);
+		$this->populateResult($results, $properties, $fkObjects, $fields);
 	}
 
 	/**
@@ -107,7 +107,7 @@ 
 	 */
 	public function getRelationForeignKeys()
 	{
-		$fkObject = $this->getContext()->getForeignRecordFinder();
+		$fkObject=$this->getContext()->getForeignRecordFinder();
 		return $this->findForeignKeys($fkObject, $this->getSourceRecord());
 	}
 
@@ -118,8 +118,8 @@ 
 	 */
 	protected function setObjectProperty($source, $properties, &$collections)
 	{
-		$hash = $this->getObjectHash($source, $properties);
-		$prop = $this->getContext()->getProperty();
+		$hash=$this->getObjectHash($source, $properties);
+		$prop=$this->getContext()->getProperty();
 		if(isset($collections[$hash]) && count($collections[$hash]) > 0)
 		{
 			if(count($collections[$hash]) > 1)
@@ -134,9 +134,9 @@ 
 	 */
 	public function updateAssociatedRecords()
 	{
-		$fkObject = $this->getContext()->getPropertyValue();
-		$source = $this->getSourceRecord();
-		$fkeys = $this->findForeignKeys($fkObject, $source);
+		$fkObject=$this->getContext()->getPropertyValue();
+		$source=$this->getSourceRecord();
+		$fkeys=$this->findForeignKeys($fkObject, $source);
 		foreach($fkeys as $fKey => $srcKey)
 			$fkObject->setColumnValue($fKey, $source->getColumnValue($srcKey));
 		return $fkObject->save();

framework/Data/ActiveRecord/Scaffold/TScaffoldBase.php

Spacing +10 added lines, -10 removed lines

@@ -40,8 +40,8 @@ 
 	 */
 	protected function getTableInfo()
 	{
-		$finder = $this->getRecordFinder();
-		$gateway = $finder->getRecordManager()->getRecordGateWay();
+		$finder=$this->getRecordFinder();
+		$gateway=$finder->getRecordManager()->getRecordGateWay();
 		return $gateway->getRecordTableInfo($finder);
 	}
 
@@ -51,9 +51,9 @@ 
 	 */
 	protected function getRecordPropertyValues($record)
 	{
-		$data = array();
+		$data=array();
 		foreach($this->getTableInfo()->getColumns() as $name=>$column)
-			$data[] = $record->getColumnValue($name);
+			$data[]=$record->getColumnValue($name);
 		return $data;
 	}
 
@@ -67,7 +67,7 @@ 
 		foreach($this->getTableInfo()->getColumns() as $name=>$column)
 		{
 			if($column->getIsPrimaryKey())
-				$data[] = $record->getColumnValue($name);
+				$data[]=$record->getColumnValue($name);
 		}
 		return $data;
 	}
@@ -96,7 +96,7 @@ 
 	 */
 	protected function copyFrom(TScaffoldBase $obj)
 	{
-		$this->_record = $obj->_record;
+		$this->_record=$obj->_record;
 		$this->setRecordClass($obj->getRecordClass());
 		$this->setEnableDefaultStyle($obj->getEnableDefaultStyle());
 	}
@@ -128,13 +128,13 @@ 
 			}
 			else
 			{
-				$class = $this->getRecordClass();
+				$class=$this->getRecordClass();
 				if($class!==null)
 					$this->_record=Prado::createComponent($class);
 				else
 				{
 					throw new TConfigurationException('scaffold_invalid_record_class',
-						$this->getRecordClass(),$this->getID());
+						$this->getRecordClass(), $this->getID());
 				}
 			}
 		}
@@ -197,8 +197,8 @@ 
 		parent::onPreRender($param);
 		if($this->getEnableDefaultStyle())
 		{
-			$url = $this->publishAsset($this->getDefaultStyle().'.css');
-			$this->getPage()->getClientScript()->registerStyleSheetFile($url,$url);
+			$url=$this->publishAsset($this->getDefaultStyle().'.css');
+			$this->getPage()->getClientScript()->registerStyleSheetFile($url, $url);
 		}
 	}
 }

Doc Comments +2 added lines

@@ -91,6 +91,7 @@ 
 	/**
 	 * Name of the Active Record class to be viewed or scaffolded.
 	 * @param string Active Record class name.
+	 * @param string $value
 	 */
 	public function setRecordClass($value)
 	{
@@ -190,6 +191,7 @@ 
 
 	/**
 	 * @param boolean enable default stylesheet, default is true.
+	 * @param boolean $value
 	 */
 	public function setEnableDefaultStyle($value)
 	{

Indentation +2 added lines, -2 removed lines

@@ -6,7 +6,7 @@ 
  * @link https://github.com/pradosoft/prado
  * @copyright Copyright © 2005-2016 The PRADO Group
  * @license https://github.com/pradosoft/prado/blob/master/LICENSE
-  * @package Prado\Data\ActiveRecord\Scaffold
+ * @package Prado\Data\ActiveRecord\Scaffold
  */
 
 namespace Prado\Data\ActiveRecord\Scaffold;
@@ -32,7 +32,7 @@ 
  * file explicitly.
  *
  * @author Wei Zhuo <weizho[at]gmail[dot]com>
-  * @package Prado\Data\ActiveRecord\Scaffold
+ * @package Prado\Data\ActiveRecord\Scaffold
  * @since 3.1
  */
 abstract class TScaffoldBase extends TTemplateControl

Braces +1 added lines, -2 removed lines

@@ -132,8 +132,7 @@
 				if($this->_record===null)
 					throw new TConfigurationException('scaffold_invalid_record_pk',
 						$this->getRecordClass(), $pk);
-			}
-			else
+			} else
 			{
 				$class = $this->getRecordClass();
 				if($class!==null)

framework/Data/ActiveRecord/Scaffold/TScaffoldListView.php

Spacing +27 added lines, -27 removed lines

@@ -53,15 +53,15 @@ 
 	 */
 	protected function initializeSort()
 	{
-		$table = $this->getTableInfo();
-		$sorts = array('Sort By', str_repeat('-',15));
-		$headers = array();
+		$table=$this->getTableInfo();
+		$sorts=array('Sort By', str_repeat('-', 15));
+		$headers=array();
 		foreach($table->getColumns() as $name=>$colum)
 		{
-			$fname = ucwords(str_replace('_', ' ', $name));
-			$sorts[$name.' ASC'] = $fname .' Ascending';
-			$sorts[$name.' DESC'] = $fname .' Descending';
-			$headers[] = $fname ;
+			$fname=ucwords(str_replace('_', ' ', $name));
+			$sorts[$name.' ASC']=$fname.' Ascending';
+			$sorts[$name.' DESC']=$fname.' Descending';
+			$headers[]=$fname;
 		}
 		$this->_sort->setDataSource($sorts);
 		$this->_sort->dataBind();
@@ -88,10 +88,10 @@ 
 	 */
 	protected function loadRecordData()
 	{
-		$search = new TActiveRecordCriteria($this->getSearchCondition(), $this->getSearchParameters());
+		$search=new TActiveRecordCriteria($this->getSearchCondition(), $this->getSearchParameters());
 		$this->_list->setVirtualItemCount($this->getRecordFinder()->count($search));
-		$finder = $this->getRecordFinder();
-		$criteria = $this->getRecordCriteria();
+		$finder=$this->getRecordFinder();
+		$criteria=$this->getRecordCriteria();
 		$this->_list->setDataSource($finder->findAll($criteria));
 		$this->_list->dataBind();
 	}
@@ -101,21 +101,21 @@ 
 	 */
 	protected function getRecordCriteria()
 	{
-		$total = $this->_list->getVirtualItemCount();
-		$limit = $this->_list->getPageSize();
-		$offset = $this->_list->getCurrentPageIndex()*$limit;
+		$total=$this->_list->getVirtualItemCount();
+		$limit=$this->_list->getPageSize();
+		$offset=$this->_list->getCurrentPageIndex() * $limit;
 		if($offset + $limit > $total)
-			$limit = $total - $offset;
-		$criteria = new TActiveRecordCriteria($this->getSearchCondition(), $this->getSearchParameters());
+			$limit=$total - $offset;
+		$criteria=new TActiveRecordCriteria($this->getSearchCondition(), $this->getSearchParameters());
 		if($limit > 0)
 		{
 			$criteria->setLimit($limit);
 			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];
+		$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());
 	}
 
 	/**
@@ -176,7 +176,7 @@ 
 		{
 			if($param instanceof TRepeaterCommandEventParameter)
 			{
-				$pk = $param->getItem()->getCustomData();
+				$pk=$param->getItem()->getCustomData();
 				$ctrl->setRecordPk($pk);
 				$ctrl->initializeEditForm();
 			}
@@ -190,7 +190,7 @@ 
 	{
 		if($param instanceof TRepeaterCommandEventParameter)
 		{
-			$pk = $param->getItem()->getCustomData();
+			$pk=$param->getItem()->getCustomData();
 			$this->getRecordFinder()->deleteByPk($pk);
 		}
 	}
@@ -200,10 +200,10 @@ 
 	 */
 	protected function listItemCreated($sender, $param)
 	{
-		$item = $param->getItem();
+		$item=$param->getItem();
 		if($item instanceof IItemDataRenderer)
 		{
-			$type = $item->getItemType();
+			$type=$item->getItemType();
 			if($type==TListItemType::Item || $type==TListItemType::AlternatingItem)
 				$this->populateField($sender, $param);
 		}
@@ -215,11 +215,11 @@ 
 	 */
 	protected function populateField($sender, $param)
 	{
-		$item = $param->getItem();
-		if(($data = $item->getData()) !== null)
+		$item=$param->getItem();
+		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();
@@ -294,7 +294,7 @@ 
 	{
 		if(($id=$this->getEditViewID())!==null)
 		{
-			$ctrl = $this->getParent()->findControl($id);
+			$ctrl=$this->getParent()->findControl($id);
 			if($ctrl===null)
 				throw new TConfigurationException('scaffold_unable_to_find_edit_view', $id);
 			return $ctrl;

Indentation +1 added lines, -1 removed lines

@@ -52,7 +52,7 @@
  * Parameters property of TActiveRecordCriteria.
  *
  * @author Wei Zhuo <weizho[at]gmail[dot]com>
-  * @package Prado\Data\ActiveRecord\Scaffold
+ * @package Prado\Data\ActiveRecord\Scaffold
  * @since 3.1
  */
 class TScaffoldListView extends TScaffoldBase

Doc Comments +1 added lines

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

framework/Data/ActiveRecord/Scaffold/TScaffoldView.php

Spacing +1 added lines, -1 removed lines

@@ -90,7 +90,7 @@
 	 * Handle the "edit" and "new" commands by displaying the edit view.
 	 * Default command shows the list view.
 	 */
-	public function bubbleEvent($sender,$param)
+	public function bubbleEvent($sender, $param)
 	{
 		switch(strtolower($param->getCommandName()))
 		{

Indentation +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
  * the Active Record class to be displayed/edited/added.
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
-  * @package Prado\Data\ActiveRecord\Scaffold
+ * @package Prado\Data\ActiveRecord\Scaffold
  * @since 3.0
  */
 class TScaffoldView extends TScaffoldBase

framework/Data/ActiveRecord/Scaffold/InputBuilder/TIbmScaffoldInput.php

Spacing +2 added lines, -2 removed lines

@@ -29,7 +29,7 @@ 
 			case 'char': case 'varchar':
 				return $this->createMultiLineControl($container, $column, $record);
 			default:
-				return $this->createDefaultControl($container,$column, $record);
+				return $this->createDefaultControl($container, $column, $record);
 		}
 	}
 
@@ -44,7 +44,7 @@ 
 			case 'timestamp':
 				return $this->getDateTimeValue($container, $column, $record);
 			default:
-				return $this->getDefaultControlValue($container,$column, $record);
+				return $this->getDefaultControlValue($container, $column, $record);
 		}
 	}
 }