pradosoft / prado

framework/Util/TBehavior.php

Indentation +7 added lines, -7 removed lines

@@ -1,12 +1,12 @@
 <?php
 /**
- * TBehavior class file.
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @link http://www.yiiframework.com/
- * @copyright Copyright &copy; 2008-2009 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
+	 * TBehavior class file.
+	 *
+	 * @author Qiang Xue <qiang.xue@gmail.com>
+	 * @link http://www.yiiframework.com/
+	 * @copyright Copyright &copy; 2008-2009 Yii Software LLC
+	 * @license http://www.yiiframework.com/license/
+	 */
 
 /**
  * TBehavior is a convenient base class for behavior classes.

Spacing +2 added lines, -2 removed lines

@@ -43,7 +43,7 @@ 
 	{
 		$this->_owner=$owner;
 		foreach($this->events() as $event=>$handler)
-			$owner->attachEventHandler($event,array($this,$handler));
+			$owner->attachEventHandler($event, array($this, $handler));
 	}
 
 	/**
@@ -56,7 +56,7 @@ 
 	public function detach($owner)
 	{
 		foreach($this->events() as $event=>$handler)
-			$owner->detachEventHandler($event,array($this,$handler));
+			$owner->detachEventHandler($event, array($this, $handler));
 		$this->_owner=null;
 	}
 

framework/Data/ActiveRecord/TActiveRecord.php

Indentation +28 added lines, -28 removed lines

@@ -1,13 +1,13 @@ 
 <?php
 /**
- * TActiveRecord, TActiveRecordEventParameter, TActiveRecordInvalidFinderResult 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
- */
+	 * TActiveRecord, TActiveRecordEventParameter, TActiveRecordInvalidFinderResult 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
+	 */
 
 /**
  * Load record manager, criteria and relations.
@@ -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());
+		}
 }
 
 /**

Doc Comments +9 added lines, -1 removed lines

@@ -505,6 +505,7 @@ 
 	 * Delete multiple records using a criteria.
 	 * @param string|TActiveRecordCriteria SQL condition or criteria object.
 	 * @param mixed parameter values.
+	 * @param TActiveRecordCriteria $criteria
 	 * @return int number of records deleted.
 	 */
 	public function deleteAll($criteria=null, $parameters=array())
@@ -571,6 +572,7 @@ 
 	 *
 	 * @param string|TActiveRecordCriteria SQL condition or criteria object.
 	 * @param mixed parameter values.
+	 * @param TActiveRecordCriteria $criteria
 	 * @return TActiveRecord matching record object. Null if no result is found.
 	 */
 	public function find($criteria,$parameters=array())
@@ -587,6 +589,7 @@ 
 	 *
 	 * @param string|TActiveRecordCriteria SQL condition or criteria object.
 	 * @param mixed parameter values.
+	 * @param TActiveRecordCriteria $criteria
 	 * @return array matching record objects. Empty array if no result is found.
 	 */
 	public function findAll($criteria=null,$parameters=array())
