pradosoft / prado

framework/TPropertyValue.php

Braces +3 added lines, -6 removed lines

@@ -123,11 +123,9 @@ 
 			{
 				eval('$array=array'.$value.';');
 				return $array;
-			}
-			else
+			} else
 				return $len>0?array($value):array();
-		}
-		else
+		} else
 			return (array)$value;
 	}
 
@@ -170,8 +168,7 @@ 
 				throw new TInvalidDataValueException(
 					'propertyvalue_enumvalue_invalid',$value,
 						implode(' | ',$types[$enums]->getConstants()));
-		}
-		else if(!is_array($enums))
+		} else if(!is_array($enums))
 		{
 			$enums=func_get_args();
 			array_shift($enums);

framework/Util/TBrowserLogRoute.php

Braces +4 added lines, -8 removed lines

@@ -42,8 +42,7 @@ 
 			{
 				$timing['delta'] = $logs[$i+1][3] - $logs[$i][3];
 				$timing['total'] = $logs[$i+1][3] - $first;
-			}
-			else
+			} else
 			{
 				$timing['delta'] = '?';
 				$timing['total'] = $logs[$i][3] - $first;
@@ -86,8 +85,7 @@ 
 		<th>Category</th><th>Message</th><th>Time Spent (s)</th><th>Cumulated Time Spent (s)</th>
 	</tr>
 EOD;
-		}
-		else
+		} else
 		{
 			$string = <<<EOD
 <table cellspacing="0" cellpadding="2" border="0" width="100%" style="table-layout:auto">
@@ -124,8 +122,7 @@ 
 		<td class="cumulatedtime">{$total}</td>
 	</tr>
 EOD;
-		}
-		else
+		} else
 		{
 			$bgcolor = $info['even'] ? "#fff" : "#eee";
 			$color = $this->getColorLevel($log[1]);
@@ -167,8 +164,7 @@ 
 			{
 				$string .= '<span class="level'.$level.'">'.strtoupper($name)."</span>";
 			}
-		}
-		else
+		} else
 		{
 			$string .= "<tr><td colspan=\"5\" style=\"text-align:center; background-color:black; border-top: 1px solid #ccc; padding:0.2em;\">";
 			foreach(self::$_levelValues as $name => $level)

framework/Util/TDbLogRoute.php

Braces +2 added lines, -4 removed lines

@@ -86,8 +86,7 @@ 
 		try
 		{
 			$db->createCommand($sql)->query()->close();
-		}
-		catch(Exception $e)
+		} catch(Exception $e)
 		{
 			// DB table not exists
 			if($this->_autoCreate)
@@ -153,8 +152,7 @@ 
 				return $config->getDbConnection();
 			else
 				throw new TConfigurationException('dblogroute_connectionid_invalid',$this->_connID);
-		}
-		else
+		} else
 		{
 			$db=new TDbConnection;
 			// default to SQLite3 database

framework/Util/TLogRouter.php

Braces +3 added lines, -6 removed lines

@@ -72,15 +72,13 @@ 
 				{
 					$phpConfig = include $this->_configFile;
 					$this->loadConfig($phpConfig);
-				}
-				else
+				} else
 				{
 					$dom=new TXmlDocument;
 					$dom->loadFromFile($this->_configFile);
 					$this->loadConfig($dom);
 				}
-			}
-			else
+			} else
 				throw new TConfigurationException('logrouter_configfile_invalid',$this->_configFile);
 		}
 		$this->loadConfig($config);
@@ -112,8 +110,7 @@ 
 					$route->init($route);
 				}
 			}
-		}
-		else
+		} else
 		{
 			foreach($config->getElementsByTagName('route') as $routeConfig)
 			{

framework/Caching/TDbCache.php

Braces +10 added lines, -20 removed lines

@@ -204,8 +204,7 @@ 
 				$this -> _createCheck = true;
 				$this -> getApplication() -> setGlobalState($key, time());
 			}
-		}
-		catch(\Exception $e)
+		} catch(\Exception $e)
 		{
 			// DB table not exists
 			if($this->_autoCreate)
@@ -228,8 +227,7 @@ 
 
 				$this -> _createCheck = true;
 				$this -> getApplication() -> setGlobalState($key, time());
-			}
-			else
+			} else
 				throw new TConfigurationException('db_cachetable_inexistent',$this->_cacheTable);
 		}
 		$this->_cacheInitialized = true;
