pradosoft / prado

framework/Collections/TList.php

Braces +10 added lines, -20 removed lines

@@ -155,11 +155,9 @@ 
 			{
 				array_splice($this->_d,$index,0,array($item));
 				$this->_c++;
-			}
-			else
+			} else
 				throw new TInvalidDataValueException('list_index_invalid',$index);
-		}
-		else
+		} else
 			throw new TInvalidOperationException('list_readonly',get_class($this));
 	}
 
@@ -180,11 +178,9 @@ 
 			{
 				$this->removeAt($index);
 				return $index;
-			}
-			else
+			} else
 				throw new TInvalidDataValueException('list_item_inexistent');
-		}
-		else
+		} else
 			throw new TInvalidOperationException('list_readonly',get_class($this));
 	}
 
@@ -210,11 +206,9 @@ 
 					array_splice($this->_d,$index,1);
 					return $item;
 				}
-			}
-			else
+			} else
 				throw new TInvalidDataValueException('list_index_invalid',$index);
-		}
-		else
+		} else
 			throw new TInvalidOperationException('list_readonly',get_class($this));
 	}
 
@@ -268,8 +262,7 @@ 
 			$this->insertAt($index, $item);
 
 			return $index;
-		}
-		else
+		} else
 			throw new TInvalidOperationException('list_readonly',get_class($this));
 	}
 
@@ -292,8 +285,7 @@ 
 			$this->insertAt($index + 1, $item);
 
 			return $index + 1;
-		}
-		else
+		} else
 			throw new TInvalidOperationException('list_readonly',get_class($this));
 	}
 
@@ -319,8 +311,7 @@ 
 				$this->clear();
 			foreach($data as $item)
 				$this->add($item);
-		}
-		else if($data!==null)
+		} else if($data!==null)
 			throw new TInvalidDataTypeException('list_data_not_iterable');
 	}
 
@@ -336,8 +327,7 @@ 
 		{
 			foreach($data as $item)
 				$this->add($item);
-		}
-		else if($data!==null)
+		} else if($data!==null)
 			throw new TInvalidDataTypeException('list_data_not_iterable');
 	}
 

framework/Collections/TPriorityList.php

Braces +3 added lines, -6 removed lines

@@ -384,8 +384,7 @@ 
 			}
 			$this->removeAtIndexInPriority($p[1],$p[0]);
 			return $p[2];
-		}
-		else
+		} else
 			throw new TInvalidDataValueException('list_item_inexistent');
 	}
 
@@ -670,14 +669,12 @@ 
 				foreach($data->itemsAtPriority($priority) as $index=>$item)
 					$this->insertAtIndexInPriority($item,false,$priority);
 			}
-		}
-		else if(is_array($data)||$data instanceof Traversable)
+		} else if(is_array($data)||$data instanceof Traversable)
 		{
 			foreach($data as $priority=>$item)
 				$this->add($item);
 
-		}
-		else if($data!==null)
+		} else if($data!==null)
 			throw new TInvalidDataTypeException('map_data_not_iterable');
 	}
 

framework/Collections/TStack.php

Braces +1 added lines, -2 removed lines

@@ -81,8 +81,7 @@
 				$this->_d[]=$item;
 				++$this->_c;
 			}
-		}
-		else if($data!==null)
+		} else if($data!==null)
 			throw new TInvalidDataTypeException('queue_data_not_iterable');
 	}
 

framework/Collections/TPriorityMap.php

Braces +9 added lines, -18 removed lines

@@ -360,13 +360,11 @@ 
 			if(!isset($this->_d[$priority])) {
 				$this->_d[$priority]=array($key=>$value);
 				$this->_o=false;
-			}
-			else
+			} else
 				$this->_d[$priority][$key]=$value;
 			$this->_c++;
 			$this->_fd=null;
-		}
-		else
+		} else
 			throw new TInvalidOperationException('map_readonly',get_class($this));
 		return $priority;
 	}
