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

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

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

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

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

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

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');
 	}
 

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

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