pradosoft / prado

framework/Data/SqlMap/Statements/TPreparedCommand.php

Spacing +1 added lines, -1 removed lines

@@ -53,7 +53,7 @@
 		$properties = $prepared->getParameterNames(false);
 		//$parameters = $prepared->getParameterValues();
 		$registry = $manager->getTypeHandlers();
-		if ($properties)
+		if($properties)
 		for($i = 0, $k = $properties->getCount(); $i < $k; $i++)
 		{
 			$property = $statement->parameterMap()->getProperty($i);

framework/Data/SqlMap/Statements/TPostSelectBinding.php

Spacing +10 added lines, -10 removed lines

@@ -26,18 +26,18 @@
 	private $_keys;
 	private $_method = TMappedStatement::QUERY_FOR_LIST;
 
-	public function getStatement(){ return $this->_statement; }
-	public function setStatement($value){ $this->_statement = $value; }
+	public function getStatement() { return $this->_statement; }
+	public function setStatement($value) { $this->_statement = $value; }
 
-	public function getResultProperty(){ return $this->_property; }
-	public function setResultProperty($value){ $this->_property = $value; }
+	public function getResultProperty() { return $this->_property; }
+	public function setResultProperty($value) { $this->_property = $value; }
 
-	public function getResultObject(){ return $this->_resultObject; }
-	public function setResultObject($value){ $this->_resultObject = $value; }
+	public function getResultObject() { return $this->_resultObject; }
+	public function setResultObject($value) { $this->_resultObject = $value; }
 
-	public function getKeys(){ return $this->_keys; }
-	public function setKeys($value){ $this->_keys = $value; }
+	public function getKeys() { return $this->_keys; }
+	public function setKeys($value) { $this->_keys = $value; }
 
-	public function getMethod(){ return $this->_method; }
-	public function setMethod($value){ $this->_method = $value; }
+	public function getMethod() { return $this->_method; }
+	public function setMethod($value) { $this->_method = $value; }
 }
\ No newline at end of file

framework/Data/SqlMap/DataMapper/TSqlMapException.php

Braces +3 added lines, -2 removed lines

@@ -47,8 +47,9 @@
 	protected function implodeNode($node)
 	{
 		$attributes = [];
-		foreach($node->attributes() as $k => $v)
-			$attributes[] = $k . '="' . (string)$v . '"';
+		foreach($node->attributes() as $k => $v) {
+					$attributes[] = $k . '="' . (string)$v . '"';
+		}
 		return '<' . $node->getName() . ' ' . implode(' ', $attributes) . '>';
 	}
 

Spacing +2 added lines, -2 removed lines

@@ -30,7 +30,7 @@ 
 		array_shift($args);
 		$n = count($args);
 		$tokens = [];
