pradosoft / prado

framework/Data/SqlMap/Statements/TMappedStatement.php

Braces +13 added lines, -26 removed lines

@@ -250,8 +250,7 @@ 
 				$param = new TResultSetListItemParameter($obj, $parameter, $list);
 				$this->raiseRowDelegate($delegate, $param);
 			}
-		}
-		else
+		} else
 		{
 			//var_dump($sql,$parameter);
 			foreach($reader as $row)
@@ -327,8 +326,7 @@ 
 				$param = new TResultSetMapItemParameter($key, $value, $parameter, $map);
 				$this->raiseRowDelegate($delegate, $param);
 			}
-		}
-		else
+		} else
 		{
 			//while($row = $recordSet->fetchRow())
 			foreach($reader as $row)
@@ -354,8 +352,7 @@ 
 		if(is_string($handler))
 		{
 			call_user_func($handler, $this, $param);
-		}
-		elseif(is_callable($handler, true))
+		} elseif(is_callable($handler, true))
 		{
 			// an array: 0 - object, 1 - method name/path
 			list($object, $method) = $handler;
@@ -370,8 +367,7 @@ 
 				}
 				$object->$method($this, $param);
 			}
-		}
-		else
+		} else
 			throw new TInvalidDataValueException('sqlmap_invalid_delegate', $this->getID(), $handler);
 	}
 
@@ -533,8 +529,7 @@ 
 				if($method == self::QUERY_FOR_ARRAY)
 					$values = $values->toArray();
 				TPropertyAccess::set($resultObject, $property, $values);
-			}
-			elseif($method == self::QUERY_FOR_OBJECT)
+			} elseif($method == self::QUERY_FOR_OBJECT)
 			{
 				$value = $statement->executeQueryForObject($connection, $keys, null);
 				TPropertyAccess::set($resultObject, $property, $value);
@@ -664,8 +659,7 @@ 
 			else
 				foreach($resultMap->getColumns() as $property)
 					$this->setObjectProperty($resultMap, $property, $row, $resultObject);
-		}
-		else
+		} else
 		{
 			$resultObject = $this->fillDefaultResultMap($resultMap, $row, $resultObject);
 		}
@@ -810,8 +804,7 @@ 
 		if($key === '')
 		{
 			$resultObject = $property->getPropertyValue($registry, $row);
-		}
-		elseif(strlen($select) == 0 && ($nested === null))
+		} elseif(strlen($select) == 0 && ($nested === null))
 		{
 			$value = $property->getPropertyValue($registry, $row);
 
@@ -820,8 +813,7 @@ 
 				TPropertyAccess::set($resultObject, $key, $value);
 			else
 				$resultObject = $value;
-		}
-		elseif($nested !== null)
+		} elseif($nested !== null)
 		{
 			if($property->instanceOfListType($resultObject) || $property->instanceOfArrayType($resultObject))
 			{
@@ -829,16 +821,14 @@ 
 					throw new TSqlMapExecutionException(
 						'sqlmap_non_groupby_array_list_type', $resultMap->getID(),
 						get_class($resultObject), $key);
-			}
-			else
+			} else
 			{
 				$obj = $nested->createInstanceOfResult($this->getManager()->getTypeHandlers());
 				if($this->fillPropertyWithResultMap($nested, $row, $obj) == false)
 					$obj = null;
 				TPropertyAccess::set($resultObject, $key, $obj);
 			}
-		}
-		else //'select' ResultProperty
+		} else //'select' ResultProperty
 		{
 			$this->enquequePostSelect($select, $resultMap, $property, $row, $resultObject);
 		}
@@ -870,11 +860,9 @@ 
 				$values = TLazyLoadList::newInstance($statement, $key,
 								$resultObject, $property->getProperty());
 				TPropertyAccess::set($resultObject, $property->getProperty(), $values);
-			}
-			else
+			} else
 				$postSelect->setMethod(self::QUERY_FOR_LIST);
-		}
-		elseif($property->instanceOfArrayType($resultObject))
+		} elseif($property->instanceOfArrayType($resultObject))
 			$postSelect->setMethod(self::QUERY_FOR_ARRAY);
 		else
 			$postSelect->setMethod(self::QUERY_FOR_OBJECT);
@@ -902,8 +890,7 @@ 
 				$keys[trim($pair[0])] = $row[trim($pair[1])];
 			}
 			return $keys;