@@ -298,8 +296,7 @@ 
 				return $config->getDbConnection();
 			else
 				throw new TConfigurationException('dbcache_connectionid_invalid',$this->_connID);
-		}
-		else
+		} else
 		{
 			$db=new TDbConnection;
 			if($this->_connectionString!=='')
@@ -309,8 +306,7 @@ 
 					$db->setUsername($this->_username);
 				if($this->_password!=='')
 					$db->setPassword($this->_password);
-			}
-			else
+			} else
 			{
 				// default to SQLite3 database
 				$dbFile=$this->getApplication()->getRuntimePath().'/sqlite3.cache';
@@ -467,8 +463,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());
@@ -511,16 +506,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;
 			}
@@ -542,8 +535,7 @@ 
 			$command->bindValue(':key',$key,\PDO::PARAM_STR);
 			$command->execute();
 			return true;
-		}
-		catch(\Exception $e)
+		} catch(\Exception $e)
 		{
 			$this->initializeCache(true);
 			$command->execute();
@@ -562,16 +554,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/Caching/TDirectoryCacheDependency.php

Braces +1 added lines, -2 removed lines

@@ -532,8 +532,7 @@
 			{
 				if(($this->_recursiveLevel<0 || $level<$this->_recursiveLevel) && $this->validateDirectory($path))
 					$timestamps=array_merge($this->generateTimestamps($path,$level+1));
-			}
-			else if($this->validateFile($path))
+			} else if($this->validateFile($path))
 				$timestamps[$path]=filemtime($path);
 		}
 		closedir($dir);

framework/TApplication.php

Braces +6 added lines, -12 removed lines

@@ -340,8 +340,7 @@ 
 		{
 			$configFile=$basePath;
 			$basePath=dirname($configFile);
-		}
-		else
+		} else
 			$configFile=null;
 
 		// determine runtime path
@@ -361,8 +360,7 @@ 
 			}
 			$this->setBasePath($basePath);
 			$this->setRuntimePath($runtimePath);
-		}
-		else
+		} else
 			throw new TConfigurationException('application_runtimepath_invalid',$runtimePath);
 
 	}
@@ -391,8 +389,7 @@ 
 				$this->$method();
 				$this->_step++;
 			}
-		}
-		catch(\Exception $e)
+		} catch(\Exception $e)
 		{
 			$this->onError($e);
 		}
@@ -993,8 +990,7 @@ 
 				foreach($parameter[1] as $name=>$value)
 					$component->setSubProperty($name,$value);
 				$this->_parameters->add($id,$component);
-			}
-			else
+			} else
 				$this->_parameters->add($id,$parameter);
 		}
 
@@ -1053,8 +1049,7 @@ 
 				$config->loadFromFile($this->_configFile);
 				if($this->_cacheFile!==null)
 					file_put_contents($this->_cacheFile,serialize($config),LOCK_EX);
-			}
-			else
+			} else
 				$config=unserialize(file_get_contents($this->_cacheFile));
 
 			$this->applyConfiguration($config,false);
@@ -1099,8 +1094,7 @@ 
 			}
 
 			$service->init($configElement);
-		}
-		else
+		} else
 			throw new THttpException(500,'application_service_unknown',$serviceID);
 	}
 

framework/TComponent.php

Braces +23 added lines, -46 removed lines

@@ -549,8 +549,7 @@ 
 				}
 				if($callchain->getCount()>0)
 					return call_user_func_array(array($callchain,'call'),$args);