-		for($i = 0;$i < $n;++$i)
+		for($i = 0; $i < $n; ++$i)
 		{
 			if($args[$i] instanceof SimpleXMLElement)
 				$tokens['{' . $i . '}'] = $this->implodeNode($args[$i]);
@@ -48,7 +48,7 @@ 
 	{
 		$attributes = [];
 		foreach($node->attributes() as $k => $v)
-			$attributes[] = $k . '="' . (string)$v . '"';
+			$attributes[] = $k . '="' . (string) $v . '"';
 		return '<' . $node->getName() . ' ' . implode(' ', $attributes) . '>';
 	}
 

framework/Data/SqlMap/DataMapper/TSqlMapTypeHandlerRegistry.php

Braces +3 added lines, -2 removed lines

@@ -31,9 +31,10 @@
 	 */
 	public function getDbTypeHandler($dbType = 'NULL')
 	{
-		foreach($this->_typeHandlers as $handler)
-			if($handler->getDbType() === $dbType)
+		foreach($this->_typeHandlers as $handler) {
+					if($handler->getDbType() === $dbType)
 				return $handler;
+		}
 	}
 
 	/**

framework/TApplication.php

Braces +27 added lines, -26 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);
 		}
@@ -961,16 +958,19 @@ 
 			return;
 
 		// set path aliases and using namespaces
-		foreach($config->getAliases() as $alias => $path)
-			Prado::setPathOfAlias($alias, $path);
-		foreach($config->getUsings() as $using)
-			Prado::using($using);
+		foreach($config->getAliases() as $alias => $path) {
+					Prado::setPathOfAlias($alias, $path);
+		}
+		foreach($config->getUsings() as $using) {
+					Prado::using($using);
+		}
 
 		// set application properties
 		if(!$withinService)
 		{
-			foreach($config->getProperties() as $name => $value)
-				$this->setSubProperty($name, $value);
+			foreach($config->getProperties() as $name => $value) {
+							$this->setSubProperty($name, $value);
+			}
 		}
 
 		if(empty($this->_services))
@@ -982,11 +982,11 @@ 
 			if(is_array($parameter))
 			{
 				$component = Prado::createComponent($parameter[0]);
-				foreach($parameter[1] as $name => $value)
-					$component->setSubProperty($name, $value);
+				foreach($parameter[1] as $name => $value) {
+									$component->setSubProperty($name, $value);
+				}
 				$this->_parameters->add($id, $component);
-			}
-			else
+			} else
 				$this->_parameters->add($id, $parameter);
 		}
 
@@ -1000,12 +1000,14 @@ 
 			if($module = $this->internalLoadModule($id))
 				$modules[] = $module;
 		}
-		foreach($modules as $module)
-			$module[0]->init($module[1]);
+		foreach($modules as $module) {
+					$module[0]->init($module[1]);
+		}
 
 		// load service
-		foreach($config->getServices() as $serviceID => $serviceConfig)
-			$this->_services[$serviceID] = $serviceConfig;
+		foreach($config->getServices() as $serviceID => $serviceConfig) {
+					$this->_services[$serviceID] = $serviceConfig;
+		}
 
 		// external configurations
 		foreach($config->getExternalConfigurations() as $filePath => $condition)
@@ -1045,8 +1047,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);
@@ -1077,8 +1078,9 @@ 
 			$service->setID($serviceID);
 			$this->setService($service);
 
-			foreach($initProperties as $name => $value)
-				$service->setSubProperty($name, $value);
+			foreach($initProperties as $name => $value) {
+							$service->setSubProperty($name, $value);
+			}
 
 			if($configElement !== null)
 			{
@@ -1091,8 +1093,7 @@ 
 			}
 
 			$service->init($configElement);
-		}
-		else
+		} else
 			throw new THttpException(500, 'application_service_unknown', $serviceID);
 	}
 

Spacing +6 added lines, -6 removed lines

@@ -306,7 +306,7 @@ 
 		// generates unique ID by hashing the runtime path
 		$this->_uniqueID = md5($this->_runtimePath);
 		$this->_parameters = new \Prado\Collections\TMap;
-		$this->_services = [$this->getPageServiceID() => ['TPageService',[],null]];
+		$this->_services = [$this->getPageServiceID() => ['TPageService', [], null]];
 
 		Prado::setPathOfAlias('Application', $this->_basePath);
 	}
@@ -384,7 +384,7 @@ 
 				$this->_step++;
 			}
 		}
-		catch(\Exception $e)
+		catch (\Exception $e)
 		{
 			$this->onError($e);
 		}
@@ -419,7 +419,7 @@ 
 	 */
 	public function getGlobalState($key, $defaultValue = null)
 	{
-		return isset($this->_globals[$key])?$this->_globals[$key]:$defaultValue;
+		return isset($this->_globals[$key]) ? $this->_globals[$key] : $defaultValue;
 	}
 
 	/**
@@ -948,7 +948,7 @@ 
 		// keep the key to avoid reuse of the old module id
 		$this->_lazyModules[$id] = null;
 
-		return [$module,$configElement];
+		return [$module, $configElement];
 	}
 	/**
 	 * Applies an application configuration.
@@ -974,7 +974,7 @@ 
 		}
 
 		if(empty($this->_services))
-			$this->_services = [$this->getPageServiceID() => ['Prado\Web\Services\TPageService',[],null]];
+			$this->_services = [$this->getPageServiceID() => ['Prado\Web\Services\TPageService', [], null]];
 
 		// load parameters
 		foreach($config->getParameters() as $id => $parameter)
@@ -1238,7 +1238,7 @@ 
 	public function onEndRequest()
 	{
 		$this->flushOutput(false); // flush all remaining content in the buffer
-		$this->saveGlobals();  // save global state
+		$this->saveGlobals(); // save global state
 		$this->raiseEvent('OnEndRequest', $this, null);
 	}
 }

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -379,7 +379,7 @@
 				if($this->_requestCompleted)
 					break;
 				$method = self::$_steps[$this->_step];
-				Prado::trace("Executing $method()", 'Prado\TApplication');
+				Prado::trace("executing $method()", 'Prado\TApplication');
 				$this->$method();
 				$this->_step++;
 			}

framework/TComponent.php

Braces +41 added lines, -58 removed lines

@@ -431,8 +431,9 @@ 
 
 		$fx = array_filter(get_class_methods($this), [$this,'filter_prado_fx']);
 
-		foreach($fx as $func)
-			$this->attachEventHandler($func, [$this,$func]);
+		foreach($fx as $func) {
+					$this->attachEventHandler($func, [$this,$func]);
+		}
 
 		if(is_a($this, 'Prado\\Util\\IDynamicMethods')) {
 			$this->attachEventHandler(TComponent::GLOBAL_RAISE_EVENT_LISTENER, [$this,'__dycall']);
@@ -465,8 +466,9 @@ 
 
 		$fx = array_filter(get_class_methods($this), [$this,'filter_prado_fx']);
 
-		foreach($fx as $func)
-			$this->detachEventHandler($func, [$this,$func]);
+		foreach($fx as $func) {
+					$this->detachEventHandler($func, [$this,$func]);
+		}
 
 		if(is_a($this, 'Prado\\Util\\IDynamicMethods')) {
 			$this->detachEventHandler(TComponent::GLOBAL_RAISE_EVENT_LISTENER, [$this,'__dycall']);
@@ -550,8 +552,7 @@ 
 				}
 				if($callchain->getCount() > 0)
 					return call_user_func_array([$callchain,'call'], $args);
-			}
-			else
+			} else
 			{
 				foreach($this->_m->toArray() as $behavior)
 				{
@@ -608,29 +609,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 +667,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 +693,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 +721,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 +735,7 @@ 
 					return isset($behavior->$name);
 			}
 
-		}
-		else
+		} else
 			return false;
 	}
 
@@ -862,8 +852,9 @@ 
 	public function getSubProperty($path)
 	{
 		$object = $this;
-		foreach(explode('.', $path) as $property)
-			$object = $object->$property;
+		foreach(explode('.', $path) as $property) {
+					$object = $object->$property;
+		}
 		return $object;
 	}
 
@@ -959,15 +950,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 +1035,7 @@ 
 			{
 				$this->getEventHandlers($name)->remove($handler, $priority);
 				return true;
-			}
-			catch(\Exception $e)
+			} catch(\Exception $e)
 			{
 			}
 		}
@@ -1170,14 +1158,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 +1180,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 +1200,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 +1236,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 +1270,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());
 		}
@@ -1501,9 +1481,10 @@ 
 	 */
 	public function attachBehaviors($behaviors)
 	{
-		foreach($behaviors as $name => $behavior)
-			if($behavior instanceof TClassBehaviorEventParameter)
+		foreach($behaviors as $name => $behavior) {
+					if($behavior instanceof TClassBehaviorEventParameter)
 				$this->attachBehavior($behavior->getName(), $behavior->getBehavior(), $behavior->getPriority());
+		}
 			else
 				$this->attachBehavior($name, $behavior);
 	}
@@ -1520,9 +1501,10 @@ 
 	{
 		if($this->_m !== null)
 		{
-			foreach($behaviors as $name => $behavior)
-				if($behavior instanceof TClassBehaviorEventParameter)
+			foreach($behaviors as $name => $behavior) {
+							if($behavior instanceof TClassBehaviorEventParameter)
 					$this->detachBehavior($behavior->getName(), $behavior->getPriority());
+			}
 				else
 					$this->detachBehavior(is_string($behavior)?$behavior:$name);
 		}
@@ -1536,8 +1518,9 @@ 
 	{
 		if($this->_m !== null)
 		{
-			foreach($this->_m->toArray() as $name => $behavior)
-				$this->detachBehavior($name);
+			foreach($this->_m->toArray() as $name => $behavior) {
+							$this->detachBehavior($name);
+			}
 			$this->_m = null;
 		}
 	}

Spacing +32 added lines, -32 removed lines

@@ -404,7 +404,7 @@ 
 	{
 		$class = get_class($this);
 		$classes = [$class];
-		while($class = get_parent_class($class)){array_unshift($classes, $class);}
+		while($class = get_parent_class($class)) {array_unshift($classes, $class); }
 		if($lowercase)
 			return array_map('strtolower', $classes);
 		return $classes;
@@ -429,13 +429,13 @@ 
 		if($this->_listeningenabled)
 			return;
 
-		$fx = array_filter(get_class_methods($this), [$this,'filter_prado_fx']);
+		$fx = array_filter(get_class_methods($this), [$this, 'filter_prado_fx']);
 
 		foreach($fx as $func)
-			$this->attachEventHandler($func, [$this,$func]);
+			$this->attachEventHandler($func, [$this, $func]);
 
 		if(is_a($this, 'Prado\\Util\\IDynamicMethods')) {
-			$this->attachEventHandler(TComponent::GLOBAL_RAISE_EVENT_LISTENER, [$this,'__dycall']);
+			$this->attachEventHandler(TComponent::GLOBAL_RAISE_EVENT_LISTENER, [$this, '__dycall']);
 			array_push($fx, TComponent::GLOBAL_RAISE_EVENT_LISTENER);
 		}
 
@@ -463,13 +463,13 @@ 
 		if(!$this->_listeningenabled)
 			return;
 
-		$fx = array_filter(get_class_methods($this), [$this,'filter_prado_fx']);
+		$fx = array_filter(get_class_methods($this), [$this, 'filter_prado_fx']);
 
 		foreach($fx as $func)
-			$this->detachEventHandler($func, [$this,$func]);
+			$this->detachEventHandler($func, [$this, $func]);
 
 		if(is_a($this, 'Prado\\Util\\IDynamicMethods')) {
-			$this->detachEventHandler(TComponent::GLOBAL_RAISE_EVENT_LISTENER, [$this,'__dycall']);
+			$this->detachEventHandler(TComponent::GLOBAL_RAISE_EVENT_LISTENER, [$this, '__dycall']);
 			array_push($fx, TComponent::GLOBAL_RAISE_EVENT_LISTENER);
 		}
 
@@ -525,10 +525,10 @@ 
 				if(count($args) > 0)
 					if($args[0] && !($args[0] instanceof TJavaScriptString))
 						$args[0] = new TJavaScriptString($args[0]);
-				return call_user_func_array([$this,$jsmethod], $args);
+				return call_user_func_array([$this, $jsmethod], $args);
 			}
 
-			if (($getset == 'set') && method_exists($this, 'getjs' . $propname))
+			if(($getset == 'set') && method_exists($this, 'getjs' . $propname))
 				throw new TInvalidOperationException('component_property_readonly', get_class($this), $method);
 		}
 
@@ -544,12 +544,12 @@ 
 						$behavior_args = $args;
 						if($behavior instanceof IClassBehavior)
 							array_unshift($behavior_args, $this);
-						$callchain->addCall([$behavior,$method], $behavior_args);
+						$callchain->addCall([$behavior, $method], $behavior_args);
 					}
 
 				}
 				if($callchain->getCount() > 0)