-		}
-		else
+		} else
 		{
 			$registry = $this->getManager()->getTypeHandlers();
 			return $property->getPropertyValue($registry, $row);

framework/Data/SqlMap/DataMapper/TSqlMapPagedList.php

Braces +4 added lines, -8 removed lines

@@ -135,28 +135,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([]);
 				$this->_nextPageList = null;
-			}
-			elseif($total <= $pageSize * 2)
+			} elseif($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/TDbConnection.php

Braces +2 added lines, -4 removed lines

@@ -196,8 +196,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());
 			}
@@ -350,8 +349,7 @@ 
 		{
 			$this->_pdo->beginTransaction();
 			return $this->_transaction = Prado::createComponent($this->getTransactionClass(), $this);
-		}
-		else
+		} else
 			throw new TDbException('dbconnection_connection_inactive');
 	}
 

framework/TApplication.php

Braces +6 added lines, -12 removed lines

@@ -332,8 +332,7 @@ 
 		{
 			$configFile = $basePath;
 			$basePath = dirname($configFile);
-		}
-		else
+		} else
 			$configFile = null;
 
 		// determine runtime path
@@ -353,8 +352,7 @@ 
 			}
 			$this->setBasePath($basePath);
 			$this->setRuntimePath($runtimePath);
-		}
-		else
+		} else
 			throw new TConfigurationException('application_runtimepath_invalid', $runtimePath);
 
 	}
@@ -383,8 +381,7 @@ 
 				$this->$method();
 				$this->_step++;
 			}
-		}
-		catch(\Exception $e)
+		} catch(\Exception $e)
 		{
 			$this->onError($e);
 		}
@@ -985,8 +982,7 @@ 
 				foreach($parameter[1] as $name => $value)
 					$component->setSubProperty($name, $value);
 				$this->_parameters->add($id, $component);
-			}
-			else
+			} else
 				$this->_parameters->add($id, $parameter);
 		}
 
@@ -1045,8 +1041,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);
@@ -1091,8 +1086,7 @@ 
 			}
 
 			$service->init($configElement);
-		}
-		else
+		} else
 			throw new THttpException(500, 'application_service_unknown', $serviceID);
 	}
 

framework/TComponent.php

Braces +23 added lines, -46 removed lines

@@ -550,8 +550,7 @@ 
 				}
 				if($callchain->getCount() > 0)
 					return call_user_func_array([$callchain,'call'], $args);
-			}
-			else
+			} else
 			{
 				foreach($this->_m->toArray() as $behavior)
 				{
@@ -608,29 +607,25 @@ 
 		{
 			// getting a property
 			return $this->$getter();
-		}
-		elseif(method_exists($this, $jsgetter = 'getjs' . $name))
+		} elseif(method_exists($this, $jsgetter = 'getjs' . $name))
 		{
 			// getting a javascript property
 			return (string)$this->$jsgetter();
-		}
-		elseif(strncasecmp($name, 'on', 2) === 0 && method_exists($this, $name))
+		} elseif(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];
-		}
-		elseif(strncasecmp($name, 'fx', 2) === 0)
+		} elseif(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];
-		}
-		elseif($this->_behaviorsenabled)
+		} elseif($this->_behaviorsenabled)
 		{
 			// getting a behavior property/event (handler list)
 			if(isset($this->_m[$name]))
@@ -670,18 +665,15 @@ 
 			if(strncasecmp($name, 'js', 2) === 0 && $value && !($value instanceof TJavaScriptLiteral))
 				$value = new TJavaScriptLiteral($value);
 			return $this->$setter($value);
-		}
-		elseif(method_exists($this, $jssetter = 'setjs' . $name))
+		} elseif(method_exists($this, $jssetter = 'setjs' . $name))
 		{
 			if($value && !($value instanceof TJavaScriptString))
 				$value = new TJavaScriptString($value);
 			return $this->$jssetter($value);
-		}
-		elseif((strncasecmp($name, 'on', 2) === 0 && method_exists($this, $name)) || strncasecmp($name, 'fx', 2) === 0)
+		} elseif((strncasecmp($name, 'on', 2) === 0 && method_exists($this, $name)) || strncasecmp($name, 'fx', 2) === 0)
 		{
 			return $this->attachEventHandler($name, $value);
-		}
-		elseif($this->_m !== null && $this->_m->getCount() > 0 && $this->_behaviorsenabled)
+		} elseif($this->_m !== null && $this->_m->getCount() > 0 && $this->_behaviorsenabled)
 		{
 			$sets = 0;
 			foreach($this->_m->toArray() as $behavior)
@@ -699,8 +691,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);
 		}
