pradosoft / prado

framework/Data/SqlMap/Configuration/TResultMap.php

Braces +1 added lines, -2 removed lines

@@ -164,8 +164,7 @@
 				return $handler->createNewInstance();
 			else
 				return $registry->createInstanceOf($this->getClass());
-		}
-		catch (TSqlMapException $e)
+		} catch (TSqlMapException $e)
 		{
 			throw new TSqlMapException(
 				'sqlmap_unable_to_create_new_instance',

framework/Data/Common/Sqlite/TSqliteMetaData.php

Braces +1 added lines, -2 removed lines

@@ -146,8 +146,7 @@
 			{
 				$info['NumericPrecision'] = intval($ps[0]);
 				$info['NumericScale'] = intval($ps[1]);
-			}
-			else
+			} else
 				$info['ColumnSize']=intval($match[1]);
 			$info['DbType'] = substr($type,0,$pos);
 		}

framework/Util/TSimpleDateFormatter.php

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;

framework/Caching/TMemCache.php

Braces +1 added lines, -2 removed lines

@@ -179,8 +179,7 @@
                     $server['Weight'],$server['Timeout'],$server['RetryInterval'])===false)
                     throw new TConfigurationException('memcache_connection_failed',$server['Host'],$server['Port']);
             }
-        }
-        else
+        } else
         {
             Prado::trace('Adding server '.$this->_host, 'System.Caching.TMemCache');
             if($this->_cache->addServer($this->_host,$this->_port)===false)

framework/Caching/TDbCache.php

Braces +10 added lines, -20 removed lines

@@ -199,8 +199,7 @@ 
 				$this -> _createCheck = true;
 				$this -> getApplication() -> setGlobalState($key, time());
 			}
-		}
-		catch(Exception $e)
+		} catch(Exception $e)
 		{
 			// DB table not exists
 			if($this->_autoCreate)
@@ -223,8 +222,7 @@ 
 
 				$this -> _createCheck = true;
 				$this -> getApplication() -> setGlobalState($key, time());
-			}
-			else
+			} else
 				throw new TConfigurationException('db_cachetable_inexistent',$this->_cacheTable);
 		}
 		$this->_cacheInitialized = true;
@@ -293,8 +291,7 @@ 
 				return $config->getDbConnection();
 			else
 				throw new TConfigurationException('dbcache_connectionid_invalid',$this->_connID);
-		}
-		else
+		} else
 		{
 			$db=new TDbConnection;
 			if($this->_connectionString!=='')
@@ -304,8 +301,7 @@ 
 					$db->setUsername($this->_username);
 				if($this->_password!=='')
 					$db->setPassword($this->_password);
-			}
-			else
+			} else
 			{
 				// default to SQLite3 database
 				$dbFile=$this->getApplication()->getRuntimePath().'/sqlite3.cache';
@@ -462,8 +458,7 @@ 
 			$sql='SELECT value FROM '.$this->_cacheTable.' WHERE itemkey=\''.$key.'\' AND (expire=0 OR expire>'.time().') ORDER BY expire DESC';
 			$command=$this->getDbConnection()->createCommand($sql);
 			return unserialize($command->queryScalar());
-		}
-		catch(Exception $e)
+		} catch(Exception $e)
 		{
 			$this->initializeCache(true);
 			return unserialize($command->queryScalar());
@@ -506,16 +501,14 @@ 
 			$command->bindValue(':value',serialize($value),PDO::PARAM_LOB);
 			$command->execute();
 			return true;
-		}
-		catch(Exception $e)
+		} catch(Exception $e)
 		{
 			try
 			{
 				$this->initializeCache(true);
 				$command->execute();
 				return true;
-			}
-			catch(Exception $e)
+			} catch(Exception $e)
 			{
 				return false;
 			}
@@ -537,8 +530,7 @@ 
 			$command->bindValue(':key',$key,PDO::PARAM_STR);
 			$command->execute();
 			return true;