-					return call_user_func_array([$callchain,'call'], $args);
+					return call_user_func_array([$callchain, 'call'], $args);
 			}
 			else
 			{
@@ -559,7 +559,7 @@ 
 					{
 						if($behavior instanceof IClassBehavior)
 							array_unshift($args, $this);
-						return call_user_func_array([$behavior,$method], $args);
+						return call_user_func_array([$behavior, $method], $args);
 					}
 				}
 			}
@@ -569,11 +569,11 @@ 
 		{
 			if($this instanceof IDynamicMethods)
 				return $this->__dycall($method, $args);
-			return isset($args[0])?$args[0]:null;
+			return isset($args[0]) ? $args[0] : null;
 		}
 
 		// don't thrown an exception for __magicMethods() or any other weird methods natively implemented by php
-		if (!method_exists($this, $method)) {
+		if(!method_exists($this, $method)) {
 			throw new TApplicationException('component_method_undefined', get_class($this), $method);
 		}
 	}
@@ -612,7 +612,7 @@ 
 		elseif(method_exists($this, $jsgetter = 'getjs' . $name))
 		{
 			// getting a javascript property
-			return (string)$this->$jsgetter();
+			return (string) $this->$jsgetter();
 		}
 		elseif(strncasecmp($name, 'on', 2) === 0 && method_exists($this, $name))
 		{
@@ -1047,7 +1047,7 @@ 
 				$this->getEventHandlers($name)->remove($handler, $priority);
 				return true;
 			}