@@ -408,8 +406,7 @@ 
 						return $value;
 					}
 				return null;
-			}
-			else
+			} else
 			{
 				$priority=(string)round(TPropertyValue::ensureFloat($priority),$this->_p);
 				if(isset($this->_d[$priority])&&(isset($this->_d[$priority][$key])||array_key_exists($key,$this->_d[$priority])))
@@ -423,12 +420,10 @@ 
 					}
 					$this->_fd=null;
 					return $value;
-				}
-				else
+				} else
 					return null;
 			}
-		}
-		else
+		} else
 			throw new TInvalidOperationException('map_readonly',get_class($this));
 	}
 
@@ -521,15 +516,13 @@ 
 					$this->add($key,$value,$priority);
 				}
 			}
-		}
-		else if(is_array($data)||$data instanceof Traversable)
+		} else if(is_array($data)||$data instanceof Traversable)
 		{
 			if($this->getCount()>0)
 				$this->clear();
 			foreach($data as $key=>$value)
 				$this->add($key,$value);
-		}
-		else if($data!==null)
+		} else if($data!==null)
 			throw new TInvalidDataTypeException('map_data_not_iterable');
 	}
 
@@ -549,13 +542,11 @@ 
 				foreach($data->itemsAtPriority($priority) as $key => $value)
 					$this->add($key,$value,$priority);
 			}
-		}
-		else if(is_array($data)||$data instanceof Traversable)
+		} else if(is_array($data)||$data instanceof Traversable)
 		{
 			foreach($data as $key=>$value)
 				$this->add($key,$value);
-		}
-		else if($data!==null)
+		} else if($data!==null)
 			throw new TInvalidDataTypeException('map_data_not_iterable');
 	}
 

framework/Security/TDbUserManager.php

Braces +2 added lines, -4 removed lines

@@ -189,8 +189,7 @@ 
 				return file_put_contents($fileName,file_get_contents($this->_localName))!==false;
 			else
 				return false;
-		}
-		else
+		} else
 			return false;
 	}
 
@@ -211,8 +210,7 @@ 
 			$this->_errorCode=$_FILES[$key]['error'];
 			$this->_localName=$_FILES[$key]['tmp_name'];
 			return $this->_dataChanged=true;
-		}
-		else
+		} else
 			return false;
 	}
 

framework/TComponent.php

Braces +26 added lines, -52 removed lines

@@ -533,8 +533,7 @@ 
 				}
 				if($callchain->getCount()>0)
 					return call_user_func_array(array($callchain,'call'),$args);
-			}
-			else
+			} else
 			{
 				foreach($this->_m->toArray() as $behavior)
 				{
@@ -588,29 +587,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]))
@@ -650,18 +645,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)
@@ -679,8 +671,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);
 		}
@@ -708,13 +699,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;
@@ -724,8 +713,7 @@ 
 					return isset($behavior->$name);
 			}
 
-		}
-		else
+		} else
 			return false;
 	}
 
@@ -939,15 +927,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)
 			{
@@ -1026,8 +1012,7 @@ 
 			{
 				$this->getEventHandlers($name)->remove($handler,$priority);
 				return true;
-			}
-			catch(Exception $e)
+			} catch(Exception $e)
 			{
 			}
 		}
@@ -1150,14 +1135,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))
@@ -1175,12 +1157,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);
@@ -1197,8 +1177,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)
@@ -1234,8 +1213,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());
 		}
@@ -1269,8 +1247,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());
 		}
@@ -1972,11 +1949,9 @@ 
 			{
 				eval('$array=array'.$value.';');
 				return $array;
-			}
-			else
+			} else
 				return $len>0?array($value):array();
-		}
-		else
+		} else
 			return (array)$value;
 	}
 
@@ -2019,8 +1994,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/PradoBase.php

Braces +11 added lines, -22 removed lines