@@ -700,6 +703,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())
@@ -715,6 +719,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 +944,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 +955,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 +966,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 +1050,7 @@ 
     
     	/**
      	* Return record data as JSON
-     	* @return JSON
+     	* @return string
      	* @since 3.2.4
      	*/
     	public function toJSON(){

Spacing +86 added lines, -86 removed lines

@@ -194,14 +194,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"));
 	}
 
 	/**
@@ -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;
 		else
-			parent::__set($name,$value);
+			parent::__set($name, $value);
 	}
 
 	/**
@@ -288,7 +288,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;
 		}
 	}
@@ -304,7 +304,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);
 	}
 
 
@@ -355,16 +355,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;
 		}
@@ -382,10 +382,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];
@@ -415,14 +415,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;
 			}
 		}
@@ -447,8 +447,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))
 			{
@@ -488,8 +488,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);
 	}
 
 	/**
@@ -498,7 +498,7 @@ 
 	public function deleteAllByPks($keys)
 	{
 		if(func_num_args() > 1)
-			$keys = func_get_args();
+			$keys=func_get_args();
 		return $this->deleteByPk($keys);
 	}
 	/**
@@ -509,8 +509,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);
 	}
 
@@ -534,7 +534,7 @@ 
 	{
 		$result=array();
 		foreach($reader as $data)
-			$result[] = $this->populateObject($data);
+			$result[]=$this->populateObject($data);
 		return $result;
 	}
 
@@ -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;
+		$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);
 	}
 
@@ -612,11 +612,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);
 	}
 
@@ -640,8 +640,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);
 	}
 
@@ -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;
+		$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);
 	}
 
 	/**
@@ -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
@@ -741,8 +741,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;
@@ -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,31 +820,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
@@ -858,7 +858,7 @@ 
 	 */
 	public function getInvalidFinderResult()
 	{
-		if($this->_invalidFinderResult !== null)
+		if($this->_invalidFinderResult!==null)
 			return $this->_invalidFinderResult;
 
 		return self::getRecordManager()->getInvalidFinderResult();
@@ -873,10 +873,10 @@ 
 	 */
 	public function setInvalidFinderResult($value)
 	{
-		if($value === null)
-			$this->_invalidFinderResult = null;
+		if($value===null)
+			$this->_invalidFinderResult=null;
 		else
-			$this->_invalidFinderResult = TPropertyValue::ensureEnum($value, 'TActiveRecordInvalidFinderResult');
+			$this->_invalidFinderResult=TPropertyValue::ensureEnum($value, 'TActiveRecordInvalidFinderResult');
 	}
 
 	/**
@@ -892,8 +892,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;
@@ -987,7 +987,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]))
@@ -1004,7 +1004,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;
 	}
 
 	/**
@@ -1031,9 +1031,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);
            	}
         
@@ -1045,7 +1045,7 @@ 
      	* @return JSON
      	* @since 3.2.4
      	*/
-    	public function toJSON(){
+    	public function toJSON() {
         	return json_encode($this->toArray());
     	}
 }
@@ -1080,7 +1080,7 @@ 
 	 */
 	public function setIsValid($value)
 	{
-		$this->_isValid = TPropertyValue::ensureBoolean($value);
+		$this->_isValid=TPropertyValue::ensureBoolean($value);
 	}
 }
 
@@ -1102,6 +1102,6 @@ 
  */
 class TActiveRecordInvalidFinderResult extends TEnumerable
 {
-	const Null = 'Null';
-	const Exception = 'Exception';
+	const Null='Null';
+	const Exception='Exception';
 }

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();

framework/Data/Common/Sqlite/TSqliteCommandBuilder.php

Indentation +8 added lines, -8 removed lines

@@ -1,13 +1,13 @@
 <?php
 /**
- * TSqliteCommandBuilder 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.Common
- */
+	 * TSqliteCommandBuilder 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.Common
+	 */
 
 Prado::using('System.Data.Common.TDbCommandBuilder');
 

Braces +1 added lines, -2 removed lines

@@ -58,8 +58,7 @@
 		if ($this->sourcepath === NULL)
 		{
 			$this->sourcepath = $sourcepath;
-		}
-		else
+		} else
 		{
 			$this->sourcepath->append($sourcepath);
 		}

Spacing +4 added lines, -4 removed lines