-			catch(\Exception $e)
+			catch (\Exception $e)
 			{
 			}
 		}
@@ -1167,7 +1167,7 @@ 
 						if(method_exists($object, $method) || strncasecmp($method, 'dy', 2) === 0 || strncasecmp($method, 'fx', 2) === 0)
 						{
 							if($method == '__dycall')
-								$response = $object->__dycall($name, [$sender,$param,$name]);
+								$response = $object->__dycall($name, [$sender, $param, $name]);
 							else
 								$response = $object->$method($sender, $param, $name);
 						}
@@ -1192,7 +1192,7 @@ 
 						if(method_exists($object, $method) || strncasecmp($method, 'dy', 2) === 0 || strncasecmp($method, 'fx', 2) === 0)
 						{
 							if($method == '__dycall')
-								$response = $object->__dycall($name, [$sender,$param,$name]);
+								$response = $object->__dycall($name, [$sender, $param, $name]);
 							else
 								$response = $object->$method($sender, $param, $name);
 						}
@@ -1206,10 +1206,10 @@ 
 				$this->dyIntraRaiseEventPostHandler($name, $sender, $param, $handler, $response);
 
 				if($postfunction)
-					$response = call_user_func_array($postfunction, [$sender,$param,$this,$response]);
+					$response = call_user_func_array($postfunction, [$sender, $param, $this, $response]);
 
 				if($responsetype & TEventResults::EVENT_RESULT_ALL)