-			}
-			else
+			} else
 			{
 				foreach($this->_m->toArray() as $behavior)
 				{
@@ -607,29 +606,25 @@ 
 		{
 			// getting a property
 			return $this->$getter();
-		}
-		else if(method_exists($this,$jsgetter='getjs'.$name))
+		} else if(method_exists($this,$jsgetter='getjs'.$name))
 		{
 			// getting a javascript property
 			return (string)$this->$jsgetter();
-		}
-		else if(strncasecmp($name,'on',2)===0 && method_exists($this,$name))
+		} else if(strncasecmp($name,'on',2)===0 && method_exists($this,$name))
 		{
 			// getting an event (handler list)
 			$name=strtolower($name);
 			if(!isset($this->_e[$name]))
 				$this->_e[$name]=new TPriorityList;
 			return $this->_e[$name];
-		}
-		else if(strncasecmp($name,'fx',2)===0)
+		} else if(strncasecmp($name,'fx',2)===0)
 		{
 			// getting a global event (handler list)
 			$name=strtolower($name);
 			if(!isset(self::$_ue[$name]))
 				self::$_ue[$name]=new TPriorityList;
 			return self::$_ue[$name];
-		}
-		else if($this->_behaviorsenabled)
+		} else if($this->_behaviorsenabled)
 		{
 			// getting a behavior property/event (handler list)
 			if(isset($this->_m[$name]))
@@ -669,18 +664,15 @@ 
 			if(strncasecmp($name,'js',2)===0&&$value&&!($value instanceof TJavaScriptLiteral))
 				$value = new TJavaScriptLiteral($value);
 			return $this->$setter($value);
-		}
-		else if(method_exists($this,$jssetter='setjs'.$name))
+		} else if(method_exists($this,$jssetter='setjs'.$name))
 		{
 			if($value&&!($value instanceof TJavaScriptString))
 				$value=new TJavaScriptString($value);
 			return $this->$jssetter($value);
-		}
-		else if((strncasecmp($name,'on',2)===0&&method_exists($this,$name))||strncasecmp($name,'fx',2)===0)
+		} else if((strncasecmp($name,'on',2)===0&&method_exists($this,$name))||strncasecmp($name,'fx',2)===0)
 		{
 			return $this->attachEventHandler($name,$value);
-		}
-		else if($this->_m!==null&&$this->_m->getCount()>0&&$this->_behaviorsenabled)
+		} else if($this->_m!==null&&$this->_m->getCount()>0&&$this->_behaviorsenabled)
 		{
 			$sets=0;
 			foreach($this->_m->toArray() as $behavior)
@@ -698,8 +690,7 @@ 
 		if(method_exists($this,'get'.$name)||method_exists($this,'getjs'.$name))
 		{
 			throw new TInvalidOperationException('component_property_readonly',get_class($this),$name);
-		}
-		else
+		} else
 		{
 			throw new TInvalidOperationException('component_property_undefined',get_class($this),$name);
 		}
@@ -727,13 +718,11 @@ 
 		{
 			$name=strtolower($name);
 			return isset($this->_e[$name])&&$this->_e[$name]->getCount();
-		}
-		else if(strncasecmp($name,'fx',2)===0)
+		} else if(strncasecmp($name,'fx',2)===0)
 		{
 			$name=strtolower($name);
 			return isset(self::$_ue[$name])&&self::$_ue[$name]->getCount();
-		}
-		else if($this->_m!==null&&$this->_m->getCount()>0&&$this->_behaviorsenabled)
+		} else if($this->_m!==null&&$this->_m->getCount()>0&&$this->_behaviorsenabled)
 		{
 			if(isset($this->_m[$name]))
 				return true;
@@ -743,8 +732,7 @@ 
 					return isset($behavior->$name);
 			}
 
-		}
-		else
+		} else
 			return false;
 	}
 
@@ -958,15 +946,13 @@ 
 			if(!isset($this->_e[$name]))
 				$this->_e[$name]=new TPriorityList;
 			return $this->_e[$name];
-		}
-		else if(strncasecmp($name,'fx',2)===0)
+		} else if(strncasecmp($name,'fx',2)===0)
 		{
 			$name=strtolower($name);
 			if(!isset(self::$_ue[$name]))
 				self::$_ue[$name]=new TPriorityList;
 			return self::$_ue[$name];
-		}
-		else if($this->_m!==null&&$this->_behaviorsenabled)
+		} else if($this->_m!==null&&$this->_behaviorsenabled)
 		{
 			foreach($this->_m->toArray() as $behavior)
 			{
@@ -1045,8 +1031,7 @@ 
 			{
 				$this->getEventHandlers($name)->remove($handler,$priority);
 				return true;
-			}
-			catch(\Exception $e)
+			} catch(\Exception $e)
 			{
 			}
 		}