@@ -728,13 +719,11 @@ 
 		{
 			$name = strtolower($name);
 			return isset($this->_e[$name]) && $this->_e[$name]->getCount();
-		}
-		elseif(strncasecmp($name, 'fx', 2) === 0)
+		} elseif(strncasecmp($name, 'fx', 2) === 0)
 		{
 			$name = strtolower($name);
 			return isset(self::$_ue[$name]) && self::$_ue[$name]->getCount();
-		}
-		elseif($this->_m !== null && $this->_m->getCount() > 0 && $this->_behaviorsenabled)
+		} elseif($this->_m !== null && $this->_m->getCount() > 0 && $this->_behaviorsenabled)
 		{
 			if(isset($this->_m[$name]))
 				return true;
@@ -744,8 +733,7 @@ 
 					return isset($behavior->$name);
 			}
 
-		}
-		else
+		} else
 			return false;
 	}
 
@@ -959,15 +947,13 @@ 
 			if(!isset($this->_e[$name]))
 				$this->_e[$name] = new TPriorityList;
 			return $this->_e[$name];
-		}
-		elseif(strncasecmp($name, 'fx', 2) === 0)
+		} elseif(strncasecmp($name, 'fx', 2) === 0)
 		{
 			$name = strtolower($name);
 			if(!isset(self::$_ue[$name]))
 				self::$_ue[$name] = new TPriorityList;
 			return self::$_ue[$name];
-		}
-		elseif($this->_m !== null && $this->_behaviorsenabled)
+		} elseif($this->_m !== null && $this->_behaviorsenabled)
 		{
 			foreach($this->_m->toArray() as $behavior)
 			{
@@ -1046,8 +1032,7 @@ 
 			{
 				$this->getEventHandlers($name)->remove($handler, $priority);
 				return true;
-			}
-			catch(\Exception $e)
+			} catch(\Exception $e)
 			{
 			}
 		}
@@ -1170,14 +1155,11 @@ 
 								$response = $object->__dycall($name, [$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);
-				}
-				elseif(is_callable($handler, true))
+				} elseif(is_callable($handler, true))
 				{
 					list($object, $method) = $handler;
 					if(is_string($object))
@@ -1195,12 +1177,10 @@ 
 								$response = $object->__dycall($name, [$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);
@@ -1217,8 +1197,7 @@ 
 					$param = $response;
 
 			}
-		}
-		elseif(strncasecmp($name, 'on', 2) === 0 && !$this->hasEvent($name))
+		} elseif(strncasecmp($name, 'on', 2) === 0 && !$this->hasEvent($name))
 			throw new TInvalidOperationException('component_event_undefined', get_class($this), $name);
 
 		if($responsetype & TEventResults::EVENT_RESULT_FILTER)
@@ -1254,8 +1233,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());
 		}
@@ -1289,8 +1267,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());
 		}

bin/prado-cli.php

Braces +4 added lines, -8 removed lines

@@ -103,8 +103,7 @@ 
 			{
 				$valid |= $action->performAction($args);
 				break;
-			}
-			else
+			} else
 			{
 				$valid = false;
 			}
@@ -205,8 +204,7 @@ 
 			}
 
 			return Prado::getApplication();
-		}
-		else
+		} else
 		{
 			PradoCommandLineInterpreter::printGreeting();
 			echo '+' . str_repeat('-', 77) . "+\n";
@@ -554,8 +552,7 @@ 
 			{
 				echo '** Unable to find table or view "' . $tablename . '" in "' . $manager->getDbConnection()->getConnectionString() . "\".\n";
 				return false;
-			}
-			else
+			} else
 			{
 				$properties = [];
 				foreach($tableInfo->getColumns() as $field => $column)
@@ -699,8 +696,7 @@ 
 				$args = [$input[0],$input[1], $input[2],$app_dir,'soap'];
 			$cmd = new PradoCommandLineActiveRecordGen;
 			$cmd->performAction($args);
-		}
-		else
+		} else
 		{
 			echo "\n    Usage: generate table_name Application.pages.RecordClassName\n";
 		}