-					$responses[] = ['sender' => $sender,'param' => $param,'response' => $response];
+					$responses[] = ['sender' => $sender, 'param' => $param, 'response' => $response];
 				else
 					$responses[] = $response;
 
@@ -1255,7 +1255,7 @@ 
 				throw new \Exception('');
 			return $result;
 		}
-		catch(\Exception $e)
+		catch (\Exception $e)
 		{
 			throw new TInvalidOperationException('component_expression_invalid', get_class($this), $expression, $e->getMessage());
 		}
@@ -1290,7 +1290,7 @@ 
 			ob_end_clean();
 			return $content;
 		}
-		catch(\Exception $e)
+		catch (\Exception $e)
 		{
 			throw new TInvalidOperationException('component_statements_invalid', get_class($this), $statements, $e->getMessage());
 		}
@@ -1407,7 +1407,7 @@ 
 			throw new TInvalidOperationException('component_class_behavior_defined', $class, $name);
 		$param = new TClassBehaviorEventParameter($class, $name, $behavior, $priority);
 		self::$_um[$class] = [$name => $param] + self::$_um[$class];
-		$behaviorObject = is_string($behavior)?new $behavior:$behavior;
+		$behaviorObject = is_string($behavior) ? new $behavior : $behavior;
 		return $behaviorObject->raiseEvent('fxAttachClassBehavior', null, $param);
 	}
 
@@ -1438,7 +1438,7 @@ 
 		$param = self::$_um[$class][$name];
 		$behavior = $param->getBehavior();
 		unset(self::$_um[$class][$name]);
-		$behaviorObject = is_string($behavior)?new $behavior:$behavior;
+		$behaviorObject = is_string($behavior) ? new $behavior : $behavior;
 		return $behaviorObject->raiseEvent('fxDetachClassBehavior', null, $param);
 	}
 