-		}
-		catch(Exception $e)
+		} catch(Exception $e)
 		{
 			$this->initializeCache(true);
 			$command->execute();
@@ -557,16 +549,14 @@ 
 		{
 			$command = $this->getDbConnection()->createCommand("DELETE FROM {$this->_cacheTable}");
 			$command->execute();
-		}
-		catch(Exception $e)
+		} catch(Exception $e)
 		{
 			try
 			{
 				$this->initializeCache(true);
 				$command->execute();
 				return true;
-			}
-			catch(Exception $e)
+			} catch(Exception $e)
 			{
 				return false;
 			}

framework/Exceptions/TErrorHandler.php

Braces +5 added lines, -10 removed lines

@@ -219,8 +219,7 @@ 
 			echo "<body><h1>Recursive Error</h1>\n";
 			echo "<pre>".$exception->__toString()."</pre>\n";
 			echo "</body></html>";
-		}
-		else
+		} else
 		{
 			error_log("Error happened while processing an existing error:\n".$exception->__toString());
 			header('HTTP/1.0 500 Internal Error');
@@ -251,15 +250,13 @@ 
 			if($fileName==='')
 				$fileName='---embedded template---';
 			$errorLine=$exception->getLineNumber();
-		}
-		else
+		} else
 		{
 			if(($trace=$this->getExactTrace($exception))!==null)
 			{
 				$fileName=$trace['file'];
 				$errorLine=$trace['line'];
-			}
-			else
+			} else
 			{
 				$fileName=$exception->getFile();
 				$errorLine=$exception->getLine();
@@ -350,8 +347,7 @@ 
 				$result=$trace[0];
 			elseif(isset($trace[1]))
 				$result=$trace[1];
-		}
-		else if($exception instanceof TInvalidOperationException)
+		} else if($exception instanceof TInvalidOperationException)
 		{
 			// in case of getter or setter error, find out the exact file and row
 			if(($result=$this->getPropertyAccessTrace($trace,'__get'))===null)
@@ -388,8 +384,7 @@ 
 			{
 				$line=htmlspecialchars(sprintf("%04d: %s",$i+1,str_replace("\t",'    ',$lines[$i])));
 				$source.="<div class=\"error\">".$line."</div>";
-			}
-			else
+			} else
 				$source.=htmlspecialchars(sprintf("%04d: %s",$i+1,str_replace("\t",'    ',$lines[$i])));
 		}
 		return $source;

framework/Security/TAuthorizationRule.php

Braces +2 added lines, -4 removed lines

@@ -94,8 +94,7 @@ 
 				{
 					$this->_everyone=true;
 					break;
-				}
-				else if($user==='?')
+				} else if($user==='?')
 					$this->_guest=true;
 				else if($user==='@')
 					$this->_authenticated=true;
@@ -269,8 +268,7 @@ 
 					return ($decision>0);
 			}
 			return true;
-		}
-		else
+		} else
 			return false;
 	}
 

framework/Security/TUserManager.php

Braces +3 added lines, -6 removed lines

@@ -113,8 +113,7 @@ 
 			{
 				$userFile = include $this->_userFile;
 				$this->loadUserDataFromPhp($userFile);
-			}
-			else
+			} else
 			{
 				$dom=new TXmlDocument;
 				$dom->loadFromFile($this->_userFile);
@@ -310,8 +309,7 @@ 
 			$user=new TUser($this);
 			$user->setIsGuest(true);
 			return $user;
-		}
-		else
+		} else
 		{
 			$username=strtolower($username);
 			if(isset($this->_users[$username]))
@@ -322,8 +320,7 @@ 
 				if(isset($this->_roles[$username]))
 					$user->setRoles($this->_roles[$username]);
 				return $user;
-			}
-			else
+			} else
 				return null;
 		}
 	}

framework/Security/TDbUserManager.php

Braces +2 added lines, -4 removed lines

@@ -123,8 +123,7 @@ 
 			$user=Prado::createComponent($this->_userClass,$this);
 			$user->setIsGuest(true);
 			return $user;
-		}
-		else
+		} else
 			return $this->_userFactory->createUser($username);
 	}
 
@@ -175,8 +174,7 @@ 
 				return $conn->getDbConnection();
 			else
 				throw new TConfigurationException('dbusermanager_connectionid_invalid',$connectionID);
-		}
-		else
+		} else
 			throw new TConfigurationException('dbusermanager_connectionid_required');
 	}