@@ -30,12 +30,12 @@
 	 */
 	public function applyLimitOffset($sql, $limit=-1, $offset=-1)
 	{
-		$limit = $limit!==null ? intval($limit) : -1;
-		$offset = $offset!==null ? intval($offset) : -1;
+		$limit=$limit!==null ? intval($limit) : -1;
+		$offset=$offset!==null ? intval($offset) : -1;
 		if($limit > 0 || $offset > 0)
 		{
-			$limitStr = ' LIMIT '.$limit;
-			$offsetStr = $offset >= 0 ? ' OFFSET '.$offset : '';
+			$limitStr=' LIMIT '.$limit;
+			$offsetStr=$offset >= 0 ? ' OFFSET '.$offset : '';
 			return $sql.$limitStr.$offsetStr;
 		}
 		else

framework/Util/TSimpleDateFormatter.php

Indentation +8 added lines, -8 removed lines

@@ -1,13 +1,13 @@
 <?php
 /**
- * TSimpleDateFormatter 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.Util
- */
+	 * TSimpleDateFormatter 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.Util
+	 */
 
 /**
  * TSimpleDateFormatter class.

Doc Comments +9 added lines

@@ -93,6 +93,7 @@ 
 
 	/**
 	 * @param string formatting charset.
+	 * @param string $charset
 	 */
 	public function setCharset($charset)
 	{
@@ -313,6 +314,7 @@ 
 
 	/**
 	 * Calculate the length of a string, may be consider iconv_strlen?
+	 * @param string $string
 	 */
 	private function length($string)
 	{
@@ -338,6 +340,9 @@ 
 
 	/**
 	 * Returns true if char at position equals a particular char.
+	 * @param string $string
+	 * @param integer $pos
+	 * @param string $char
 	 */
 	private function charEqual($string, $pos, $char)
 	{
@@ -350,6 +355,10 @@ 
 	 * @param int starting position
 	 * @param int minimum integer length
 	 * @param int maximum integer length
+	 * @param string $str
+	 * @param integer $i
+	 * @param integer|null $minlength
+	 * @param integer|null $maxlength
 	 * @return string integer portion of the string, null otherwise
 	 */
 	private function getInteger($str,$i,$minlength,$maxlength)

Braces +4 added lines, -8 removed lines

@@ -225,8 +225,7 @@ 
 			$year = "{$date['year']}";
 			$month = $date['mon'];
 			$day = $date['mday'];
-		}
-		else
+		} else
 		{
 			$year = null;
 			$month = null;
@@ -262,8 +261,7 @@ 
 						$year = $iYear + 2000;
 				}
 				$year = (int)$year;
-			}
-			elseif($token=='MM' || $token=='M')
+			} elseif($token=='MM' || $token=='M')
 			{
 				$month=$this->getInteger($value,$i_val,
 									$this->length($token),2);
@@ -273,8 +271,7 @@ 
 					//throw new TInvalidDataValueException('Invalid month', $value);
 				$i_val += strlen($month);
 				$month = $iMonth;
-			}
-			elseif ($token=='dd' || $token=='d')
+			} elseif ($token=='dd' || $token=='d')
 			{
 				$day = $this->getInteger($value,$i_val,
 									$this->length($token), 2);
@@ -284,8 +281,7 @@ 
 					//throw new TInvalidDataValueException('Invalid day', $value);
 				$i_val += strlen($day);
 				$day = $iDay;
-			}
-			else
+			} else
 			{
 				if($this->substring($value, $i_val, $this->length($token)) != $token)
 					return null;

Spacing +76 added lines, -76 removed lines

@@ -54,7 +54,7 @@ 
 	 * Charset, default is 'UTF-8'
 	 * @var string
 	 */
-	private $charset = 'UTF-8';
+	private $charset='UTF-8';
 
 	/**
 	 * Constructor, create a new date time formatter.
@@ -80,7 +80,7 @@ 
 	 */
 	public function setPattern($pattern)
 	{
-		$this->pattern = $pattern;
+		$this->pattern=$pattern;
 	}
 
 	/**
@@ -96,7 +96,7 @@ 
 	 */
 	public function setCharset($charset)
 	{
-		$this->charset = $charset;
+		$this->charset=$charset;
 	}
 
 	/**
@@ -106,17 +106,17 @@ 
 	 */
 	public function format($value)
 	{
-		$date = $this->getDate($value);
-		$bits['yyyy'] = $date['year'];
-		$bits['yy'] = substr("{$date['year']}", -2);
+		$date=$this->getDate($value);
+		$bits['yyyy']=$date['year'];
+		$bits['yy']=substr("{$date['year']}", -2);
 
-		$bits['MM'] = str_pad("{$date['mon']}", 2, '0', STR_PAD_LEFT);
-		$bits['M'] = $date['mon'];
+		$bits['MM']=str_pad("{$date['mon']}", 2, '0', STR_PAD_LEFT);
+		$bits['M']=$date['mon'];
 
-		$bits['dd'] = str_pad("{$date['mday']}", 2, '0', STR_PAD_LEFT);
-		$bits['d'] = $date['mday'];
+		$bits['dd']=str_pad("{$date['mday']}", 2, '0', STR_PAD_LEFT);
+		$bits['d']=$date['mday'];
 
-		$pattern = preg_replace('/M{3,4}/', 'MM', $this->pattern);
+		$pattern=preg_replace('/M{3,4}/', 'MM', $this->pattern);
 		return str_replace(array_keys($bits), $bits, $pattern);
 	}
 
@@ -153,13 +153,13 @@ 
 
 	public function getDayMonthYearOrdering()
 	{
-		$ordering = array();
-		if(is_int($day= strpos($this->pattern, 'd')))
-			$ordering['day'] = $day;
-		if(is_int($month= strpos($this->pattern, 'M')))
-			$ordering['month'] = $month;
-		if(is_int($year= strpos($this->pattern, 'yy')))
-			$ordering['year'] = $year;
+		$ordering=array();
+		if(is_int($day=strpos($this->pattern, 'd')))
+			$ordering['day']=$day;
+		if(is_int($month=strpos($this->pattern, 'M')))
+			$ordering['month']=$month;
+		if(is_int($year=strpos($this->pattern, 'yy')))
+			$ordering['year']=$year;
 		asort($ordering);
 		return array_keys($ordering);
 	}
@@ -171,7 +171,7 @@ 
 	 */
 	private function getDate($value)
 	{
-		$s = Prado::createComponent('System.Util.TDateTimeStamp');
+		$s=Prado::createComponent('System.Util.TDateTimeStamp');
 		if(is_numeric($value))
 			return $s->getDate($value);
 		else
@@ -183,10 +183,10 @@ 
 	 */
 	public function isValidDate($value)
 	{
-		if($value === null) {
+		if($value===null) {
 			return false;
 		} else {
-			return $this->parse($value, false) !== null;
+			return $this->parse($value, false)!==null;
 		}
 	}
 
@@ -196,7 +196,7 @@ 
 	 * @return int date time stamp
 	 * @throws TInvalidDataValueException if date string is malformed.
 	 */
-	public function parse($value,$defaultToCurrentTime=true)
+	public function parse($value, $defaultToCurrentTime=true)
 	{
 		if(is_int($value) || is_float($value))
 			return $value;
@@ -205,108 +205,108 @@ 
 
 		if(empty($this->pattern)) return time();
 
-		$date = time();
+		$date=time();
 
 		if($this->length(trim($value)) < 1)
 			return $defaultToCurrentTime ? $date : null;
 
-		$pattern = $this->pattern;
+		$pattern=$this->pattern;
 
-		$i_val = 0;
-		$i_format = 0;
-		$pattern_length = $this->length($pattern);
-		$c = '';
+		$i_val=0;
+		$i_format=0;
+		$pattern_length=$this->length($pattern);
+		$c='';
 		$token='';
 		$x=null; $y=null;
 
 
 		if($defaultToCurrentTime)
 		{
-			$year = "{$date['year']}";
-			$month = $date['mon'];
-			$day = $date['mday'];
+			$year="{$date['year']}";
+			$month=$date['mon'];
+			$day=$date['mday'];
 		}
 		else
 		{
-			$year = null;
-			$month = null;
-			$day = null;
+			$year=null;
+			$month=null;
+			$day=null;
 		}
 
-		while ($i_format < $pattern_length)
+		while($i_format < $pattern_length)
 		{
-			$c = $this->charAt($pattern,$i_format);
+			$c=$this->charAt($pattern, $i_format);
 			$token='';
-			while ($this->charEqual($pattern, $i_format, $c)
+			while($this->charEqual($pattern, $i_format, $c)
 						&& ($i_format < $pattern_length))
 			{
-				$token .= $this->charAt($pattern, $i_format++);
+				$token.=$this->charAt($pattern, $i_format++);
 			}
 
-			if ($token=='yyyy' || $token=='yy' || $token=='y')
+			if($token=='yyyy' || $token=='yy' || $token=='y')
 			{
-				if ($token=='yyyy') { $x=4;$y=4; }
-				if ($token=='yy')   { $x=2;$y=2; }
-				if ($token=='y')    { $x=2;$y=4; }
-				$year = $this->getInteger($value,$i_val,$x,$y);
-				if($year === null)
+				if($token=='yyyy') { $x=4; $y=4; }
+				if($token=='yy') { $x=2; $y=2; }
+				if($token=='y') { $x=2; $y=4; }
+				$year=$this->getInteger($value, $i_val, $x, $y);
+				if($year===null)
 					return null;
 					//throw new TInvalidDataValueException('Invalid year', $value);
-				$i_val += strlen($year);
-				if(strlen($year) == 2)
+				$i_val+=strlen($year);
+				if(strlen($year)==2)
 				{
-					$iYear = (int)$year;
+					$iYear=(int) $year;
 					if($iYear > 70)
-						$year = $iYear + 1900;
+						$year=$iYear + 1900;
 					else
-						$year = $iYear + 2000;
+						$year=$iYear + 2000;
 				}
-				$year = (int)$year;
+				$year=(int) $year;
 			}
 			elseif($token=='MM' || $token=='M')
 			{
-				$month=$this->getInteger($value,$i_val,
-									$this->length($token),2);
-				$iMonth = (int)$month;
-				if($month === null || $iMonth < 1 || $iMonth > 12 )
+				$month=$this->getInteger($value, $i_val,
+									$this->length($token), 2);
+				$iMonth=(int) $month;
+				if($month===null || $iMonth < 1 || $iMonth > 12)
 					return null;
 					//throw new TInvalidDataValueException('Invalid month', $value);
-				$i_val += strlen($month);
-				$month = $iMonth;
+				$i_val+=strlen($month);
+				$month=$iMonth;
 			}
-			elseif ($token=='dd' || $token=='d')
+			elseif($token=='dd' || $token=='d')
 			{
-				$day = $this->getInteger($value,$i_val,
+				$day=$this->getInteger($value, $i_val,
 									$this->length($token), 2);
-				$iDay = (int)$day;
-				if($day === null || $iDay < 1 || $iDay >31)
+				$iDay=(int) $day;
+				if($day===null || $iDay < 1 || $iDay > 31)
 					return null;
 					//throw new TInvalidDataValueException('Invalid day', $value);
-				$i_val += strlen($day);
-				$day = $iDay;
+				$i_val+=strlen($day);
+				$day=$iDay;
 			}
 			else
 			{
-				if($this->substring($value, $i_val, $this->length($token)) != $token)
+				if($this->substring($value, $i_val, $this->length($token))!=$token)
 					return null;
 					//throw new TInvalidDataValueException("Subpattern '{$this->pattern}' mismatch", $value);
 				else
-					$i_val += $this->length($token);
+					$i_val+=$this->length($token);
 			}
 		}
-		if ($i_val != $this->length($value))
+		if($i_val!=$this->length($value))
 			return null;
 			//throw new TInvalidDataValueException("Pattern '{$this->pattern}' mismatch", $value);
-		if(!$defaultToCurrentTime && ($month === null || $day === null || $year === null))
+		if(!$defaultToCurrentTime && ($month===null || $day===null || $year===null))
 			return null;
 		else
 		{
 			if(empty($year)) {
-				$year = date('Y');
+				$year=date('Y');
 			}
-			$day = (int)$day <= 0 ? 1 : (int)$day;
-			$month = (int)$month <= 0 ? 1 : (int)$month;
-			$s = Prado::createComponent('System.Util.TDateTimeStamp');
+			$day=(int) $day <= 0 ? 1 : (int) $day;
+			$month=(int) $month <= 0 ? 1 : (int) $month;
+			$s=Prado::createComponent('System.Util.TDateTimeStamp');
 			return $s->getTimeStamp(0, 0, 0, $month, $day, $year);
 		}
 	}
@@ -341,7 +341,7 @@ 
 	 */
 	private function charEqual($string, $pos, $char)
 	{
-		return $this->charAt($string, $pos) == $char;
+		return $this->charAt($string, $pos)==$char;
 	}
 
 	/**
@@ -352,15 +352,15 @@ 
 	 * @param int maximum integer length
 	 * @return string integer portion of the string, null otherwise
 	 */
-	private function getInteger($str,$i,$minlength,$maxlength)
+	private function getInteger($str, $i, $minlength, $maxlength)
 	{
 		//match for digits backwards
-		for ($x = $maxlength; $x >= $minlength; $x--)
+		for($x=$maxlength; $x >= $minlength; $x--)
 		{
-			$token= $this->substring($str, $i,$x);
-			if ($this->length($token) < $minlength)
+			$token=$this->substring($str, $i, $x);
+			if($this->length($token) < $minlength)
 				return null;
-			if (preg_match('/^\d+$/', $token))
+			if(preg_match('/^\d+$/', $token))
 				return $token;
 		}
 		return null;

framework/Web/UI/JuiControls/TJuiDatePicker.php

Indentation +10 added lines, -10 removed lines

@@ -1,13 +1,13 @@ 
 <?php
 /**
- * TJuiDatePicker class file.
- *
- * @author LANDWEHR Computer und Software GmbH <programmierung@landwehr-software.de>
- * @link http://www.landwehr-software.de/
- * @copyright Copyright &copy; 2015 LANDWEHR Computer und Software GmbH
- * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
- * @package System.Web.UI.ActiveControls
- */
+	 * TJuiDatePicker class file.
+	 *
+	 * @author LANDWEHR Computer und Software GmbH <programmierung@landwehr-software.de>
+	 * @link http://www.landwehr-software.de/
+	 * @copyright Copyright &copy; 2015 LANDWEHR Computer und Software GmbH
+	 * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
+	 * @package System.Web.UI.ActiveControls
+	 */
 
 /**
  * Load active text box.
@@ -90,10 +90,10 @@ 
 	{
 		return array('altField', 'altFormat', 'appendText', 'autoSize', 'buttonImage', 'buttonImageOnly', 'buttonText', 'calculateWeek',
 								 'changeMonth', 'changeYear', 'closeText', 'constrainInput', 'currentText', 'dateFormat', 'dayNames', 'dayNamesMin',
-				         'dayNamesShort', 'defaultDate', 'duration', 'firstDay', 'gotoCurrent', 'hideIfNoPrevNext', 'isRTL', 'maxDate',
+						 'dayNamesShort', 'defaultDate', 'duration', 'firstDay', 'gotoCurrent', 'hideIfNoPrevNext', 'isRTL', 'maxDate',
 								 'minDate', 'monthNames', 'monthNamesShort', 'navigationAsDateFormat', 'nextText', 'numberOfMonths', 'prevText',
 								 'selectOtherMonths', 'shortYearCutoff', 'showAnim', 'showButtonPanel', 'showCurrentAtPos', 'showMonthAfterYear',
-				         'showOn', 'showOptions', 'showOtherMonths', 'showWeek', 'stepMonths', 'weekHeader', 'yearRange', 'yearSuffix',
+						 'showOn', 'showOptions', 'showOtherMonths', 'showWeek', 'stepMonths', 'weekHeader', 'yearRange', 'yearSuffix',
 								 'beforeShow', 'beforeShowDay', 'onChangeMonthYear', 'onClose', 'onSelect');
 	}
 

Spacing +14 added lines, -14 removed lines

@@ -39,7 +39,7 @@ 
 	 * it will register an additional clientscript to set the language specific global default settings.
 	 * @var boolean true, if this is the first instance of TJuiDatePicker, false otherwise
 	 */
-	private static $_first = true;
+	private static $_first=true;
 
 	/**
 	 * Creates a new callback control, sets the adapter to
@@ -74,7 +74,7 @@ 
 	 */
 	public function getOptions()
 	{
-		if (($options=$this->getViewState('JuiOptions'))===null)
+		if(($options=$this->getViewState('JuiOptions'))===null)
 		{
 		  $options=new TJuiControlOptions($this);
 		  $this->setViewState('JuiOptions', $options);
@@ -168,8 +168,8 @@ 
 	 */
 	protected function getCurrentCulture()
 	{
-		$app = $this->getApplication()->getGlobalization(false);
-		return $this->getCulture() == '' ?
+		$app=$this->getApplication()->getGlobalization(false);
+		return $this->getCulture()=='' ?
 				($app ? $app->getCulture() : 'en') : $this->getCulture();
 	}
 
@@ -178,7 +178,7 @@ 
 	 */
 	public function getDateFormat()
 	{
-		return $this->getViewState('DateFormat','dd-MM-yyyy');
+		return $this->getViewState('DateFormat', 'dd-MM-yyyy');
 	}
 
 	/**
@@ -187,7 +187,7 @@ 
 	 */
 	public function setDateFormat($value)
 	{
-		$this->setViewState('DateFormat',$value,'dd-MM-yyyy');
+		$this->setViewState('DateFormat', $value, 'dd-MM-yyyy');
 	}
 
 	/**
@@ -253,8 +253,8 @@ 
 			$this->setText('');
 		else
 		{
-			$date = TPropertyValue::ensureFloat($value);
-			$formatter = Prado::createComponent('System.Util.TSimpleDateFormatter',$this->getDateFormat());
+			$date=TPropertyValue::ensureFloat($value);
+			$formatter=Prado::createComponent('System.Util.TSimpleDateFormatter', $this->getDateFormat());
 			$this->setText($formatter->format($date));
 		}
 	}
@@ -265,9 +265,9 @@ 
 	 */
 	protected function getTimeStampFromText()
 	{
-		$pattern = $this->getDateFormat();
-		$pattern = str_replace(array('MMMM', 'MMM'), array('MM','MM'), $pattern);
-		$formatter = Prado::createComponent('System.Util.TSimpleDateFormatter',$pattern);
+		$pattern=$this->getDateFormat();
+		$pattern=str_replace(array('MMMM', 'MMM'), array('MM', 'MM'), $pattern);
+		$formatter=Prado::createComponent('System.Util.TSimpleDateFormatter', $pattern);
 		return $formatter->parse($this->getText());
 	}
 
@@ -278,10 +278,10 @@ 
 	 */
 	public function getValidationPropertyValue()
 	{
-		if(($text = $this->getText()) === '')
+		if(($text=$this->getText())==='')
 			return '';
-		$date = $this->getTimeStamp();
-		return $date == null ? $text : $date;
+		$date=$this->getTimeStamp();
+		return $date==null ? $text : $date;
 	}
 
 }
\ No newline at end of file

framework/Web/UI/WebControls/TDataRenderer.php

Indentation +9 added lines, -10 removed lines

@@ -1,14 +1,14 @@ 
 <?php
 /**
- * TDataRenderer class file
- *
- * @author Qiang Xue <qiang.xue@gmail.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.Web.UI.WebControls
- * @since 3.1.2
- */
+	 * TDataRenderer class file
+	 *
+	 * @author Qiang Xue <qiang.xue@gmail.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.Web.UI.WebControls
+	 * @since 3.1.2
+	 */
 
 /**
  * TDataRenderer class
@@ -19,7 +19,6 @@ 
  *
  * The following property is provided by TDataRenderer:
  * - {@link getData Data}: data associated with this renderer.
-
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @package System.Web.UI.WebControls
  * @since 3.1.2

framework/Web/UI/WebControls/TPanel.php

Indentation +1 added lines, -1 removed lines

@@ -101,7 +101,7 @@
 
 	/**
 	 * Sets the horizontal alignment of the contents within the panel.
-     * Valid values include 'NotSet', 'Justify', 'Left', 'Right', 'Center'
+	 * Valid values include 'NotSet', 'Justify', 'Left', 'Right', 'Center'
 	 * @param string the horizontal alignment
 	 */
 	public function setHorizontalAlign($value)

Spacing +4 added lines, -4 removed lines

@@ -71,7 +71,7 @@ 
 	{
 		parent::addAttributesToRender($writer);
 		if(($butt=$this->getDefaultButton())!=='')
-			$writer->addAttribute('id',$this->getClientID());
+			$writer->addAttribute('id', $this->getClientID());
 	}
 
 	/**
@@ -168,7 +168,7 @@ 
 	 */
 	public function getGroupingText()
 	{
-		return $this->getViewState('GroupingText','');
+		return $this->getViewState('GroupingText', '');
 	}
 
 	/**
@@ -176,7 +176,7 @@ 
 	 */
 	public function setGroupingText($value)
 	{
-		$this->setViewState('GroupingText',$value,'');
+		$this->setViewState('GroupingText', $value, '');
 	}
 
 	/**
@@ -230,7 +230,7 @@ 
 		if(($butt=$this->getDefaultButton())!=='')
 		{
 			if(($button=$this->findControl($butt))===null)
-				throw new TInvalidDataValueException('panel_defaultbutton_invalid',$butt);
+				throw new TInvalidDataValueException('panel_defaultbutton_invalid', $butt);
 			else
 				$this->getPage()->getClientScript()->registerDefaultButton($this, $button);
 		}

framework/Web/UI/ActiveControls/TActiveLabel.php

Indentation +2 added lines, -2 removed lines

@@ -60,8 +60,8 @@
 	 * @param THtmlWriter the writer used for the rendering purpose
 	 */
 	protected function addAttributesToRender($writer) {
-	    $writer->addAttribute('id',$this->getClientID());
-	    parent::addAttributesToRender($writer);
+		$writer->addAttribute('id',$this->getClientID());
+		parent::addAttributesToRender($writer);
 	}
 
 	/**

Spacing +1 added lines, -1 removed lines

@@ -81,7 +81,7 @@
 	 * @param THtmlWriter the writer used for the rendering purpose
 	 */
 	protected function addAttributesToRender($writer) {
-	    $writer->addAttribute('id',$this->getClientID());
+	    $writer->addAttribute('id', $this->getClientID());
 	    parent::addAttributesToRender($writer);
 	}
 }

framework/Web/UI/ActiveControls/TActiveDataList.php

Indentation +27 added lines, -27 removed lines

@@ -31,8 +31,8 @@ 
    */
   public function __construct()
   {
-    parent::__construct();
-    $this->setAdapter(new TActiveControlAdapter($this));
+	parent::__construct();
+	$this->setAdapter(new TActiveControlAdapter($this));
   }
 
   /**
@@ -40,7 +40,7 @@ 
    */
   public function getActiveControl()
   {
-    return $this->getAdapter()->getBaseActiveControl();
+	return $this->getAdapter()->getBaseActiveControl();
   }
 
   /**
@@ -52,11 +52,11 @@ 
    */
   public function setDataSource($value)
   {
-    parent::setDataSource($value);
-    if($this->getActiveControl()->canUpdateClientSide()) {
-      $this->renderPager();
-      $this->getPage()->getAdapter()->registerControlToRender($this,$this->getResponse()->createHtmlWriter());
-    }
+	parent::setDataSource($value);
+	if($this->getActiveControl()->canUpdateClientSide()) {
+	  $this->renderPager();
+	  $this->getPage()->getAdapter()->registerControlToRender($this,$this->getResponse()->createHtmlWriter());
+	}
   }
 
   /**
@@ -65,7 +65,7 @@ 
    */
   protected function getContainerID()
   {
-    return $this->ClientID.'_Container';
+	return $this->ClientID.'_Container';
   }
 
   /**
@@ -76,13 +76,13 @@ 
    */
   public function render($writer)
   {
-    if($this->getHasPreRendered()) {
-      $this->renderDataList($writer);
-      if($this->getActiveControl()->canUpdateClientSide()) $this->getPage()->getCallbackClient()->replaceContent($this->getContainerID(),$writer);
-    }
-    else {
-      $this->getPage()->getAdapter()->registerControlToRender($this,$writer);
-    }
+	if($this->getHasPreRendered()) {
+	  $this->renderDataList($writer);
+	  if($this->getActiveControl()->canUpdateClientSide()) $this->getPage()->getCallbackClient()->replaceContent($this->getContainerID(),$writer);
+	}
+	else {
+	  $this->getPage()->getAdapter()->registerControlToRender($this,$writer);
+	}
   }
 
   /**
@@ -92,14 +92,14 @@ 
    */
   private function renderPager()
   {
-    $pager=$this->getPage()->findControlsByType('TActivePager', false);
-    foreach($pager as $item)
-    {
-      if($item->ControlToPaginate==$this->ID) {
-        $writer=$this->getResponse()->createHtmlWriter();
-        $this->getPage()->getAdapter()->registerControlToRender($item,$writer);
-      }
-    }
+	$pager=$this->getPage()->findControlsByType('TActivePager', false);
+	foreach($pager as $item)
+	{
+	  if($item->ControlToPaginate==$this->ID) {
+		$writer=$this->getResponse()->createHtmlWriter();
+		$this->getPage()->getAdapter()->registerControlToRender($item,$writer);
+	  }
+	}
   }
 
   /**
@@ -109,8 +109,8 @@ 
    */
   private function renderDataList($writer)
   {
-    $writer->write('<span id="'.$this->getContainerID().'">');
-    parent::render($writer);
-    $writer->write('</span>');
+	$writer->write('<span id="'.$this->getContainerID().'">');
+	parent::render($writer);
+	$writer->write('</span>');
   }
 }

Braces +1 added lines, -2 removed lines

@@ -79,8 +79,7 @@
     if($this->getHasPreRendered()) {
       $this->renderDataList($writer);
       if($this->getActiveControl()->canUpdateClientSide()) $this->getPage()->getCallbackClient()->replaceContent($this->getContainerID(),$writer);
-    }
-    else {
+    } else {
       $this->getPage()->getAdapter()->registerControlToRender($this,$writer);
     }
   }

Spacing +4 added lines, -4 removed lines

@@ -55,7 +55,7 @@ 
     parent::setDataSource($value);
     if($this->getActiveControl()->canUpdateClientSide()) {
       $this->renderPager();
-      $this->getPage()->getAdapter()->registerControlToRender($this,$this->getResponse()->createHtmlWriter());
+      $this->getPage()->getAdapter()->registerControlToRender($this, $this->getResponse()->createHtmlWriter());
     }
   }
 
@@ -78,10 +78,10 @@ 
   {
     if($this->getHasPreRendered()) {
       $this->renderDataList($writer);
-      if($this->getActiveControl()->canUpdateClientSide()) $this->getPage()->getCallbackClient()->replaceContent($this->getContainerID(),$writer);
+      if($this->getActiveControl()->canUpdateClientSide()) $this->getPage()->getCallbackClient()->replaceContent($this->getContainerID(), $writer);
     }
     else {
-      $this->getPage()->getAdapter()->registerControlToRender($this,$writer);
+      $this->getPage()->getAdapter()->registerControlToRender($this, $writer);
     }
   }
 
@@ -97,7 +97,7 @@ 
     {
       if($item->ControlToPaginate==$this->ID) {
         $writer=$this->getResponse()->createHtmlWriter();
-        $this->getPage()->getAdapter()->registerControlToRender($item,$writer);
+        $this->getPage()->getAdapter()->registerControlToRender($item, $writer);
       }
     }
   }