@@ -1451,7 +1451,7 @@ 
 	 */
 	public function asa($behaviorname)
 	{
-		return isset($this->_m[$behaviorname])?$this->_m[$behaviorname]:null;
+		return isset($this->_m[$behaviorname]) ? $this->_m[$behaviorname] : null;
 	}
 
 	/**
@@ -1478,7 +1478,7 @@ 
 		if($this instanceof $class)
 			return true;
 		if($this->_m !== null && $this->_behaviorsenabled)
-			foreach($this->_m->toArray() as $behavior){
+			foreach($this->_m->toArray() as $behavior) {
 				if(($behavior instanceof IBehavior) && !$behavior->getEnabled())
 					continue;
 
@@ -1524,7 +1524,7 @@ 
 				if($behavior instanceof TClassBehaviorEventParameter)
 					$this->detachBehavior($behavior->getName(), $behavior->getPriority());
 				else
-					$this->detachBehavior(is_string($behavior)?$behavior:$name);
+					$this->detachBehavior(is_string($behavior) ? $behavior : $name);
 		}
 	}
 
@@ -1678,7 +1678,7 @@ 
 	 */
 	public function enableBehavior($name)
 	{
-		if($this->_m != null && isset($this->_m[$name])){
+		if($this->_m != null && isset($this->_m[$name])) {
 			if($this->_m[$name] instanceof IBehavior) {
 				$this->_m[$name]->setEnabled(true);
 				$this->dyEnableBehavior($name, $this->_m[$name]);
@@ -1706,7 +1706,7 @@ 
 	 */
 	public function disableBehavior($name)
 	{
-		if($this->_m != null && isset($this->_m[$name])){
+		if($this->_m != null && isset($this->_m[$name])) {
 			if($this->_m[$name] instanceof IBehavior) {
 				$this->_m[$name]->setEnabled(false);
 				$this->dyDisableBehavior($name, $this->_m[$name]);
@@ -1724,7 +1724,7 @@ 
 	 */
 	public function __sleep()
 	{
-		$a = (array)$this;
+		$a = (array) $this;
 		$a = array_keys($a);
 		$exprops = [];
 		$this->_getZappableSleepProps($exprops);
@@ -1743,9 +1743,9 @@ 
 			$exprops[] = "\0Prado\TComponent\0_listeningenabled";
 		if($this->_behaviorsenabled === true)
 			$exprops[] = "\0Prado\TComponent\0_behaviorsenabled";
-		if ($this->_e === [])
+		if($this->_e === [])
 			$exprops[] = "\0Prado\TComponent\0_e";
-		if ($this->_m === null)
+		if($this->_m === null)
 			$exprops[] = "\0Prado\TComponent\0_m";
 	}
 }
\ No newline at end of file

bin/prado-cli.php

Braces +25 added lines, -22 removed lines

@@ -103,8 +103,7 @@ 
 			{
 				$valid |= $action->performAction($args);
 				break;
-			}
-			else
+			} else
 			{
 				$valid = false;
 			}
@@ -123,8 +122,9 @@ 
 		echo "usage: php prado-cli.php action <parameter> [optional]\n";
 		echo "example: php prado-cli.php -c mysite\n\n";
 		echo "actions:\n";
-		foreach($this->_actions as $action)
-			echo $action->renderHelp();
+		foreach($this->_actions as $action) {
+					echo $action->renderHelp();
+		}
 	}
 }
 
@@ -172,16 +172,19 @@ 
 	public function renderHelp()
 	{
 		$params = [];
-		foreach($this->parameters as $v)
-			$params[] = '<' . $v . '>';
+		foreach($this->parameters as $v) {
+					$params[] = '<' . $v . '>';
+		}
 		$parameters = implode($params, ' ');
 		$options = [];
-		foreach($this->optional as $v)
-			$options[] = '[' . $v . ']';
+		foreach($this->optional as $v) {
+					$options[] = '[' . $v . ']';
+		}
 		$optional = (strlen($parameters) ? ' ' : '') . implode($options, ' ');
 		$description = '';
-		foreach(explode("\n", wordwrap($this->description, 65)) as $line)
-			$description .= '    ' . $line . "\n";
+		foreach(explode("\n", wordwrap($this->description, 65)) as $line) {
+					$description .= '    ' . $line . "\n";
+		}
 		return <<<EOD
   {$this->action} {$parameters}{$optional}
 {$description}
@@ -205,8 +208,7 @@ 
 			}
 
 			return Prado::getApplication();
-		}
-		else
+		} else
 		{
 			PradoCommandLineInterpreter::printGreeting();
 			echo '+' . str_repeat('-', 77) . "+\n";
@@ -522,9 +524,10 @@ 
 		if(false !== ($app = $this->initializePradoApplication($app_dir)))
 		{
 			Prado::using('System.Data.ActiveRecord.TActiveRecordConfig');
-			foreach($app->getModules() as $module)
-				if($module instanceof TActiveRecordConfig)
+			foreach($app->getModules() as $module) {
+							if($module instanceof TActiveRecordConfig)
 					return $module;
+			}
 			echo '** Unable to find TActiveRecordConfig module in ' . $xml . "\n";
 		}
 		return false;
@@ -554,12 +557,12 @@ 
 			{
 				echo '** Unable to find table or view "' . $tablename . '" in "' . $manager->getDbConnection()->getConnectionString() . "\".\n";
 				return false;
-			}
-			else
+			} else
 			{
 				$properties = [];
-				foreach($tableInfo->getColumns() as $field => $column)
-					$properties[] = $this->generateProperty($field, $column);
+				foreach($tableInfo->getColumns() as $field => $column) {
+									$properties[] = $this->generateProperty($field, $column);
+				}
 			}
 
 			$classname = basename($output, '.php');
@@ -699,8 +702,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";
 		}
@@ -729,9 +731,10 @@ 
 			return false;
 		if (false !== ($app = $this->initializePradoApplication($app_dir))) {
 			Prado::using('System.Data.ActiveRecord.TActiveRecordConfig');
-			foreach ($app->getModules() as $module)
-				if ($module instanceof TActiveRecordConfig)
+			foreach ($app->getModules() as $module) {
+							if ($module instanceof TActiveRecordConfig)
 					return $module;
+			}
 			echo '** Unable to find TActiveRecordConfig module in ' . $xml . "\n";
 		}
 		return false;

Spacing +17 added lines, -17 removed lines

@@ -641,7 +641,7 @@ 
 		$this->_prefix = count($args) > 5 ? $args[5] : '';
 		$this->_postfix = count($args) > 6 ? $args[6] : '';
 
-		if ($app_dir !== false) {
+		if($app_dir !== false) {
 			$config = $this->getActiveRecordConfig($app_dir);
 
 			$manager = TActiveRecordManager::getInstance();
@@ -672,13 +672,13 @@ 
 			$dataReader = $command->query();
 			$dataReader->bindColumn(1, $table);
 			$tables = [];
-			while ($dataReader->read() !== false) {
+			while($dataReader->read() !== false) {
 				$tables[] = $table;
 			}
 			$con->Active = false;
-			foreach ($tables as $key => $table) {
+			foreach($tables as $key => $table) {
 				$output = $args[1] . "." . $this->_prefix . ucfirst($table) . $this->_postfix;
-				if ($config !== false && $output !== false) {
+				if($config !== false && $output !== false) {
 					$this->generate("generate " . $table . " " . $output . " " . $this->_soap . " " . $this->_overwrite);
 				}
 			}
@@ -694,9 +694,9 @@ 
 			$app_dir = '.';
 			if(Prado::getApplication() !== null)
 				$app_dir = dirname(Prado::getApplication()->getBasePath());
-			$args = [$input[0],$input[1], $input[2],$app_dir];
+			$args = [$input[0], $input[1], $input[2], $app_dir];
 			if(count($input) > 3)
-				$args = [$input[0],$input[1], $input[2],$app_dir,'soap'];
+				$args = [$input[0], $input[1], $input[2], $app_dir, 'soap'];
 			$cmd = new PradoCommandLineActiveRecordGen;
 			$cmd->performAction($args);
 		}
@@ -707,30 +707,30 @@ 
 	}
 
 	protected function getAppDir($dir = ".") {
-		if (is_dir($dir))
+		if(is_dir($dir))
 			return realpath($dir);
-		if (false !== ($app_dir = realpath($dir . '/protected/')) && is_dir($app_dir))
+		if(false !== ($app_dir = realpath($dir . '/protected/')) && is_dir($app_dir))
 			return $app_dir;
 		echo '** Unable to find directory "' . $dir . "\".\n";
 		return false;
 	}
 
 	protected function getXmlFile($app_dir) {
-		if (false !== ($xml = realpath($app_dir . '/application.xml')) && is_file($xml))
+		if(false !== ($xml = realpath($app_dir . '/application.xml')) && is_file($xml))
 			return $xml;
-		if (false !== ($xml = realpath($app_dir . '/protected/application.xml')) && is_file($xml))
+		if(false !== ($xml = realpath($app_dir . '/protected/application.xml')) && is_file($xml))
 			return $xml;
 		echo '** Unable to find application.xml in ' . $app_dir . "\n";
 		return false;
 	}
 
 	protected function getActiveRecordConfig($app_dir) {
-		if (false === ($xml = $this->getXmlFile($app_dir)))
+		if(false === ($xml = $this->getXmlFile($app_dir)))
 			return false;
-		if (false !== ($app = $this->initializePradoApplication($app_dir))) {
+		if(false !== ($app = $this->initializePradoApplication($app_dir))) {
 			Prado::using('System.Data.ActiveRecord.TActiveRecordConfig');
-			foreach ($app->getModules() as $module)
-				if ($module instanceof TActiveRecordConfig)
+			foreach($app->getModules() as $module)
+				if($module instanceof TActiveRecordConfig)
 					return $module;
 			echo '** Unable to find TActiveRecordConfig module in ' . $xml . "\n";
 		}
@@ -738,11 +738,11 @@ 
 	}
 
 	protected function getOutputFile($app_dir, $namespace) {
-		if (is_file($namespace) && strpos($namespace, $app_dir) === 0)
+		if(is_file($namespace) && strpos($namespace, $app_dir) === 0)
 			return $namespace;
 		$file = Prado::getPathOfNamespace($namespace, "");
-		if ($file !== null && false !== ($path = realpath(dirname($file))) && is_dir($path)) {
-			if (strpos($path, $app_dir) === 0)
+		if($file !== null && false !== ($path = realpath(dirname($file))) && is_dir($path)) {
+			if(strpos($path, $app_dir) === 0)
 				return $file;
 		}
 		echo '** Output file ' . $file . ' must be within directory ' . $app_dir . "\n";

Upper-Lower-Casing +5 added lines, -5 removed lines

@@ -186,7 +186,7 @@ 
   {$this->action} {$parameters}{$optional}
 {$description}
 
-EOD;
+eod;
 	}
 
 	protected function initializePradoApplication($directory)
@@ -344,7 +344,7 @@ 
   </parameters>
   -->
 </application>
-EOD;
+eod;
 	}
 
 	protected function renderHtaccessFile()
@@ -364,7 +364,7 @@ 
 <h1>Welcome to PRADO!</h1>
 </body>
 </html>
-EOD;
+eod;
 	}
 }
 
@@ -585,7 +585,7 @@ 
 	 * @soapproperty
 	 */
 
-EOD;
+eod;
 		}
 		$prop .= "\tpublic $name;";
 		return $prop;
@@ -612,7 +612,7 @@ 
 	}
 }
 
