pradosoft / prado

framework/Web/Javascripts/JSMin.php

Braces +2 added lines, -4 removed lines

@@ -191,8 +191,7 @@ 
             default:
               if ($this->isAlphaNum($this->b)) {
                 $this->action(1);
-              }
-              else {
+              } else {
                 $this->action(2);
               }
           }
@@ -224,8 +223,7 @@ 
                 default:
                   if ($this->isAlphaNum($this->a)) {
                     $this->action(1);
-                  }
-                  else {
+                  } else {
                     $this->action(3);
                   }
               }

Spacing +66 added lines, -66 removed lines

@@ -46,29 +46,29 @@ 
  */
 
 class JSMin {
-  const ORD_LF    = 10;
-  const ORD_SPACE = 32;
+  const ORD_LF=10;
+  const ORD_SPACE=32;
 
-  protected $a           = '';
-  protected $b           = '';
-  protected $input       = '';
-  protected $inputIndex  = 0;
-  protected $inputLength = 0;
-  protected $lookAhead   = null;
-  protected $output      = '';
+  protected $a='';
+  protected $b='';
+  protected $input='';
+  protected $inputIndex=0;
+  protected $inputLength=0;
+  protected $lookAhead=null;
+  protected $output='';
 
   // -- Public Static Methods --------------------------------------------------
 
   public static function minify($js) {
-    $jsmin = new JSMin($js);
+    $jsmin=new JSMin($js);
     return $jsmin->min();
   }
 
   // -- Public Instance Methods ------------------------------------------------
 
   public function __construct($input) {
-    $this->input       = str_replace("\r\n", "\n", $input);
-    $this->inputLength = strlen($this->input);
+    $this->input=str_replace("\r\n", "\n", $input);
+    $this->inputLength=strlen($this->input);
   }
 
   // -- Protected Instance Methods ---------------------------------------------
@@ -76,80 +76,80 @@ 
   protected function action($d) {
     switch($d) {
       case 1:
-        $this->output .= $this->a;
+        $this->output.=$this->a;
 
       case 2:
-        $this->a = $this->b;
+        $this->a=$this->b;
 
-        if ($this->a === "'" || $this->a === '"') {
-          for (;;) {
-            $this->output .= $this->a;
-            $this->a       = $this->get();
+        if($this->a==="'" || $this->a==='"') {
+          for(;;) {
+            $this->output.=$this->a;
+            $this->a=$this->get();
 
-            if ($this->a === $this->b) {
+            if($this->a===$this->b) {
               break;
             }
 
-            if (ord($this->a) <= self::ORD_LF) {
+            if(ord($this->a) <= self::ORD_LF) {
               throw new JSMinException('Unterminated string literal.');
             }
 
-            if ($this->a === '\\') {
-              $this->output .= $this->a;
-              $this->a       = $this->get();
+            if($this->a==='\\') {
+              $this->output.=$this->a;
+              $this->a=$this->get();
             }
           }
         }
 
       case 3:
-        $this->b = $this->next();
+        $this->b=$this->next();
 
-        if ($this->b === '/' && (
-            $this->a === '(' || $this->a === ',' || $this->a === '=' ||
-            $this->a === ':' || $this->a === '[' || $this->a === '!' ||
-            $this->a === '&' || $this->a === '|' || $this->a === '?')) {
+        if($this->b==='/' && (
+            $this->a==='(' || $this->a===',' || $this->a==='=' ||
+            $this->a===':' || $this->a==='[' || $this->a==='!' ||
+            $this->a==='&' || $this->a==='|' || $this->a==='?')) {
 
-          $this->output .= $this->a . $this->b;
+          $this->output.=$this->a.$this->b;
 
-          for (;;) {
-            $this->a = $this->get();
+          for(;;) {
+            $this->a=$this->get();
 
-            if ($this->a === '/') {
+            if($this->a==='/') {
               break;
-            } elseif ($this->a === '\\') {
-              $this->output .= $this->a;
-              $this->a       = $this->get();
-            } elseif (ord($this->a) <= self::ORD_LF) {
+            } elseif($this->a==='\\') {
+              $this->output.=$this->a;
+              $this->a=$this->get();
+            } elseif(ord($this->a) <= self::ORD_LF) {
               throw new JSMinException('Unterminated regular expression '.
                   'literal.');
             }
 
-            $this->output .= $this->a;
+            $this->output.=$this->a;
           }
 
-          $this->b = $this->next();
+          $this->b=$this->next();
         }
     }
   }
 
   protected function get() {
-    $c = $this->lookAhead;
-    $this->lookAhead = null;
+    $c=$this->lookAhead;
+    $this->lookAhead=null;
 
-    if ($c === null) {
-      if ($this->inputIndex < $this->inputLength) {
-        $c = $this->input[$this->inputIndex];
-        $this->inputIndex += 1;
+    if($c===null) {
+      if($this->inputIndex < $this->inputLength) {
+        $c=$this->input[$this->inputIndex];
+        $this->inputIndex+=1;
       } else {
-        $c = null;
+        $c=null;
       }
     }
 
-    if ($c === "\r") {
+    if($c==="\r") {
       return "\n";
     }
 
-    if ($c === null || $c === "\n" || ord($c) >= self::ORD_SPACE) {
+    if($c===null || $c==="\n" || ord($c) >= self::ORD_SPACE) {
       return $c;
     }
 
@@ -157,17 +157,17 @@ 
   }
 
   protected function isAlphaNum($c) {
-    return ord($c) > 126 || $c === '\\' || preg_match('/^[\w\$]$/', $c) === 1;
+    return ord($c) > 126 || $c==='\\' || preg_match('/^[\w\$]$/', $c)===1;
   }
 
   protected function min() {
-    $this->a = "\n";
+    $this->a="\n";
     $this->action(3);
 
-    while ($this->a !== null) {
-      switch ($this->a) {
+    while($this->a!==null) {
+      switch($this->a) {
         case ' ':
-          if ($this->isAlphaNum($this->b)) {
+          if($this->isAlphaNum($this->b)) {
             $this->action(1);
           } else {
             $this->action(2);
@@ -175,7 +175,7 @@ 
           break;
 
         case "\n":
-          switch ($this->b) {
+          switch($this->b) {
             case '{':
             case '[':
             case '(':
@@ -189,7 +189,7 @@ 
               break;
 
             default:
-              if ($this->isAlphaNum($this->b)) {
+              if($this->isAlphaNum($this->b)) {
                 $this->action(1);
               }
               else {
@@ -199,9 +199,9 @@ 
           break;
 
         default:
-          switch ($this->b) {
+          switch($this->b) {
             case ' ':
-              if ($this->isAlphaNum($this->a)) {
+              if($this->isAlphaNum($this->a)) {
                 $this->action(1);
                 break;
               }
@@ -210,7 +210,7 @@ 
               break;
 
             case "\n":
-              switch ($this->a) {
+              switch($this->a) {
                 case '}':
                 case ']':
                 case ')':
@@ -222,7 +222,7 @@ 
                   break;
 
                 default:
-                  if ($this->isAlphaNum($this->a)) {
+                  if($this->isAlphaNum($this->a)) {
                     $this->action(1);
                   }
                   else {
@@ -242,15 +242,15 @@ 
   }
 
   protected function next() {
-    $c = $this->get();
+    $c=$this->get();
 
-    if ($c === '/') {
+    if($c==='/') {
       switch($this->peek()) {
         case '/':
-          for (;;) {
-            $c = $this->get();
+          for(;;) {
+            $c=$this->get();
 
-            if (ord($c) <= self::ORD_LF) {
+            if(ord($c) <= self::ORD_LF) {
               return $c;
             }
           }
@@ -258,10 +258,10 @@ 
         case '*':
           $this->get();
 
-          for (;;) {
+          for(;;) {
             switch($this->get()) {
               case '*':
-                if ($this->peek() === '/') {
+                if($this->peek()==='/') {
                   $this->get();
                   return ' ';
                 }
@@ -281,7 +281,7 @@ 
   }
 
   protected function peek() {
-    $this->lookAhead = $this->get();
+    $this->lookAhead=$this->get();
     return $this->lookAhead;
   }
 }

framework/Data/SqlMap/DataMapper/TSqlMapPagedList.php

Braces +4 added lines, -8 removed lines

@@ -129,28 +129,24 @@
 			{
 				$param->setData($data);
 				$this->_nextPageList = null;
-			}
-			else
+			} else
 			{
 				$param->setData(array_slice($data, 0, $pageSize));
 				$this->_nextPageList = array_slice($data, $pageSize-1,$total);
 			}
-		}
-		else
+		} else
 		{
 			if($total <= $pageSize)
 			{
 				$this->_prevPageList = array_slice($data, 0, $total);
 				$param->setData(array());
 				$this->_nextPageList = null;
-			}
-			else if($total <= $pageSize*2)
+			} else if($total <= $pageSize*2)
 			{
 				$this->_prevPageList = array_slice($data, 0, $pageSize);
 				$param->setData(array_slice($data, $pageSize, $total));
 				$this->_nextPageList = null;
-			}
-			else
+			} else
 			{
 				$this->_prevPageList = array_slice($data, 0, $pageSize);
 				$param->setData(array_slice($data, $pageSize, $pageSize));

Spacing +24 added lines, -24 removed lines

@@ -41,11 +41,11 @@ 
 	 * @param mixed delegate for each data row retrieved.
 	 * @param int number of page to fetch on initialization
 	 */
-	public function __construct(IMappedStatement $statement,$parameter, $pageSize, $delegate=null, $page=0)
+	public function __construct(IMappedStatement $statement, $parameter, $pageSize, $delegate=null, $page=0)
 	{
 		parent::__construct();
 		parent::setCustomPaging(true);
-		$this->initialize($statement,$parameter, $pageSize, $page);
+		$this->initialize($statement, $parameter, $pageSize, $page);
 		$this->_delegate=$delegate;
 	}
 
@@ -58,8 +58,8 @@ 
 	 */
 	protected function initialize($statement, $parameter, $pageSize, $page)
 	{
-		$this->_statement = $statement;
-		$this->_parameter = $parameter;
+		$this->_statement=$statement;
+		$this->_parameter=$parameter;
 		$this->setPageSize($pageSize);
 		$this->attachEventHandler('OnFetchData', array($this, 'fetchDataFromStatement'));
 		$this->gotoPage($page);
@@ -80,9 +80,9 @@ 
 	 */
 	protected function fetchDataFromStatement($sender, $param)
 	{
-		$limit = $this->getOffsetAndLimit($param);
-		$connection = $this->_statement->getManager()->getDbConnection();
-		$data = $this->_statement->executeQueryForList($connection,
+		$limit=$this->getOffsetAndLimit($param);
+		$connection=$this->_statement->getManager()->getDbConnection();
+		$data=$this->_statement->executeQueryForList($connection,
 						$this->_parameter, null, $limit[0], $limit[1], $this->_delegate);
 		$this->populateData($param, $data);
 	}
@@ -112,49 +112,49 @@ 
 	 */
 	protected function populateData($param, $data)
 	{
-		$total = $data instanceof TList ? $data->getCount() : count($data);
-		$pageSize = $this->getPageSize();
+		$total=$data instanceof TList ? $data->getCount() : count($data);
+		$pageSize=$this->getPageSize();
 		if($total < 1)
 		{
 			$param->setData($data);
-			$this->_prevPageList = null;
-			$this->_nextPageList = null;
+			$this->_prevPageList=null;
+			$this->_nextPageList=null;
 			return;
 		}
 
 		if($param->getNewPageIndex() < 1)
 		{
-			$this->_prevPageList = null;
+			$this->_prevPageList=null;
 			if($total <= $pageSize)
 			{
 				$param->setData($data);
-				$this->_nextPageList = null;
+				$this->_nextPageList=null;
 			}
 			else
 			{
 				$param->setData(array_slice($data, 0, $pageSize));
-				$this->_nextPageList = array_slice($data, $pageSize-1,$total);
+				$this->_nextPageList=array_slice($data, $pageSize - 1, $total);
 			}
 		}
 		else
 		{
 			if($total <= $pageSize)
 			{
-				$this->_prevPageList = array_slice($data, 0, $total);
+				$this->_prevPageList=array_slice($data, 0, $total);
 				$param->setData(array());
-				$this->_nextPageList = null;
+				$this->_nextPageList=null;
 			}
-			else if($total <= $pageSize*2)
+			else if($total <= $pageSize * 2)
 			{
-				$this->_prevPageList = array_slice($data, 0, $pageSize);
+				$this->_prevPageList=array_slice($data, 0, $pageSize);
 				$param->setData(array_slice($data, $pageSize, $total));
-				$this->_nextPageList = null;
+				$this->_nextPageList=null;
 			}
 			else
 			{
-				$this->_prevPageList = array_slice($data, 0, $pageSize);
+				$this->_prevPageList=array_slice($data, 0, $pageSize);
 				$param->setData(array_slice($data, $pageSize, $pageSize));
-				$this->_nextPageList = array_slice($data, $pageSize*2, $total-$pageSize*2);
+				$this->_nextPageList=array_slice($data, $pageSize * 2, $total - $pageSize * 2);
 			}
 		}
 	}
@@ -166,9 +166,9 @@ 
 	 */
 	protected function getOffsetAndLimit($param)
 	{
-		$index = $param->getNewPageIndex();
-		$pageSize = $this->getPageSize();
-		return $index < 1 ? array($index, $pageSize*2) : array(($index-1)*$pageSize, $pageSize*3);
+		$index=$param->getNewPageIndex();
+		$pageSize=$this->getPageSize();
+		return $index < 1 ? array($index, $pageSize * 2) : array(($index - 1) * $pageSize, $pageSize * 3);
 	}
 
 	/**

framework/Data/DataGateway/TTableGateway.php

Braces +1 added lines, -2 removed lines

@@ -416,8 +416,7 @@
 		{
 			$useArgs = !is_array($parameters) && is_array($args);
 			return new TSqlCriteria($criteria,$useArgs ? $args : $parameters);
-		}
-		else if($criteria instanceof TSqlCriteria)
+		} else if($criteria instanceof TSqlCriteria)
 			return $criteria;
 		else
 			throw new TDbException('dbtablegateway_invalid_criteria');

Spacing +38 added lines, -38 removed lines

@@ -87,7 +87,7 @@ 
 	 * @param string|TDbTableInfo table or view name or table information.
 	 * @param TDbConnection database connection.
 	 */
-	public function __construct($table,$connection)
+	public function __construct($table, $connection)
 	{
 		$this->_connection=$connection;
 		if(is_string($table))
@@ -103,7 +103,7 @@ 
 	 */
 	protected function setTableInfo($tableInfo)
 	{
-		$builder = $tableInfo->createCommandBuilder($this->getDbConnection());
+		$builder=$tableInfo->createCommandBuilder($this->getDbConnection());
 		$this->initCommandBuilder($builder);
 	}
 
@@ -114,7 +114,7 @@ 
 	protected function setTableName($tableName)
 	{
 		Prado::using('System.Data.Common.TDbMetaData');
-		$meta = TDbMetaData::getInstance($this->getDbConnection());
+		$meta=TDbMetaData::getInstance($this->getDbConnection());
 		$this->initCommandBuilder($meta->createCommandBuilder($tableName));
 	}
 
@@ -133,9 +133,9 @@ 
 	 */
 	protected function initCommandBuilder($builder)
 	{
-		$this->_command = new TDataGatewayCommand($builder);
-		$this->_command->OnCreateCommand[] = array($this, 'onCreateCommand');
-		$this->_command->OnExecuteCommand[] = array($this, 'onExecuteCommand');
+		$this->_command=new TDataGatewayCommand($builder);
+		$this->_command->OnCreateCommand[]=array($this, 'onCreateCommand');
+		$this->_command->OnExecuteCommand[]=array($this, 'onExecuteCommand');
 	}
 
 	/**
@@ -189,8 +189,8 @@ 
 	 */
 	public function findBySql($sql, $parameters=array())
 	{
-		$args = func_num_args() > 1 ? array_slice(func_get_args(),1) : null;
-		$criteria = $this->getCriteria($sql,$parameters, $args);
+		$args=func_num_args() > 1 ? array_slice(func_get_args(), 1) : null;
+		$criteria=$this->getCriteria($sql, $parameters, $args);
 		return $this->getCommand()->findBySql($criteria);
 	}
 
@@ -202,8 +202,8 @@ 
 	 */
 	public function findAllBySql($sql, $parameters=array())
 	{
-		$args = func_num_args() > 1 ? array_slice(func_get_args(),1) : null;
-		$criteria = $this->getCriteria($sql,$parameters, $args);
+		$args=func_num_args() > 1 ? array_slice(func_get_args(), 1) : null;
+		$criteria=$this->getCriteria($sql, $parameters, $args);
 		return $this->getCommand()->findAllBySql($criteria);
 	}
 
@@ -226,8 +226,8 @@ 
 	 */
 	public function find($criteria, $parameters=array())
 	{
-		$args = func_num_args() > 1 ? array_slice(func_get_args(),1) : null;
-		$criteria = $this->getCriteria($criteria,$parameters, $args);
+		$args=func_num_args() > 1 ? array_slice(func_get_args(), 1) : null;
+		$criteria=$this->getCriteria($criteria, $parameters, $args);
 		return $this->getCommand()->find($criteria);
 	}
 
@@ -239,9 +239,9 @@ 
 	 */
 	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->getCriteria($criteria,$parameters, $args);
+			$criteria=$this->getCriteria($criteria, $parameters, $args);
 		return $this->getCommand()->findAll($criteria);
 	}
 
@@ -260,7 +260,7 @@ 
 	public function findByPk($keys)
 	{
 		if(func_num_args() > 1)
-			$keys = func_get_args();
+			$keys=func_get_args();
 		return $this->getCommand()->findByPk($keys);
 	}
 
@@ -284,7 +284,7 @@ 
 	public function findAllByPks($keys)
 	{
 		if(func_num_args() > 1)
-			$keys = func_get_args();
+			$keys=func_get_args();
 		return $this->getCommand()->findAllByPk($keys);
 	}
 
@@ -301,8 +301,8 @@ 
 	 */
 	public function deleteAll($criteria, $parameters=array())
 	{
-		$args = func_num_args() > 1 ? array_slice(func_get_args(),1) : null;
-		$criteria = $this->getCriteria($criteria,$parameters, $args);
+		$args=func_num_args() > 1 ? array_slice(func_get_args(), 1) : null;
+		$criteria=$this->getCriteria($criteria, $parameters, $args);
 		return $this->getCommand()->delete($criteria);
 	}
 
@@ -332,7 +332,7 @@ 
 	public function deleteByPk($keys)
 	{
 		if(func_num_args() > 1)
-			$keys = func_get_args();
+			$keys=func_get_args();
 		return $this->getCommand()->deleteByPk($keys);
 	}
 
@@ -342,7 +342,7 @@ 
 	public function deleteAllByPks($keys)
 	{
 		if(func_num_args() > 1)
-			$keys = func_get_args();
+			$keys=func_get_args();
 		return $this->deleteByPk($keys);
 	}
 
@@ -352,11 +352,11 @@ 
 	 * @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->getCriteria($criteria,$parameters, $args);
+			$criteria=$this->getCriteria($criteria, $parameters, $args);
 		return $this->getCommand()->count($criteria);
 	}
 
@@ -376,8 +376,8 @@ 
 	 */
 	public function update($data, $criteria, $parameters=array())
 	{
-		$args = func_num_args() > 2 ? array_slice(func_get_args(),2) : null;
-		$criteria = $this->getCriteria($criteria,$parameters, $args);
+		$args=func_num_args() > 2 ? array_slice(func_get_args(), 2) : null;
+		$criteria=$this->getCriteria($criteria, $parameters, $args);
 		return $this->getCommand()->update($data, $criteria);
 	}
 
@@ -414,8 +414,8 @@ 
 	{
 		if(is_string($criteria))
 		{
-			$useArgs = !is_array($parameters) && is_array($args);
-			return new TSqlCriteria($criteria,$useArgs ? $args : $parameters);
+			$useArgs=!is_array($parameters) && is_array($args);
+			return new TSqlCriteria($criteria, $useArgs ? $args : $parameters);
 		}
 		else if($criteria instanceof TSqlCriteria)
 			return $criteria;
@@ -452,21 +452,21 @@ 
 	 * @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($findOne = substr(strtolower($method),0,6)==='findby')
-			$condition = $method[6]==='_' ? substr($method,7) : substr($method,6);
-		else if(substr(strtolower($method),0,9)==='findallby')
-			$condition = $method[9]==='_' ? substr($method,10) : substr($method,9);
-		else if($delete = substr(strtolower($method),0,8)==='deleteby')
-			$condition = $method[8]==='_' ? substr($method,9) : substr($method,8);
-		else if($delete = substr(strtolower($method),0,11)==='deleteallby')
-			$condition = $method[11]==='_' ? substr($method,12) : substr($method,11);
+		$delete=false;
+		if($findOne=substr(strtolower($method), 0, 6)==='findby')
+			$condition=$method[6]==='_' ? substr($method, 7) : substr($method, 6);
+		else if(substr(strtolower($method), 0, 9)==='findallby')
+			$condition=$method[9]==='_' ? substr($method, 10) : substr($method, 9);
+		else if($delete=substr(strtolower($method), 0, 8)==='deleteby')
+			$condition=$method[8]==='_' ? substr($method, 9) : substr($method, 8);
+		else if($delete=substr(strtolower($method), 0, 11)==='deleteallby')
+			$condition=$method[11]==='_' ? substr($method, 12) : substr($method, 11);
 		else
 			return null;
 
-		$criteria = $this->getCommand()->createCriteriaFromString($method, $condition, $args);
+		$criteria=$this->getCommand()->createCriteriaFromString($method, $condition, $args);
 		if($delete)
 			return $this->deleteAll($criteria);
 		else

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

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 +16 added lines, -16 removed lines

@@ -33,7 +33,7 @@ 
 			case 'datetime': case 'timestamp':
 				return $this->createDateTimeControl($container, $column, $record);
 			default:
-				return $this->createDefaultControl($container,$column, $record);
+				return $this->createDefaultControl($container, $column, $record);
 		}
 	}
 
@@ -50,16 +50,16 @@ 
 			case 'time':
 				return $this->getTimeValue($container, $column, $record);
 			case 'datetime': case 'timestamp':
-				return $this->getDateTimeValue($container,$column, $record);
+				return $this->getDateTimeValue($container, $column, $record);
 			default:
-				return $this->getDefaultControlValue($container,$column, $record);
+				return $this->getDefaultControlValue($container, $column, $record);
 		}
 	}
 
 	protected function createDateControl($container, $column, $record)
 	{
-		$control = parent::createDateControl($container, $column, $record);
-		$value = $this->getRecordPropertyValue($column, $record);
+		$control=parent::createDateControl($container, $column, $record);
+		$value=$this->getRecordPropertyValue($column, $record);
 		if(!empty($value) && preg_match('/timestamp/i', $column->getDbType()))
 			$control->setTimestamp(intval($value));
 		return $control;
@@ -67,12 +67,12 @@ 
 
 	protected function createDateTimeControl($container, $column, $record)
 	{
-		$value = $this->getRecordPropertyValue($column, $record);
-		$time = parent::createDateTimeControl($container, $column, $record);
+		$value=$this->getRecordPropertyValue($column, $record);
+		$time=parent::createDateTimeControl($container, $column, $record);
 		if(!empty($value) && preg_match('/timestamp/i', $column->getDbType()))
 		{
-			$s = Prado::createComponent('System.Util.TDateTimeStamp');
-			$date = $s->getDate(intval($value));
+			$s=Prado::createComponent('System.Util.TDateTimeStamp');
+			$date=$s->getDate(intval($value));
 			$time[1]->setSelectedValue($date['hours']);
 			$time[2]->setSelectedValue($date['minutes']);
 			$time[3]->setSelectedValue($date['seconds']);
@@ -84,13 +84,13 @@ 
 	{
 		if(preg_match('/timestamp/i', $column->getDbType()))
 		{
-			$time = $container->findControl(self::DEFAULT_ID)->getTimestamp();
-			$s = Prado::createComponent('System.Util.TDateTimeStamp');
-			$date = $s->getDate($time);
-			$hour = $container->findControl('scaffold_time_hour')->getSelectedValue();
-			$mins = $container->findControl('scaffold_time_min')->getSelectedValue();
-			$secs = $container->findControl('scaffold_time_sec')->getSelectedValue();
-			return $s->getTimeStamp($hour,$mins,$secs,$date['mon'],$date['mday'],$date['year']);
+			$time=$container->findControl(self::DEFAULT_ID)->getTimestamp();
+			$s=Prado::createComponent('System.Util.TDateTimeStamp');
+			$date=$s->getDate($time);
+			$hour=$container->findControl('scaffold_time_hour')->getSelectedValue();
+			$mins=$container->findControl('scaffold_time_min')->getSelectedValue();
+			$secs=$container->findControl('scaffold_time_sec')->getSelectedValue();
+			return $s->getTimeStamp($hour, $mins, $secs, $date['mon'], $date['mday'], $date['year']);
 		}
 		else
 			return parent::getDateTimeValue($container, $column, $record);

framework/Data/ActiveRecord/Scaffold/TScaffoldEditView.php

Braces +4 added lines, -8 removed lines

@@ -115,8 +115,7 @@ 
 			$columns = $this->getTableInfo()->getColumns();
 			$this->getInputRepeater()->setDataSource($columns);
 			$this->getInputRepeater()->dataBind();
-		}
-		else
+		} else
 		{
 			if($this->_editRenderer===null)
 				$this->createEditRenderer($record, $classPath);
@@ -140,8 +139,7 @@ 
 			$index = $this->getControls()->remove($this->getInputRepeater());
 			$this->getControls()->insertAt($index,$this->_editRenderer);
 			$this->_editRenderer->setData($record);
-		}
-		else
+		} else
 		{
 			throw new TConfigurationException(
 				'scaffold_invalid_edit_renderer', $this->getID(), get_class($record));
@@ -204,15 +202,13 @@ 
 					$column = $table->getColumn($item->getCustomData());
 					$builder->loadScaffoldInput($this, $item, $column, $record);
 				}
-			}
-			else
+			} else
 			{
 				$this->_editRenderer->updateRecord($record);
 			}
 			$record->save();
 			return true;
-		}
-		else if($this->_editRenderer!==null)
+		} else if($this->_editRenderer!==null)
 		{
 			//preserve the form data.
 			$this->_editRenderer->updateRecord($this->getCurrentRecord());

Spacing +19 added lines, -19 removed lines

@@ -83,7 +83,7 @@ 
 	public function setRecordPk($value)
 	{
 		$this->clearRecordObject();
-		$val = TPropertyValue::ensureArray($value);
+		$val=TPropertyValue::ensureArray($value);
 		$this->setViewState('PK', count($val) > 0 ? $val : null);
 	}
 
@@ -108,11 +108,11 @@ 
 	 */
 	public function initializeEditForm()
 	{
-		$record = $this->getCurrentRecord();
-		$classPath = $this->getEditRenderer();
-		if($classPath === '')
+		$record=$this->getCurrentRecord();
+		$classPath=$this->getEditRenderer();
+		if($classPath==='')
 		{
-			$columns = $this->getTableInfo()->getColumns();
+			$columns=$this->getTableInfo()->getColumns();
 			$this->getInputRepeater()->setDataSource($columns);
 			$this->getInputRepeater()->dataBind();
 		}
@@ -134,11 +134,11 @@ 
 	 */
 	protected function createEditRenderer($record, $classPath)
 	{
-		$this->_editRenderer = Prado::createComponent($classPath);
+		$this->_editRenderer=Prado::createComponent($classPath);
 		if($this->_editRenderer instanceof IScaffoldEditRenderer)
 		{
-			$index = $this->getControls()->remove($this->getInputRepeater());
-			$this->getControls()->insertAt($index,$this->_editRenderer);
+			$index=$this->getControls()->remove($this->getInputRepeater());
+			$this->getControls()->insertAt($index, $this->_editRenderer);
 			$this->_editRenderer->setData($record);
 		}
 		else
@@ -153,16 +153,16 @@ 
 	 */
 	protected function createRepeaterEditItem($sender, $param)
 	{
-		$type = $param->getItem()->getItemType();
+		$type=$param->getItem()->getItemType();
 		if($type==TListItemType::Item || $type==TListItemType::AlternatingItem)
 		{
-			$item = $param->getItem();
-			$column = $item->getDataItem();
+			$item=$param->getItem();
+			$column=$item->getDataItem();
 			if($column===null)
 				return;
 
-			$record = $this->getCurrentRecord();
-			$builder = $this->getScaffoldInputBuilder($record);
+			$record=$this->getCurrentRecord();
+			$builder=$this->getScaffoldInputBuilder($record);
 			$builder->createScaffoldInput($this, $item, $column, $record);
 		}
 	}
@@ -194,14 +194,14 @@ 
 	{
 		if($this->getPage()->getIsValid())
 		{
-			$record = $this->getCurrentRecord();
+			$record=$this->getCurrentRecord();
 			if($this->_editRenderer===null)
 			{
-				$table = $this->getTableInfo();
-				$builder = $this->getScaffoldInputBuilder($record);
+				$table=$this->getTableInfo();
+				$builder=$this->getScaffoldInputBuilder($record);
 				foreach($this->getInputRepeater()->getItems() as $item)
 				{
-					$column = $table->getColumn($item->getCustomData());
+					$column=$table->getColumn($item->getCustomData());
 					$builder->loadScaffoldInput($this, $item, $column, $record);
 				}
 			}
@@ -265,11 +265,11 @@ 
 	protected function getScaffoldInputBuilder($record)
 	{
 		static $_builders=array();
-		$class = get_class($record);
+		$class=get_class($record);
 		if(!isset($_builders[$class]))
 		{
 			Prado::using('System.Data.ActiveRecord.Scaffold.InputBuilder.TScaffoldInputBase');
-			$_builders[$class] = TScaffoldInputBase::createInputBuilder($record);
+			$_builders[$class]=TScaffoldInputBase::createInputBuilder($record);
 		}
 		return $_builders[$class];
 	}

framework/Data/ActiveRecord/TActiveRecordGateway.php

Braces +2 added lines, -4 removed lines

@@ -67,16 +67,14 @@
 				throw new TActiveRecordException('ar_invalid_tablename_property',
 					get_class($record),self::TABLE_CONST);
 			return $value;
-		}
-		elseif ($class->hasMethod(self::TABLE_METHOD))
+		} elseif ($class->hasMethod(self::TABLE_METHOD))
 		{
 			$value = $record->{self::TABLE_METHOD}();
 			if(empty($value))
 				throw new TActiveRecordException('ar_invalid_tablename_method',
 					get_class($record),self::TABLE_METHOD);
 			return $value;
-		}
-		else
+		} else
 			return strtolower(get_class($record));
 	}
 

Spacing +50 added lines, -50 removed lines

@@ -59,21 +59,21 @@ 
 	 */
 	protected function getRecordTableName(TActiveRecord $record)
 	{
-		$class = new ReflectionClass($record);
+		$class=new ReflectionClass($record);
 		if($class->hasConstant(self::TABLE_CONST))
 		{
-			$value = $class->getConstant(self::TABLE_CONST);
+			$value=$class->getConstant(self::TABLE_CONST);
 			if(empty($value))
 				throw new TActiveRecordException('ar_invalid_tablename_property',
-					get_class($record),self::TABLE_CONST);
+					get_class($record), self::TABLE_CONST);
 			return $value;
 		}
-		elseif ($class->hasMethod(self::TABLE_METHOD))
+		elseif($class->hasMethod(self::TABLE_METHOD))
 		{
-			$value = $record->{self::TABLE_METHOD}();
+			$value=$record->{self::TABLE_METHOD}();
 			if(empty($value))
 				throw new TActiveRecordException('ar_invalid_tablename_method',
-					get_class($record),self::TABLE_METHOD);
+					get_class($record), self::TABLE_METHOD);
 			return $value;
 		}
 		else
@@ -87,7 +87,7 @@ 
 	 */
 	public function getRecordTableInfo(TActiveRecord $record)
 	{
-		$tableName = $this->getRecordTableName($record);
+		$tableName=$this->getRecordTableName($record);
 		return $this->getTableInfo($record->getDbConnection(), $tableName);
 	}
 
@@ -99,8 +99,8 @@ 
 	 */
 	public function getTableInfo(TDbConnection $connection, $tableName)
 	{
-		$connStr = $connection->getConnectionString();
-		$key = $connStr.$tableName;
+		$connStr=$connection->getConnectionString();
+		$key=$connStr.$tableName;
 		if(!isset($this->_tables[$key]))
 		{
 			//call this first to ensure that unserializing the cache
@@ -108,19 +108,19 @@ 
 			if(!isset($this->_meta[$connStr]))
 			{
 				Prado::using('System.Data.Common.TDbMetaData');
-				$this->_meta[$connStr] = TDbMetaData::getInstance($connection);
+				$this->_meta[$connStr]=TDbMetaData::getInstance($connection);
 			}
 
-			$tableInfo = null;
+			$tableInfo=null;
 			if(($cache=$this->getManager()->getCache())!==null)
-				$tableInfo = $cache->get($key);
+				$tableInfo=$cache->get($key);
 			if(empty($tableInfo))
 			{
-				$tableInfo = $this->_meta[$connStr]->getTableInfo($tableName);
+				$tableInfo=$this->_meta[$connStr]->getTableInfo($tableName);
 				if($cache!==null)
 					$cache->set($key, $tableInfo);
 			}
-			$this->_tables[$key] = $tableInfo;
+			$this->_tables[$key]=$tableInfo;
 		}
 		return $this->_tables[$key];
 	}
@@ -131,17 +131,17 @@ 
 	 */
 	public function getCommand(TActiveRecord $record)
 	{
-		$conn = $record->getDbConnection();
-		$connStr = $conn->getConnectionString();
-		$tableInfo = $this->getRecordTableInfo($record);
+		$conn=$record->getDbConnection();
+		$connStr=$conn->getConnectionString();
+		$tableInfo=$this->getRecordTableInfo($record);
 		if(!isset($this->_commandBuilders[$connStr]))
 		{
-			$builder = $tableInfo->createCommandBuilder($record->getDbConnection());
+			$builder=$tableInfo->createCommandBuilder($record->getDbConnection());
 			Prado::using('System.Data.DataGateway.TDataGatewayCommand');
-			$command = new TDataGatewayCommand($builder);
-			$command->OnCreateCommand[] = array($this, 'onCreateCommand');
-			$command->OnExecuteCommand[] = array($this, 'onExecuteCommand');
-			$this->_commandBuilders[$connStr] = $command;
+			$command=new TDataGatewayCommand($builder);
+			$command->OnCreateCommand[]=array($this, 'onCreateCommand');
+			$command->OnExecuteCommand[]=array($this, 'onExecuteCommand');
+			$this->_commandBuilders[$connStr]=$command;
 
 		}
 		$this->_commandBuilders[$connStr]->getBuilder()->setTableInfo($tableInfo);
@@ -191,9 +191,9 @@ 
 	 * @param array primary name value pairs
 	 * @return array record data
 	 */
-	public function findRecordByPK(TActiveRecord $record,$keys)
+	public function findRecordByPK(TActiveRecord $record, $keys)
 	{
-		$command = $this->getCommand($record);
+		$command=$this->getCommand($record);
 		return $command->findByPk($keys);
 	}
 
@@ -219,7 +219,7 @@ 
 	 */
 	public function findRecordsByCriteria(TActiveRecord $record, $criteria, $iterator=false)
 	{
-		$command = $this->getCommand($record);
+		$command=$this->getCommand($record);
 		return $iterator ? $command->findAll($criteria) : $command->find($criteria);
 	}
 
@@ -247,7 +247,7 @@ 
 
 	public function findRecordsByIndex(TActiveRecord $record, $criteria, $fields, $values)
 	{
-		return $this->getCommand($record)->findAllByIndex($criteria,$fields,$values);
+		return $this->getCommand($record)->findAllByIndex($criteria, $fields, $values);
 	}
 
 	/**
@@ -269,7 +269,7 @@ 
 	public function insert(TActiveRecord $record)
 	{
 		//$this->updateAssociatedRecords($record,true);
-		$result = $this->getCommand($record)->insert($this->getInsertValues($record));
+		$result=$this->getCommand($record)->insert($this->getInsertValues($record));
 		if($result)
 			$this->updatePostInsert($record);
 		//$this->updateAssociatedRecords($record);
@@ -282,12 +282,12 @@ 
 	 */
 	protected function updatePostInsert($record)
 	{
-		$command = $this->getCommand($record);
-		$tableInfo = $command->getTableInfo();
+		$command=$this->getCommand($record);
+		$tableInfo=$command->getTableInfo();
 		foreach($tableInfo->getColumns() as $name => $column)
 		{
 			if($column->hasSequence())
-				$record->setColumnValue($name,$command->getLastInsertID($column->getSequenceName()));
+				$record->setColumnValue($name, $command->getLastInsertID($column->getSequenceName()));
 		}
 	}
 
@@ -298,20 +298,20 @@ 
 	protected function getInsertValues(TActiveRecord $record)
 	{
 		$values=array();
-		$tableInfo = $this->getCommand($record)->getTableInfo();
+		$tableInfo=$this->getCommand($record)->getTableInfo();
 		foreach($tableInfo->getColumns() as $name=>$column)
 		{
 			if($column->getIsExcluded())
 				continue;
-			$value = $record->getColumnValue($name);
-			if(!$column->getAllowNull() && $value===null && !$column->hasSequence() && ($column->getDefaultValue() === TDbTableColumn::UNDEFINED_VALUE))
+			$value=$record->getColumnValue($name);
+			if(!$column->getAllowNull() && $value===null && !$column->hasSequence() && ($column->getDefaultValue()===TDbTableColumn::UNDEFINED_VALUE))
 			{
 				throw new TActiveRecordException(
 					'ar_value_must_not_be_null', get_class($record),
 					$tableInfo->getTableFullName(), $name);
 			}
 			if($value!==null)
-				$values[$name] = $value;
+				$values[$name]=$value;
 		}
 		return $values;
 	}
@@ -324,8 +324,8 @@ 
 	public function update(TActiveRecord $record)
 	{
 		//$this->updateAssociatedRecords($record,true);
-		list($data, $keys) = $this->getUpdateValues($record);
-		$result = $this->getCommand($record)->updateByPk($data, $keys);
+		list($data, $keys)=$this->getUpdateValues($record);
+		$result=$this->getCommand($record)->updateByPk($data, $keys);
 		//$this->updateAssociatedRecords($record);
 		return $result;
 	}
@@ -333,30 +333,30 @@ 
 	protected function getUpdateValues(TActiveRecord $record)
 	{
 		$values=array();
-		$tableInfo = $this->getCommand($record)->getTableInfo();
+		$tableInfo=$this->getCommand($record)->getTableInfo();
 		$primary=array();
 		foreach($tableInfo->getColumns() as $name=>$column)
 		{
 			if($column->getIsExcluded())
 				continue;
-			$value = $record->getColumnValue($name);
-			if(!$column->getAllowNull() && $value===null && ($column->getDefaultValue() === TDbTableColumn::UNDEFINED_VALUE))
+			$value=$record->getColumnValue($name);
+			if(!$column->getAllowNull() && $value===null && ($column->getDefaultValue()===TDbTableColumn::UNDEFINED_VALUE))
 			{
 				throw new TActiveRecordException(
 					'ar_value_must_not_be_null', get_class($record),
 					$tableInfo->getTableFullName(), $name);
 			}
 			if($column->getIsPrimaryKey())
-				$primary[$name] = $value;
+				$primary[$name]=$value;
 			else
-				$values[$name] = $value;
+				$values[$name]=$value;
 		}
-		return array($values,$primary);
+		return array($values, $primary);
 	}
 
-	protected function updateAssociatedRecords(TActiveRecord $record,$updateBelongsTo=false)
+	protected function updateAssociatedRecords(TActiveRecord $record, $updateBelongsTo=false)
 	{
-		$context = new TActiveRecordRelationContext($record);
+		$context=new TActiveRecordRelationContext($record);
 		return $context->updateAssociatedRecords($updateBelongsTo);
 	}
 
@@ -372,12 +372,12 @@ 
 
 	protected function getPrimaryKeyValues(TActiveRecord $record)
 	{
-		$tableInfo = $this->getCommand($record)->getTableInfo();
+		$tableInfo=$this->getCommand($record)->getTableInfo();
 		$primary=array();
 		foreach($tableInfo->getColumns() as $name=>$column)
 		{
 			if($column->getIsPrimaryKey())
-				$primary[$name] = $record->getColumnValue($name);
+				$primary[$name]=$record->getColumnValue($name);
 		}
 		return $primary;
 	}
@@ -410,12 +410,12 @@ 
 	 * @param TActiveRecord active record
 	 * @param TActiveRecordCriteria data for the command.
 	 */
-	protected function raiseCommandEvent($event,$command,$record,$criteria)
+	protected function raiseCommandEvent($event, $command, $record, $criteria)
 	{
 		if(!($criteria instanceof TSqlCriteria))
-			$criteria = new TActiveRecordCriteria(null,$criteria);
-		$param = new TActiveRecordEventParameter($command,$record,$criteria);
-		$manager = $record->getRecordManager();
+			$criteria=new TActiveRecordCriteria(null, $criteria);
+		$param=new TActiveRecordEventParameter($command, $record, $criteria);
+		$manager=$record->getRecordManager();
 		$manager->{$event}($param);
 		$record->{$event}($param);
 	}

framework/Data/TDbConnection.php

Braces +2 added lines, -4 removed lines

@@ -189,8 +189,7 @@ 
 				$this->_pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
 				$this->_active=true;
 				$this->setConnectionCharset();
-			}
-			catch(PDOException $e)
+			} catch(PDOException $e)
 			{
 				throw new TDbException('dbconnection_open_failed',$e->getMessage());
 			}
@@ -343,8 +342,7 @@ 
 		{
 			$this->_pdo->beginTransaction();
 			return $this->_transaction=Prado::createComponent($this->getTransactionClass(), $this);
-		}
-		else
+		} else
 			throw new TDbException('dbconnection_connection_inactive');
 	}
 

Spacing +24 added lines, -24 removed lines

@@ -85,7 +85,7 @@ 
 	 *
 	 * @since 3.1.7
 	 */
-	const DEFAULT_TRANSACTION_CLASS = 'System.Data.TDbTransaction';
+	const DEFAULT_TRANSACTION_CLASS='System.Data.TDbTransaction';
 
 	private $_dsn='';
 	private $_username='';
@@ -99,7 +99,7 @@ 
 	/**
 	 * @var TDbMetaData
 	 */
-	private $_dbMeta = null;
+	private $_dbMeta=null;
 
 	/**
 	 * @var string
@@ -120,7 +120,7 @@ 
 	 * @param string Charset used for DB Connection (MySql & pgsql only). If not set, will use the default charset of your database server
 	 * @see http://www.php.net/manual/en/function.PDO-construct.php
 	 */
-	public function __construct($dsn='',$username='',$password='', $charset='')
+	public function __construct($dsn='', $username='', $password='', $charset='')
 	{
 		$this->_dsn=$dsn;
 		$this->_username=$username;
@@ -134,7 +134,7 @@ 
 	public function __sleep()
 	{
 //		$this->close(); - DO NOT CLOSE the current connection as serializing doesn't neccessarily mean we don't this connection anymore in the current session
-		return array_diff(parent::__sleep(),array("\0TDbConnection\0_pdo","\0TDbConnection\0_active"));
+		return array_diff(parent::__sleep(), array("\0TDbConnection\0_pdo", "\0TDbConnection\0_active"));
 	}
 
 	/**
@@ -181,8 +181,8 @@ 
 		{
 			try
 			{
-				$this->_pdo=new PDO($this->getConnectionString(),$this->getUsername(),
-									$this->getPassword(),$this->_attributes);
+				$this->_pdo=new PDO($this->getConnectionString(), $this->getUsername(),
+									$this->getPassword(), $this->_attributes);
 				// This attribute is only useful for PDO::MySql driver.
 				// Ignore the warning if a driver doesn't understand this.
 				@$this->_pdo->setAttribute(PDO::ATTR_EMULATE_PREPARES, true);
@@ -192,7 +192,7 @@ 
 			}
 			catch(PDOException $e)
 			{
-				throw new TDbException('dbconnection_open_failed',$e->getMessage());
+				throw new TDbException('dbconnection_open_failed', $e->getMessage());
 			}
 		}
 	}
@@ -214,16 +214,16 @@ 
 	 */
 	protected function setConnectionCharset()
 	{
-		if ($this->_charset === '' || $this->_active === false)
+		if($this->_charset==='' || $this->_active===false)
 			return;
-		switch ($this->_pdo->getAttribute(PDO::ATTR_DRIVER_NAME))
+		switch($this->_pdo->getAttribute(PDO::ATTR_DRIVER_NAME))
 		{
 			case 'mysql':
 			case 'sqlite':
-				$stmt = $this->_pdo->prepare('SET NAMES ?');
+				$stmt=$this->_pdo->prepare('SET NAMES ?');
 			break;
 			case 'pgsql':
-				$stmt = $this->_pdo->prepare('SET client_encoding TO ?');
+				$stmt=$this->_pdo->prepare('SET client_encoding TO ?');
 			break;
 			default:
 				throw new TDbException('dbconnection_unsupported_driver_charset', $driver);
@@ -283,7 +283,7 @@ 
 	/**
 	 * @return string the charset used for database connection. Defaults to emtpy string.
 	 */
-	public function getCharset ()
+	public function getCharset()
 	{
 		return $this->_charset;
 	}
@@ -291,7 +291,7 @@ 
 	/**
 	 * @param string the charset used for database connection
 	 */
-	public function setCharset ($value)
+	public function setCharset($value)
 	{
 		$this->_charset=$value;
 		$this->setConnectionCharset();
@@ -314,7 +314,7 @@ 
 	public function createCommand($sql)
 	{
 		if($this->getActive())
-			return new TDbCommand($this,$sql);
+			return new TDbCommand($this, $sql);
 		else
 			throw new TDbException('dbconnection_connection_inactive');
 	}
@@ -364,7 +364,7 @@ 
 	 */
 	public function setTransactionClass($value)
 	{
-		$this->_transactionClass = (string)$value;
+		$this->_transactionClass=(string) $value;
 	}
 
 	/**
@@ -433,7 +433,7 @@ 
 		if($this->_dbMeta===null)
 		{
 			Prado::using('System.Data.Common.TDbMetaData');
-			$this->_dbMeta = TDbMetaData::getInstance($this);
+			$this->_dbMeta=TDbMetaData::getInstance($this);
 		}
 		return $this->_dbMeta;
 	}
@@ -459,7 +459,7 @@ 
 	 */
 	public function setColumnCase($value)
 	{
-		switch(TPropertyValue::ensureEnum($value,'TDbColumnCaseMode'))
+		switch(TPropertyValue::ensureEnum($value, 'TDbColumnCaseMode'))
 		{
 			case TDbColumnCaseMode::Preserved:
 				$value=PDO::CASE_NATURAL;
@@ -471,7 +471,7 @@ 
 				$value=PDO::CASE_UPPER;
 				break;
 		}
-		$this->setAttribute(PDO::ATTR_CASE,$value);
+		$this->setAttribute(PDO::ATTR_CASE, $value);
 	}
 
 	/**
@@ -495,7 +495,7 @@ 
 	 */
 	public function setNullConversion($value)
 	{
-		switch(TPropertyValue::ensureEnum($value,'TDbNullConversionMode'))
+		switch(TPropertyValue::ensureEnum($value, 'TDbNullConversionMode'))
 		{
 			case TDbNullConversionMode::Preserved:
 				$value=PDO::NULL_NATURAL;
@@ -507,7 +507,7 @@ 
 				$value=PDO::NULL_TO_STRING;
 				break;
 		}
-		$this->setAttribute(PDO::ATTR_ORACLE_NULLS,$value);
+		$this->setAttribute(PDO::ATTR_ORACLE_NULLS, $value);
 	}
 
 	/**
@@ -525,7 +525,7 @@ 
 	 */
 	public function setAutoCommit($value)
 	{
-		$this->setAttribute(PDO::ATTR_AUTOCOMMIT,TPropertyValue::ensureBoolean($value));
+		$this->setAttribute(PDO::ATTR_AUTOCOMMIT, TPropertyValue::ensureBoolean($value));
 	}
 
 	/**
@@ -543,7 +543,7 @@ 
 	 */
 	public function setPersistent($value)
 	{
-		return $this->setAttribute(PDO::ATTR_PERSISTENT,TPropertyValue::ensureBoolean($value));
+		return $this->setAttribute(PDO::ATTR_PERSISTENT, TPropertyValue::ensureBoolean($value));
 	}
 
 	/**
@@ -623,10 +623,10 @@ 
 	 * @param mixed the attribute value
 	 * @see http://www.php.net/manual/en/function.PDO-setAttribute.php
 	 */
-	public function setAttribute($name,$value)
+	public function setAttribute($name, $value)
 	{
 		if($this->_pdo instanceof PDO)
-			$this->_pdo->setAttribute($name,$value);
+			$this->_pdo->setAttribute($name, $value);
 		else
 			$this->_attributes[$name]=$value;
 	}

framework/Data/TDbDataReader.php

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 +6 added lines, -6 removed lines

@@ -63,9 +63,9 @@ 
 	public function bindColumn($column, &$value, $dataType=null)
 	{
 		if($dataType===null)
-			$this->_statement->bindColumn($column,$value);
+			$this->_statement->bindColumn($column, $value);
 		else
-			$this->_statement->bindColumn($column,$value,$dataType);
+			$this->_statement->bindColumn($column, $value, $dataType);
 	}
 
 	/**
@@ -74,7 +74,7 @@ 
 	public function setFetchMode($mode)
 	{
 		$params=func_get_args();
-		call_user_func_array(array($this->_statement,'setFetchMode'),$params);
+		call_user_func_array(array($this->_statement, 'setFetchMode'), $params);
 	}
 
 	/**
@@ -102,9 +102,9 @@ 
 	 * @param array list of column names whose values are to be passed as parameters in the constructor of the class being created
 	 * @return mixed|false the populated object, false if no more row of data available
 	 */
-	public function readObject($className,$fields)
+	public function readObject($className, $fields)
 	{
-		return $this->_statement->fetchObject($className,$fields);
+		return $this->_statement->fetchObject($className, $fields);
 	}
 
 	/**
@@ -171,7 +171,7 @@ 
 	 */
 	public function rewind()
 	{
-		if($this->_index<0)
+		if($this->_index < 0)
 		{
 			$this->_row=$this->_statement->fetch();
 			$this->_index=0;

framework/Data/SqlMap/DataMapper/TPropertyAccess.php

Braces +6 added lines, -12 removed lines

@@ -61,8 +61,7 @@ 
 					$object = $object[$prop];
 				else
 					throw new TInvalidPropertyException('sqlmap_invalid_property',$path);
-			}
-			else if(is_object($object))
+			} else if(is_object($object))
 			{
 				$getter = 'get'.$prop;
 				if(method_exists($object, $getter) && is_callable(array($object, $getter)))
@@ -73,8 +72,7 @@ 
 					$object = $object->{$prop};
 				else
 					throw new TInvalidPropertyException('sqlmap_invalid_property',$path);
-			}
-			else
+			} else
 				throw new TInvalidPropertyException('sqlmap_invalid_property',$path);
 		}
 		return $object;
@@ -98,8 +96,7 @@ 
 					$object = $object[$prop];
 				else
 					return false;
-			}
-			else if(is_object($object))
+			} else if(is_object($object))
 			{
 				$getter = 'get'.$prop;
 				if(method_exists($object, $getter) && is_callable(array($object, $getter)))
@@ -110,8 +107,7 @@ 
 					$object = $object->{$prop};
 				else
 					return false;
-			}
-			else
+			} else
 				return false;
 		}
 		return true;
@@ -136,16 +132,14 @@ 
 		if(is_array($object) || $object instanceof ArrayAccess)
 		{
 			$object[$prop] = $value;
-		}
-		else if(is_object($object))
+		} else if(is_object($object))
 		{
 			$setter = 'set'.$prop;
 			if (method_exists($object, $setter) && is_callable(array($object, $setter)))
 				$object->{$setter}($value);
 			else
 				$object->{$prop} = $value;
-		}
-		else
+		} else
 			throw new TInvalidPropertyException('sqlmap_invalid_property_type',$path);
 	}
 

Spacing +25 added lines, -25 removed lines

@@ -48,34 +48,34 @@ 
 	 * @return mixed property value.
 	 * @throws TInvalidDataValueException if property path is invalid.
 	 */
-	public static function get($object,$path)
+	public static function get($object, $path)
 	{
 		if(!is_array($object) && !is_object($object))
 			return $object;
-		$properties = explode('.', $path);
+		$properties=explode('.', $path);
 		foreach($properties as $prop)
 		{
 			if(is_array($object) || $object instanceof ArrayAccess)
 			{
 				if(array_key_exists($prop, $object))
-					$object = $object[$prop];
+					$object=$object[$prop];
 				else
-					throw new TInvalidPropertyException('sqlmap_invalid_property',$path);
+					throw new TInvalidPropertyException('sqlmap_invalid_property', $path);
 			}
 			else if(is_object($object))
 			{
-				$getter = 'get'.$prop;
+				$getter='get'.$prop;
 				if(method_exists($object, $getter) && is_callable(array($object, $getter)))
-					$object = $object->{$getter}();
+					$object=$object->{$getter}();
 				else if(in_array($prop, array_keys(get_object_vars($object))))
-					$object = $object->{$prop};
+					$object=$object->{$prop};
 				elseif(method_exists($object, '__get') && is_callable(array($object, '__get')))
-					$object = $object->{$prop};
+					$object=$object->{$prop};
 				else
-					throw new TInvalidPropertyException('sqlmap_invalid_property',$path);
+					throw new TInvalidPropertyException('sqlmap_invalid_property', $path);
 			}
 			else
-				throw new TInvalidPropertyException('sqlmap_invalid_property',$path);
+				throw new TInvalidPropertyException('sqlmap_invalid_property', $path);
 		}
 		return $object;
 	}
@@ -89,25 +89,25 @@ 
 	{
 		if(!is_array($object) && !is_object($object))
 			return false;
-		$properties = explode('.', $path);
+		$properties=explode('.', $path);
 		foreach($properties as $prop)
 		{
 			if(is_array($object) || $object instanceof ArrayAccess)
 			{
 				if(array_key_exists($prop, $object))
-					$object = $object[$prop];
+					$object=$object[$prop];
 				else
 					return false;
 			}
 			else if(is_object($object))
 			{
-				$getter = 'get'.$prop;
+				$getter='get'.$prop;
 				if(method_exists($object, $getter) && is_callable(array($object, $getter)))
-					$object = $object->{$getter}();
+					$object=$object->{$getter}();
 				else if(in_array($prop, array_keys(get_object_vars($object))))
-					$object = $object->{$prop};
+					$object=$object->{$prop};
 				elseif(method_exists($object, '__get') && is_callable(array($object, '__get')))
-					$object = $object->{$prop};
+					$object=$object->{$prop};
 				else
 					return false;
 			}
@@ -126,27 +126,27 @@ 
 	 */
 	public static function set(&$originalObject, $path, $value)
 	{
-		$properties = explode('.', $path);
-		$prop = array_pop($properties);
+		$properties=explode('.', $path);
+		$prop=array_pop($properties);
 		if(count($properties) > 0)
-			$object = self::get($originalObject, implode('.',$properties));
+			$object=self::get($originalObject, implode('.', $properties));
 		else
-			$object = &$originalObject;
+			$object=&$originalObject;
 
 		if(is_array($object) || $object instanceof ArrayAccess)
 		{
-			$object[$prop] = $value;
+			$object[$prop]=$value;
 		}
 		else if(is_object($object))
 		{
-			$setter = 'set'.$prop;
-			if (method_exists($object, $setter) && is_callable(array($object, $setter)))
+			$setter='set'.$prop;
+			if(method_exists($object, $setter) && is_callable(array($object, $setter)))
 				$object->{$setter}($value);
 			else
-				$object->{$prop} = $value;
+				$object->{$prop}=$value;
 		}
 		else
-			throw new TInvalidPropertyException('sqlmap_invalid_property_type',$path);
+			throw new TInvalidPropertyException('sqlmap_invalid_property_type', $path);
 	}
 
 }