@@ -116,8 +116,7 @@ 
 		{
 			$am=self::$_application->getAssetManager();
 			$url=$am->publishFilePath(self::getPathOfNamespace('System.'.$logoName,'.gif'));
-		}
-		else
+		} else
 			$url='http://pradosoft.github.io/docs/'.$logoName.'.gif';
 		return '<a title="Powered by PRADO" href="https://github.com/pradosoft/prado" target="_blank"><img src="'.$url.'" style="border-width:0px;" alt="Powered by PRADO" /></a>';
 	}
@@ -169,8 +168,7 @@ 
 		if(self::$_application!==null && ($errorHandler=self::$_application->getErrorHandler())!==null)
 		{
 			$errorHandler->handleError(null,$exception);
-		}
-		else
+		} else
 		{
 			echo $exception;
 		}
@@ -259,8 +257,7 @@ 
 					return $component;
 				break;
 			}
-		}
-		else
+		} else
 			return new $type;
 	}
 
@@ -282,24 +279,21 @@ 
 			try
 			{
 				include_once($namespace.self::CLASS_FILE_EXT);
-			}
-			catch(Exception $e)
+			} catch(Exception $e)
 			{
 				if($checkClassExistence && !class_exists($namespace,false))
 					throw new TInvalidOperationException('prado_component_unknown',$namespace,$e->getMessage());
 				else
 					throw $e;
 			}
-		}
-		else if(($path=self::getPathOfNamespace($namespace,self::CLASS_FILE_EXT))!==null)
+		} else if(($path=self::getPathOfNamespace($namespace,self::CLASS_FILE_EXT))!==null)
 		{
 			$className=substr($namespace,$pos+1);
 			if($className==='*')  // a directory
 			{
 				self::$_usings[$namespace]=$path;
 				set_include_path(get_include_path().PATH_SEPARATOR.$path);
-			}
-			else  // a file
+			} else  // a file
 			{
 				self::$_usings[$namespace]=$path;
 				if(!$checkClassExistence || !class_exists($className,false))
@@ -307,8 +301,7 @@ 
 					try
 					{
 						include_once($path);
-					}
-					catch(Exception $e)
+					} catch(Exception $e)
 					{
 						if($checkClassExistence && !class_exists($className,false))
 							throw new TInvalidOperationException('prado_component_unknown',$className,$e->getMessage());
@@ -317,8 +310,7 @@ 
 					}
 				}
 			}
-		}
-		else
+		} else
 			throw new TInvalidDataValueException('prado_using_invalid',$namespace);
 	}
 
@@ -384,8 +376,7 @@ 
 				self::$_aliases[$alias]=$rp;
 			else
 				throw new TInvalidDataValueException('prado_aliasname_invalid',$alias);
-		}
-		else
+		} else
 			throw new TInvalidDataValueException('prado_alias_invalid',$alias,$path);
 	}
 
@@ -430,8 +421,7 @@ 
 							echo "'". substr($str, 0, 70) . "...'";
 						else
 							echo "'" . $str . "'";
-					}
-					else if (is_int($item) || is_float($item))
+					} else if (is_int($item) || is_float($item))
 						echo $item;
 					else if (is_object($item))
 						echo get_class($item);
@@ -526,8 +516,7 @@ 
 			if(isset($trace[0]['file']) && isset($trace[0]['line']))
 				$msg.=" (line {$trace[0]['line']}, {$trace[0]['file']})";
 			$level=TLogger::DEBUG;
-		}
-		else
+		} else
 			$level=TLogger::INFO;
 		self::log($msg,$level,$category,$ctl);
 	}

framework/I18N/core/MessageFormat.php

Braces +1 added lines, -2 removed lines

@@ -213,8 +213,7 @@
 						return 	$this->postscript[0].
 								strtr($string, $args).
 								$this->postscript[1];		
-					}
-					else
+					} else
 						return strtr($target, $args);
 				}
 			}

framework/I18N/core/MessageSource_Database.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);
 		}