-EOD;
+eod;
 	}
 }
 

framework/Wsat/TWsatScaffoldingGenerator.php

Spacing +7 added lines, -7 removed lines

@@ -49,7 +49,7 @@ 
 	// <editor-fold defaultstate="collapsed" desc="Page Generation">
 	public function generate($tableName, $viewType)
 	{
-		switch ($viewType)
+		switch($viewType)
 		{
 			default:
 			case self::LIST_TYPE:
@@ -90,21 +90,21 @@ 
 	{
 		$code = "";
 		$tableInfo = $this->_dbMetaData->getTableInfo($tableName);
-		switch ($type)
+		switch($type)
 		{
 			case self::LIST_TYPE:
 				break;
 			case self::ADD_TYPE:
-				foreach ($tableInfo->getColumns() as $colField => $colMetadata)
+				foreach($tableInfo->getColumns() as $colField => $colMetadata)
 				{
-					if (!$colMetadata->IsPrimaryKey && !$colMetadata->IsForeignKey)
+					if(!$colMetadata->IsPrimaryKey && !$colMetadata->IsForeignKey)
 					{
 						$code .= $this->generateControl($colMetadata);
 						$code .= $this->generateValidators($colMetadata);
 						$code .= "\n";
 					}
 				}
-				foreach ($tableInfo->getForeignKeys() as $colField => $colMetadata)
+				foreach($tableInfo->getForeignKeys() as $colField => $colMetadata)
 				{
 					$colField = $this->eq($colMetadata["table"]);
 					$code .= "\t<com:TTextBox ID=$colField />\n";
@@ -122,7 +122,7 @@ 
 	private function generateControl($colMetadata)
 	{
 		$controlType = "TTextBox";
-		switch ($colMetadata->DbType)
+		switch($colMetadata->DbType)
 		{
 
 		}
@@ -134,7 +134,7 @@ 
 	{
 		$controlId = $colMetadata->ColumnId;
 		$code = "";
-		if (!$colMetadata->AllowNull)
+		if(!$colMetadata->AllowNull)
 		{
 			$code .= "\t<com:TRequiredFieldValidator ControlToValidate=$controlId ValidationGroup=\"addGroup\" Text=\"Field $controlId is required.\" Display=\"Dynamic\" />\n";
 		}

Upper-Lower-Casing +2 added lines, -2 removed lines

@@ -83,7 +83,7 @@ 
        $pageContent
 
 </com:TContent>
-EOD;
+eod;
 	}
 
 	private function getPageContent($tableName, $type)
@@ -158,7 +158,7 @@ 
 {
 
 }
-EOD;
+eod;
 	}
 
 // </editor-fold>

framework/Wsat/TWsatBaseGenerator.php

Spacing +5 added lines, -5 removed lines

@@ -33,7 +33,7 @@ 
 
 	public function __construct()
 	{
-		if (!class_exists("TActiveRecordManager", false))
+		if(!class_exists("TActiveRecordManager", false))
 			throw new Exception("You need to enable the ActiveRecord module in your application configuration file.");
 		$ar_manager = TActiveRecordManager::getInstance();
 		$_conn = $ar_manager->getDbConnection();
@@ -44,16 +44,16 @@ 
 	public function setOpFile($op_file_namespace)
 	{
 		$op_file = Prado::getPathOfNamespace($op_file_namespace);
-		if (empty($op_file))
+		if(empty($op_file))
 			throw new Exception("You need to fix your output folder namespace.");
-		if (!is_dir($op_file))
+		if(!is_dir($op_file))
 			mkdir($op_file, 0777, true);
 		$this->_opFile = $op_file;
 	}
 
 	public function renderAllTablesInformation()
 	{
-		foreach ($this->getAllTableNames() as $table_name)
+		foreach($this->getAllTableNames() as $table_name)
 		{
 			echo $table_name . "<br>";
 			$tableInfo = $this->_dbMetaData->getTableInfo($table_name);
@@ -68,7 +68,7 @@ 
 	{
 		$tableNames = $this->_dbMetaData->findTableNames();
 		$index = array_search('pradocache', $tableNames);
-		if ($index)
+		if($index)
 			array_splice($tableNames, $index, 1);
 		return $tableNames;
 	}