@@ -1169,14 +1154,11 @@ 
 								$response=$object->__dycall($name,array($sender,$param,$name));
 							else
 								$response=$object->$method($sender,$param,$name);
-						}
-						else
+						} else
 							throw new TInvalidDataValueException('component_eventhandler_invalid',get_class($this),$name,$handler);
-					}
-					else
+					} else
 						$response=call_user_func($handler,$sender,$param,$name);
-				}
-				else if(is_callable($handler,true))
+				} else if(is_callable($handler,true))
 				{
 					list($object,$method)=$handler;
 					if(is_string($object))
@@ -1194,12 +1176,10 @@ 
 								$response=$object->__dycall($name,array($sender,$param,$name));
 							else
 								$response=$object->$method($sender,$param,$name);
-						}
-						else
+						} else
 							throw new TInvalidDataValueException('component_eventhandler_invalid',get_class($this),$name,$handler[1]);
 					}
-				}
-				else
+				} else
 					throw new TInvalidDataValueException('component_eventhandler_invalid',get_class($this),$name,gettype($handler));
 
 				$this->dyIntraRaiseEventPostHandler($name,$sender,$param,$handler,$response);
@@ -1216,8 +1196,7 @@ 
 					$param=$response;
 
 			}
-		}
-		else if(strncasecmp($name,'on',2)===0&&!$this->hasEvent($name))
+		} else if(strncasecmp($name,'on',2)===0&&!$this->hasEvent($name))
 			throw new TInvalidOperationException('component_event_undefined',get_class($this),$name);
 
 		if($responsetype&TEventResults::EVENT_RESULT_FILTER)
@@ -1253,8 +1232,7 @@ 
 			if(eval("\$result=$expression;")===false)
 				throw new \Exception('');
 			return $result;
-		}
-		catch(\Exception $e)
+		} catch(\Exception $e)
 		{
 			throw new TInvalidOperationException('component_expression_invalid',get_class($this),$expression,$e->getMessage());
 		}
@@ -1288,8 +1266,7 @@ 
 			$content=ob_get_contents();
 			ob_end_clean();
 			return $content;
-		}
-		catch(\Exception $e)
+		} catch(\Exception $e)
 		{
 			throw new TInvalidOperationException('component_statements_invalid',get_class($this),$statements,$e->getMessage());
 		}

framework/Web/THttpRequest.php

Braces +6 added lines, -12 removed lines

@@ -232,8 +232,7 @@ 
 				$port=$_SERVER['SERVER_PORT'];
 				if(($port!=80 && !$secure) || ($port!=443 && $secure))
 					$url.=':'.$port;
-			}
-			else
+			} else
 				$url.=$_SERVER['HTTP_HOST'];
 			$url.=$this->getRequestUri();
 			$this->_url=new TUri($url);
@@ -341,8 +340,7 @@ 
 				{
 					$this->_urlManager=new TUrlManager;
 					$this->_urlManager->init(null);
-				}
-				else
+				} else
 				{
 					$this->_urlManager=$this->getApplication()->getModule($this->_urlManagerID);
 					if($this->_urlManager===null)
@@ -462,8 +460,7 @@ 
 
 		if($result === null && function_exists('apache_request_headers')) {
 			$result = apache_request_headers();
-		}
-		elseif($result === null) {
+		} elseif($result === null) {
 			$result = array();
 			foreach($_SERVER as $key=>$value) {
 				if(strncasecmp($key, 'HTTP_', 5) !== 0) continue;
@@ -566,8 +563,7 @@ 
 		try
 		{
 			return get_browser();
-		}
-		catch(TPhpErrorException $e)
+		} catch(TPhpErrorException $e)
 		{
 			throw new TConfigurationException('httprequest_browscap_required');
 		}
@@ -670,8 +666,7 @@ 
 					if(($value=$sm->validateData($value))!==false)
 						$this->_cookies->add(new THttpCookie($key,$value));
 				}
-			}
-			else
+			} else
 			{
 				foreach($_COOKIE as $key=>$value)
 					$this->_cookies->add(new THttpCookie($key,$value));
@@ -888,8 +883,7 @@ 
 			$value=$this->_items[$key];
 			unset($this->_items[$key]);
 			return $value;
-		}
-		else
+		} else
 			return null;
 	}