pradosoft / prado

framework/Util/TCallChain.php

Spacing +9 added lines, -9 removed lines

@@ -50,7 +50,7 @@ 
 	 */
 	public function addCall($method, $args)
 	{
-		$this->add([$method,$args]);
+		$this->add([$method, $args]);
 	}
 
 	/**
@@ -95,25 +95,25 @@ 
 	public function call()
 	{
 		$args = func_get_args();
-		if($this->getCount() === 0)
-			return isset($args[0])?$args[0]:null;
+		if ($this->getCount() === 0)
+			return isset($args[0]) ? $args[0] : null;
 
-		if(!$this->_iterator)
+		if (!$this->_iterator)
 		{
 			$chain_array = array_reverse($this->toArray());
 			$this->_iterator = new \ArrayIterator($chain_array);
 		}
-		if($this->_iterator->valid())
+		if ($this->_iterator->valid())
 			do {
 				$handler = $this->_iterator->current();
 				$this->_iterator->next();
-				if(is_array($handler[0]) && $handler[0][0] instanceof IClassBehavior)
+				if (is_array($handler[0]) && $handler[0][0] instanceof IClassBehavior)
 					array_splice($handler[1], 1, count($args), $args);
 				else
 					array_splice($handler[1], 0, count($args), $args);
 				$handler[1][] = $this;
 				$result = call_user_func_array($handler[0], $handler[1]);
-			} while($this->_iterator->valid());
+			} while ($this->_iterator->valid());
 		else
 			$result = $args[0];
 		return $result;
@@ -143,8 +143,8 @@ 
 	 */
 	public function __dycall($method, $args)
 	{
-		if($this->_method == $method)
-			return call_user_func_array([$this,'call'], $args);
+		if ($this->_method == $method)
+			return call_user_func_array([$this, 'call'], $args);
 		return null;
 	}
 }
\ No newline at end of file

Braces +17 added lines, -12 removed lines

@@ -95,27 +95,31 @@ 
 	public function call()
 	{
 		$args = func_get_args();
-		if($this->getCount() === 0)
-			return isset($args[0])?$args[0]:null;
+		if($this->getCount() === 0) {
+					return isset($args[0])?$args[0]:null;
+		}
 
 		if(!$this->_iterator)
 		{
 			$chain_array = array_reverse($this->toArray());
 			$this->_iterator = new \ArrayIterator($chain_array);
 		}
-		if($this->_iterator->valid())
-			do {
+		if($this->_iterator->valid()) {
+					do {
 				$handler = $this->_iterator->current();
+		}
 				$this->_iterator->next();
-				if(is_array($handler[0]) && $handler[0][0] instanceof IClassBehavior)
-					array_splice($handler[1], 1, count($args), $args);
-				else
-					array_splice($handler[1], 0, count($args), $args);
+				if(is_array($handler[0]) && $handler[0][0] instanceof IClassBehavior) {
+									array_splice($handler[1], 1, count($args), $args);
+				} else {
+									array_splice($handler[1], 0, count($args), $args);
+				}
 				$handler[1][] = $this;
 				$result = call_user_func_array($handler[0], $handler[1]);
 			} while($this->_iterator->valid());
-		else
-			$result = $args[0];
+		else {
+					$result = $args[0];
+		}
 		return $result;
 	}
 
@@ -143,8 +147,9 @@ 
 	 */
 	public function __dycall($method, $args)
 	{
-		if($this->_method == $method)
-			return call_user_func_array([$this,'call'], $args);
+		if($this->_method == $method) {
+					return call_user_func_array([$this,'call'], $args);
+		}
 		return null;
 	}
 }
\ No newline at end of file

framework/Util/TVarDumper.php

Spacing +19 added lines, -19 removed lines

@@ -48,9 +48,9 @@ 
 		self::$_objects = [];
 		self::$_depth = $depth;
 		self::dumpInternal($var, 0);
-		if($highlight)
+		if ($highlight)
 		{
-			$result = highlight_string("<?php\n" . self::$_output, true);
+			$result = highlight_string("<?php\n".self::$_output, true);
 			return preg_replace('/&lt;\\?php<br \\/>/', '', $result, 1);
 		}
 		else
@@ -59,10 +59,10 @@ 
 
 	private static function dumpInternal($var, $level)
 	{
-		switch(gettype($var))
+		switch (gettype($var))
 		{
 			case 'boolean':
-				self::$_output .= $var?'true':'false';
+				self::$_output .= $var ? 'true' : 'false';
 				break;
 			case 'integer':
 				self::$_output .= "$var";
@@ -83,43 +83,43 @@ 
 				self::$_output .= '{unknown}';
 				break;
 			case 'array':
-				if(self::$_depth <= $level)
+				if (self::$_depth <= $level)
 					self::$_output .= 'array(...)';
-				elseif(empty($var))
+				elseif (empty($var))
 					self::$_output .= 'array()';
 				else
 				{
 					$keys = array_keys($var);
 					$spaces = str_repeat(' ', $level * 4);
-					self::$_output .= "array\n" . $spaces . '(';
-					foreach($keys as $key)
+					self::$_output .= "array\n".$spaces.'(';
+					foreach ($keys as $key)
 					{
-						self::$_output .= "\n" . $spaces . "    [$key] => ";
+						self::$_output .= "\n".$spaces."    [$key] => ";
 						self::$_output .= self::dumpInternal($var[$key], $level + 1);
 					}
-					self::$_output .= "\n" . $spaces . ')';
+					self::$_output .= "\n".$spaces.')';
 				}
 				break;
 			case 'object':
-				if(($id = array_search($var, self::$_objects, true)) !== false)
-					self::$_output .= get_class($var) . '#' . ($id + 1) . '(...)';
-				elseif(self::$_depth <= $level)
-					self::$_output .= get_class($var) . '(...)';
+				if (($id = array_search($var, self::$_objects, true)) !== false)
+					self::$_output .= get_class($var).'#'.($id + 1).'(...)';
+				elseif (self::$_depth <= $level)
+					self::$_output .= get_class($var).'(...)';
 				else
 				{
 					$id = array_push(self::$_objects, $var);
 					$className = get_class($var);
-					$members = (array)$var;
+					$members = (array) $var;
 					$keys = array_keys($members);
 					$spaces = str_repeat(' ', $level * 4);
-					self::$_output .= "$className#$id\n" . $spaces . '(';
-					foreach($keys as $key)
+					self::$_output .= "$className#$id\n".$spaces.'(';
+					foreach ($keys as $key)
 					{
 						$keyDisplay = strtr(trim($key), ["\0" => ':']);
-						self::$_output .= "\n" . $spaces . "    [$keyDisplay] => ";
+						self::$_output .= "\n".$spaces."    [$keyDisplay] => ";
 						self::$_output .= self::dumpInternal($members[$key], $level + 1);
 					}
-					self::$_output .= "\n" . $spaces . ')';
+					self::$_output .= "\n".$spaces.')';
 				}
 				break;
 		}

Braces +12 added lines, -12 removed lines

@@ -52,9 +52,9 @@ 
 		{
 			$result = highlight_string("<?php\n" . self::$_output, true);
 			return preg_replace('/&lt;\\?php<br \\/>/', '', $result, 1);
+		} else {
+					return self::$_output;
 		}
-		else
-			return self::$_output;
 	}
 
 	private static function dumpInternal($var, $level)
@@ -83,11 +83,11 @@ 
 				self::$_output .= '{unknown}';
 				break;
 			case 'array':
-				if(self::$_depth <= $level)
-					self::$_output .= 'array(...)';
-				elseif(empty($var))
-					self::$_output .= 'array()';
-				else
+				if(self::$_depth <= $level) {
+									self::$_output .= 'array(...)';
+				} elseif(empty($var)) {
+									self::$_output .= 'array()';
+				} else
 				{
 					$keys = array_keys($var);
 					$spaces = str_repeat(' ', $level * 4);
@@ -101,11 +101,11 @@ 
 				}
 				break;
 			case 'object':
-				if(($id = array_search($var, self::$_objects, true)) !== false)
-					self::$_output .= get_class($var) . '#' . ($id + 1) . '(...)';
-				elseif(self::$_depth <= $level)
-					self::$_output .= get_class($var) . '(...)';
-				else
+				if(($id = array_search($var, self::$_objects, true)) !== false) {
+									self::$_output .= get_class($var) . '#' . ($id + 1) . '(...)';
+				} elseif(self::$_depth <= $level) {
+									self::$_output .= get_class($var) . '(...)';
+				} else
 				{
 					$id = array_push(self::$_objects, $var);
 					$className = get_class($var);

framework/Util/TDataFieldAccessor.php

Spacing +8 added lines, -8 removed lines

@@ -57,9 +57,9 @@ 
 	{
 		try
 		{
-			if(is_array($data) || ($data instanceof \ArrayAccess))
+			if (is_array($data) || ($data instanceof \ArrayAccess))
 			{
-				if(isset($data[$field]))
+				if (isset($data[$field]))
 					return $data[$field];
 
 				$tmp = $data;
@@ -67,25 +67,25 @@ 
 					$tmp = $tmp[$f];
 				return $tmp;
 			}
-			elseif(is_object($data))
+			elseif (is_object($data))
 			{
-				if(strpos($field, '.') === false)  // simple field
+				if (strpos($field, '.') === false)  // simple field
 				{
-					if(method_exists($data, 'get' . $field))
-						return call_user_func([$data,'get' . $field]);
+					if (method_exists($data, 'get'.$field))
+						return call_user_func([$data, 'get'.$field]);
 					else
 						return $data->{$field};
 				}
 				else // field in the format of xxx.yyy.zzz
 				{
 					$object = $data;
-					foreach(explode('.', $field) as $f)
+					foreach (explode('.', $field) as $f)
 						$object = TDataFieldAccessor::getDataFieldValue($object, $f);
 					return $object;
 				}
 			}
 		}
-		catch(Exception $e)
+		catch (Exception $e)
 		{
 			throw new TInvalidDataValueException('datafieldaccessor_datafield_invalid', $field, $e->getMessage());
 		}

Braces +17 added lines, -15 removed lines

@@ -59,33 +59,35 @@
 		{
 			if(is_array($data) || ($data instanceof \ArrayAccess))
 			{
-				if(isset($data[$field]))
-					return $data[$field];
+				if(isset($data[$field])) {
+									return $data[$field];
+				}
 
 				$tmp = $data;
-				foreach (explode(".", $field) as $f)
-					$tmp = $tmp[$f];
+				foreach (explode(".", $field) as $f) {
+									$tmp = $tmp[$f];
+				}
 				return $tmp;
-			}
-			elseif(is_object($data))
+			} elseif(is_object($data))
 			{
-				if(strpos($field, '.') === false)  // simple field
+				if(strpos($field, '.') === false) {
+					// simple field
 				{
 					if(method_exists($data, 'get' . $field))
 						return call_user_func([$data,'get' . $field]);
-					else
-						return $data->{$field};
-				}
-				else // field in the format of xxx.yyy.zzz
+				} else {
+											return $data->{$field};
+					}
+				} else // field in the format of xxx.yyy.zzz
 				{
 					$object = $data;
-					foreach(explode('.', $field) as $f)
-						$object = TDataFieldAccessor::getDataFieldValue($object, $f);
+					foreach(explode('.', $field) as $f) {
+											$object = TDataFieldAccessor::getDataFieldValue($object, $f);
+					}
 					return $object;
 				}
 			}
-		}
-		catch(Exception $e)
+		} catch(Exception $e)
 		{
 			throw new TInvalidDataValueException('datafieldaccessor_datafield_invalid', $field, $e->getMessage());
 		}

framework/Util/TXmlRpcClient.php

Spacing +3 added lines, -3 removed lines

@@ -44,15 +44,15 @@
 		$_response = $this->performRequest($this->getServerUrl(), $this->encodeRequest($method, $parameters), 'text/xml');
 
 		// skip response handling if the request was just a notification request
-		if($this->isNotification)
+		if ($this->isNotification)
 			return true;
 
 		// decode response
-		if(($_response = xmlrpc_decode($_response)) === null)
+		if (($_response = xmlrpc_decode($_response)) === null)
 			throw new TRpcClientResponseException('Empty response received');
 
 		// handle error response
-		if(xmlrpc_is_fault($_response))
+		if (xmlrpc_is_fault($_response))
 			throw new TRpcClientResponseException($_response['faultString'], $_response['faultCode']);
 
 		return $_response;

Braces +9 added lines, -6 removed lines

@@ -44,16 +44,19 @@
 		$_response = $this->performRequest($this->getServerUrl(), $this->encodeRequest($method, $parameters), 'text/xml');
 
 		// skip response handling if the request was just a notification request
-		if($this->isNotification)
-			return true;
+		if($this->isNotification) {
+					return true;
+		}
 
 		// decode response
-		if(($_response = xmlrpc_decode($_response)) === null)
-			throw new TRpcClientResponseException('Empty response received');
+		if(($_response = xmlrpc_decode($_response)) === null) {
+					throw new TRpcClientResponseException('Empty response received');
+		}
 
 		// handle error response
-		if(xmlrpc_is_fault($_response))
-			throw new TRpcClientResponseException($_response['faultString'], $_response['faultCode']);
+		if(xmlrpc_is_fault($_response)) {
+					throw new TRpcClientResponseException($_response['faultString'], $_response['faultCode']);
+		}
 
 		return $_response;
 	}

framework/Util/TLogger.php

Spacing +28 added lines, -28 removed lines

@@ -69,14 +69,14 @@ 
 	 */
 	public function log($message, $level, $category = 'Uncategorized', $ctl = null)
 	{
-		if($ctl) {
-			if($ctl instanceof TControl)
+		if ($ctl) {
+			if ($ctl instanceof TControl)
 				$ctl = $ctl->ClientId;
-			elseif(!is_string($ctl))
+			elseif (!is_string($ctl))
 				$ctl = null;
 		} else
 			$ctl = null;
-		$this->_logs[] = [$message,$level,$category,microtime(true),memory_get_usage(),$ctl];
+		$this->_logs[] = [$message, $level, $category, microtime(true), memory_get_usage(), $ctl];
 	}
 
 	/**
@@ -118,17 +118,17 @@ 
 		$this->_categories = $categories;
 		$this->_controls = $controls;
 		$this->_timestamp = $timestamp;
-		if(empty($levels) && empty($categories) && empty($controls) && null === $timestamp)
+		if (empty($levels) && empty($categories) && empty($controls) && null === $timestamp)
 			return $this->_logs;
 		$logs = $this->_logs;
-		if(!empty($levels))
-			$logs = array_values(array_filter(array_filter($logs, [$this,'filterByLevels'])));
-		if(!empty($categories))
-			$logs = array_values(array_filter(array_filter($logs, [$this,'filterByCategories'])));
-		if(!empty($controls))
-			$logs = array_values(array_filter(array_filter($logs, [$this,'filterByControl'])));
-		if(null !== $timestamp)
-			$logs = array_values(array_filter(array_filter($logs, [$this,'filterByTimeStamp'])));
+		if (!empty($levels))
+			$logs = array_values(array_filter(array_filter($logs, [$this, 'filterByLevels'])));
+		if (!empty($categories))
+			$logs = array_values(array_filter(array_filter($logs, [$this, 'filterByCategories'])));
+		if (!empty($controls))
+			$logs = array_values(array_filter(array_filter($logs, [$this, 'filterByControl'])));
+		if (null !== $timestamp)
+			$logs = array_values(array_filter(array_filter($logs, [$this, 'filterByTimeStamp'])));
 		return $logs;
 	}
 
@@ -162,20 +162,20 @@ 
 		$this->_categories = $categories;
 		$this->_controls = $controls;
 		$this->_timestamp = $timestamp;
-		if(empty($levels) && empty($categories) && empty($controls) && null === $timestamp)
+		if (empty($levels) && empty($categories) && empty($controls) && null === $timestamp)
 		{
 			$this->_logs = [];
 			return;
 		}
 		$logs = $this->_logs;
-		if(!empty($levels))
-			$logs = array_filter(array_filter($logs, [$this,'filterByLevels']));
-		if(!empty($categories))
-			$logs = array_filter(array_filter($logs, [$this,'filterByCategories']));
-		if(!empty($controls))
-			$logs = array_filter(array_filter($logs, [$this,'filterByControl']));
-		if(null !== $timestamp)
-			$logs = array_filter(array_filter($logs, [$this,'filterByTimeStamp']));
+		if (!empty($levels))
+			$logs = array_filter(array_filter($logs, [$this, 'filterByLevels']));
+		if (!empty($categories))
+			$logs = array_filter(array_filter($logs, [$this, 'filterByCategories']));
+		if (!empty($controls))
+			$logs = array_filter(array_filter($logs, [$this, 'filterByControl']));
+		if (null !== $timestamp)
+			$logs = array_filter(array_filter($logs, [$this, 'filterByTimeStamp']));
 		$this->_logs = array_values(array_diff_key($this->_logs, $logs));
 	}
 
@@ -185,10 +185,10 @@ 
 	 */
 	private function filterByCategories($value)
 	{
-		foreach($this->_categories as $category)
+		foreach ($this->_categories as $category)
 		{
 			// element 2 is the category
-			if($value[2] === $category || strpos($value[2], $category . '.') === 0)
+			if ($value[2] === $category || strpos($value[2], $category.'.') === 0)
 				return $value;
 		}
 		return false;
@@ -201,7 +201,7 @@ 
 	private function filterByLevels($value)
 	{
 		// element 1 are the levels
-		if($value[1] & $this->_levels)
+		if ($value[1] & $this->_levels)
 			return $value;
 		else
 			return false;
@@ -214,9 +214,9 @@ 
 	private function filterByControl($value)
 	{
 		// element 5 are the control client ids
-		foreach($this->_controls as $control)
+		foreach ($this->_controls as $control)
 		{
-			if($value[5] === $control || strpos($value[5], $control) === 0)
+			if ($value[5] === $control || strpos($value[5], $control) === 0)
 				return $value;
 		}
 		return false;
@@ -229,7 +229,7 @@ 
 	private function filterByTimeStamp($value)
 	{
 		// element 3 is the timestamp
-		if($value[3] <= $this->_timestamp)
+		if ($value[3] <= $this->_timestamp)
 			return $value;
 		else
 			return false;

Braces +51 added lines, -36 removed lines

@@ -70,12 +70,14 @@ 
 	public function log($message, $level, $category = 'Uncategorized', $ctl = null)
 	{
 		if($ctl) {
-			if($ctl instanceof TControl)
-				$ctl = $ctl->ClientId;
-			elseif(!is_string($ctl))
-				$ctl = null;
-		} else
-			$ctl = null;
+			if($ctl instanceof TControl) {
+							$ctl = $ctl->ClientId;
+			} elseif(!is_string($ctl)) {
+							$ctl = null;
+			}
+		} else {
+					$ctl = null;
+		}
 		$this->_logs[] = [$message,$level,$category,microtime(true),memory_get_usage(),$ctl];
 	}
 
@@ -118,17 +120,22 @@ 
 		$this->_categories = $categories;
 		$this->_controls = $controls;
 		$this->_timestamp = $timestamp;
-		if(empty($levels) && empty($categories) && empty($controls) && null === $timestamp)
-			return $this->_logs;
+		if(empty($levels) && empty($categories) && empty($controls) && null === $timestamp) {
+					return $this->_logs;
+		}
 		$logs = $this->_logs;
-		if(!empty($levels))
-			$logs = array_values(array_filter(array_filter($logs, [$this,'filterByLevels'])));
-		if(!empty($categories))
-			$logs = array_values(array_filter(array_filter($logs, [$this,'filterByCategories'])));
-		if(!empty($controls))
-			$logs = array_values(array_filter(array_filter($logs, [$this,'filterByControl'])));
-		if(null !== $timestamp)
-			$logs = array_values(array_filter(array_filter($logs, [$this,'filterByTimeStamp'])));
+		if(!empty($levels)) {
+					$logs = array_values(array_filter(array_filter($logs, [$this,'filterByLevels'])));
+		}
+		if(!empty($categories)) {
+					$logs = array_values(array_filter(array_filter($logs, [$this,'filterByCategories'])));
+		}
+		if(!empty($controls)) {
+					$logs = array_values(array_filter(array_filter($logs, [$this,'filterByControl'])));
+		}
+		if(null !== $timestamp) {
+					$logs = array_values(array_filter(array_filter($logs, [$this,'filterByTimeStamp'])));
+		}
 		return $logs;
 	}
 
@@ -168,14 +175,18 @@ 
 			return;
 		}
 		$logs = $this->_logs;
-		if(!empty($levels))
-			$logs = array_filter(array_filter($logs, [$this,'filterByLevels']));
-		if(!empty($categories))
-			$logs = array_filter(array_filter($logs, [$this,'filterByCategories']));
-		if(!empty($controls))
-			$logs = array_filter(array_filter($logs, [$this,'filterByControl']));
-		if(null !== $timestamp)
-			$logs = array_filter(array_filter($logs, [$this,'filterByTimeStamp']));
+		if(!empty($levels)) {
+					$logs = array_filter(array_filter($logs, [$this,'filterByLevels']));
+		}
+		if(!empty($categories)) {
+					$logs = array_filter(array_filter($logs, [$this,'filterByCategories']));
+		}
+		if(!empty($controls)) {
+					$logs = array_filter(array_filter($logs, [$this,'filterByControl']));
+		}
+		if(null !== $timestamp) {
+					$logs = array_filter(array_filter($logs, [$this,'filterByTimeStamp']));
+		}
 		$this->_logs = array_values(array_diff_key($this->_logs, $logs));
 	}
 
@@ -188,8 +199,9 @@ 
 		foreach($this->_categories as $category)
 		{
 			// element 2 is the category
-			if($value[2] === $category || strpos($value[2], $category . '.') === 0)
-				return $value;
+			if($value[2] === $category || strpos($value[2], $category . '.') === 0) {
+							return $value;
+			}
 		}
 		return false;
 	}
@@ -201,10 +213,11 @@ 
 	private function filterByLevels($value)
 	{
 		// element 1 are the levels
-		if($value[1] & $this->_levels)
-			return $value;
-		else
-			return false;
+		if($value[1] & $this->_levels) {
+					return $value;
+		} else {
+					return false;
+		}
 	}
 
 	/**
@@ -216,8 +229,9 @@ 
 		// element 5 are the control client ids
 		foreach($this->_controls as $control)
 		{
-			if($value[5] === $control || strpos($value[5], $control) === 0)
-				return $value;
+			if($value[5] === $control || strpos($value[5], $control) === 0) {
+							return $value;
+			}
 		}
 		return false;
 	}
@@ -229,10 +243,11 @@ 
 	private function filterByTimeStamp($value)
 	{
 		// element 3 is the timestamp
-		if($value[3] <= $this->_timestamp)
-			return $value;
-		else
-			return false;
+		if($value[3] <= $this->_timestamp) {
+					return $value;
+		} else {
+					return false;
+		}
 	}
 }
 

framework/Util/TSimpleDateFormatter.php

Spacing +38 added lines, -38 removed lines

@@ -127,31 +127,31 @@ 
 
 	public function getMonthPattern()
 	{
-		if(is_int(strpos($this->pattern, 'MMMM')))
+		if (is_int(strpos($this->pattern, 'MMMM')))
 			return 'MMMM';
-		if(is_int(strpos($this->pattern, 'MMM')))
+		if (is_int(strpos($this->pattern, 'MMM')))
 			return 'MMM';
-		if(is_int(strpos($this->pattern, 'MM')))
+		if (is_int(strpos($this->pattern, 'MM')))
 			return 'MM';
-		if(is_int(strpos($this->pattern, 'M')))
+		if (is_int(strpos($this->pattern, 'M')))
 			return 'M';
 		return false;
 	}
 
 	public function getDayPattern()
 	{
-		if(is_int(strpos($this->pattern, 'dd')))
+		if (is_int(strpos($this->pattern, 'dd')))
 			return 'dd';
-		if(is_int(strpos($this->pattern, 'd')))
+		if (is_int(strpos($this->pattern, 'd')))
 			return 'd';
 		return false;
 	}
 
 	public function getYearPattern()
 	{
-		if(is_int(strpos($this->pattern, 'yyyy')))
+		if (is_int(strpos($this->pattern, 'yyyy')))
 			return 'yyyy';
-		if(is_int(strpos($this->pattern, 'yy')))
+		if (is_int(strpos($this->pattern, 'yy')))
 			return 'yy';
 		return false;
 	}
@@ -159,11 +159,11 @@ 
 	public function getDayMonthYearOrdering()
 	{
 		$ordering = [];
-		if(is_int($day = strpos($this->pattern, 'd')))
+		if (is_int($day = strpos($this->pattern, 'd')))
 			$ordering['day'] = $day;
-		if(is_int($month = strpos($this->pattern, 'M')))
+		if (is_int($month = strpos($this->pattern, 'M')))
 			$ordering['month'] = $month;
-		if(is_int($year = strpos($this->pattern, 'yy')))
+		if (is_int($year = strpos($this->pattern, 'yy')))
 			$ordering['year'] = $year;
 		asort($ordering);
 		return array_keys($ordering);
@@ -176,7 +176,7 @@ 
 	 */
 	private function getDate($value)
 	{
-		if(is_numeric($value))
+		if (is_numeric($value))
 		{
 			$date = new \DateTime;
 			$date->setTimeStamp($value);
@@ -191,7 +191,7 @@ 
 	 */
 	public function isValidDate($value)
 	{
-		if($value === null) {
+		if ($value === null) {
 			return false;
 		} else {
 			return $this->parse($value, false) !== null;
@@ -206,16 +206,16 @@ 
 	 */
 	public function parse($value, $defaultToCurrentTime = true)
 	{
-		if(is_int($value) || is_float($value))
+		if (is_int($value) || is_float($value))
 			return $value;
-		elseif(!is_string($value))
+		elseif (!is_string($value))
 			throw new TInvalidDataValueException('date_to_parse_must_be_string', $value);
 
-		if(empty($this->pattern)) return time();
+		if (empty($this->pattern)) return time();
 
 		$date = time();
 
-		if($this->length(trim($value)) < 1)
+		if ($this->length(trim($value)) < 1)
 			return $defaultToCurrentTime ? $date : null;
 
 		$pattern = $this->pattern;
@@ -228,7 +228,7 @@ 
 		$x = null; $y = null;
 
 
-		if($defaultToCurrentTime)
+		if ($defaultToCurrentTime)
 		{
 			$year = "{$date['year']}";
 			$month = $date['mon'];
@@ -253,30 +253,30 @@ 
 
 			if ($token == 'yyyy' || $token == 'yy' || $token == 'y')
 			{
-				if ($token == 'yyyy') { $x = 4;$y = 4; }
-				if ($token == 'yy')   { $x = 2;$y = 2; }
-				if ($token == 'y')    { $x = 2;$y = 4; }
+				if ($token == 'yyyy') { $x = 4; $y = 4; }
+				if ($token == 'yy') { $x = 2; $y = 2; }
+				if ($token == 'y') { $x = 2; $y = 4; }
 				$year = $this->getInteger($value, $i_val, $x, $y);
-				if($year === null)
+				if ($year === null)
 					return null;
 					//throw new TInvalidDataValueException('Invalid year', $value);
 				$i_val += strlen($year);
-				if(strlen($year) == 2)
+				if (strlen($year) == 2)
 				{
-					$iYear = (int)$year;
-					if($iYear > 70)
+					$iYear = (int) $year;
+					if ($iYear > 70)
 						$year = $iYear + 1900;
 					else
 						$year = $iYear + 2000;
 				}
-				$year = (int)$year;
+				$year = (int) $year;
 			}
-			elseif($token == 'MM' || $token == 'M')
+			elseif ($token == 'MM' || $token == 'M')
 			{
-				$month = $this->getInteger($value,$i_val,
+				$month = $this->getInteger($value, $i_val,
 									$this->length($token), 2);
-				$iMonth = (int)$month;
-				if($month === null || $iMonth < 1 || $iMonth > 12)
+				$iMonth = (int) $month;
+				if ($month === null || $iMonth < 1 || $iMonth > 12)
 					return null;
 					//throw new TInvalidDataValueException('Invalid month', $value);
 				$i_val += strlen($month);
@@ -284,10 +284,10 @@ 
 			}
 			elseif ($token == 'dd' || $token == 'd')
 			{
-				$day = $this->getInteger($value,$i_val,
+				$day = $this->getInteger($value, $i_val,
 									$this->length($token), 2);
-				$iDay = (int)$day;
-				if($day === null || $iDay < 1 || $iDay > 31)
+				$iDay = (int) $day;
+				if ($day === null || $iDay < 1 || $iDay > 31)
 					return null;
 					//throw new TInvalidDataValueException('Invalid day', $value);
 				$i_val += strlen($day);
@@ -295,7 +295,7 @@ 
 			}
 			else
 			{
-				if($this->substring($value, $i_val, $this->length($token)) != $token)
+				if ($this->substring($value, $i_val, $this->length($token)) != $token)
 					return null;
 					//throw new TInvalidDataValueException("Subpattern '{$this->pattern}' mismatch", $value);
 				else
@@ -305,15 +305,15 @@ 
 		if ($i_val != $this->length($value))
 			return null;
 			//throw new TInvalidDataValueException("Pattern '{$this->pattern}' mismatch", $value);
-		if(!$defaultToCurrentTime && ($month === null || $day === null || $year === null))
+		if (!$defaultToCurrentTime && ($month === null || $day === null || $year === null))
 			return null;
 		else
 		{
-			if(empty($year)) {
+			if (empty($year)) {
 				$year = date('Y');
 			}
-			$day = (int)$day <= 0 ? 1 : (int)$day;
-			$month = (int)$month <= 0 ? 1 : (int)$month;
+			$day = (int) $day <= 0 ? 1 : (int) $day;
+			$month = (int) $month <= 0 ? 1 : (int) $month;
 
 			$s = new \DateTime;
 			$s->setDate($year, $month, $day);

Braces +80 added lines, -60 removed lines

@@ -127,44 +127,55 @@ 
 
 	public function getMonthPattern()
 	{
-		if(is_int(strpos($this->pattern, 'MMMM')))
-			return 'MMMM';
-		if(is_int(strpos($this->pattern, 'MMM')))
-			return 'MMM';
-		if(is_int(strpos($this->pattern, 'MM')))
-			return 'MM';
-		if(is_int(strpos($this->pattern, 'M')))
-			return 'M';
+		if(is_int(strpos($this->pattern, 'MMMM'))) {
+					return 'MMMM';
+		}
+		if(is_int(strpos($this->pattern, 'MMM'))) {
+					return 'MMM';
+		}
+		if(is_int(strpos($this->pattern, 'MM'))) {
+					return 'MM';
+		}
+		if(is_int(strpos($this->pattern, 'M'))) {
+					return 'M';
+		}
 		return false;
 	}
 
 	public function getDayPattern()
 	{
-		if(is_int(strpos($this->pattern, 'dd')))
-			return 'dd';
-		if(is_int(strpos($this->pattern, 'd')))
-			return 'd';
+		if(is_int(strpos($this->pattern, 'dd'))) {
+					return 'dd';
+		}
+		if(is_int(strpos($this->pattern, 'd'))) {
+					return 'd';
+		}
 		return false;
 	}
 
 	public function getYearPattern()
 	{
-		if(is_int(strpos($this->pattern, 'yyyy')))
-			return 'yyyy';
-		if(is_int(strpos($this->pattern, 'yy')))
-			return 'yy';
+		if(is_int(strpos($this->pattern, 'yyyy'))) {
+					return 'yyyy';
+		}
+		if(is_int(strpos($this->pattern, 'yy'))) {
+					return 'yy';
+		}
 		return false;
 	}
 
 	public function getDayMonthYearOrdering()
 	{
 		$ordering = [];
-		if(is_int($day = strpos($this->pattern, 'd')))
-			$ordering['day'] = $day;
-		if(is_int($month = strpos($this->pattern, 'M')))
-			$ordering['month'] = $month;
-		if(is_int($year = strpos($this->pattern, 'yy')))
-			$ordering['year'] = $year;
+		if(is_int($day = strpos($this->pattern, 'd'))) {
+					$ordering['day'] = $day;
+		}
+		if(is_int($month = strpos($this->pattern, 'M'))) {
+					$ordering['month'] = $month;
+		}
+		if(is_int($year = strpos($this->pattern, 'yy'))) {
+					$ordering['year'] = $year;
+		}
 		asort($ordering);
 		return array_keys($ordering);
 	}
@@ -206,17 +217,21 @@ 
 	 */
 	public function parse($value, $defaultToCurrentTime = true)
 	{
-		if(is_int($value) || is_float($value))
-			return $value;
-		elseif(!is_string($value))
-			throw new TInvalidDataValueException('date_to_parse_must_be_string', $value);
+		if(is_int($value) || is_float($value)) {
+					return $value;
+		} elseif(!is_string($value)) {
+					throw new TInvalidDataValueException('date_to_parse_must_be_string', $value);
+		}
 
-		if(empty($this->pattern)) return time();
+		if(empty($this->pattern)) {
+			return time();
+		}
 
 		$date = time();
 
-		if($this->length(trim($value)) < 1)
-			return $defaultToCurrentTime ? $date : null;
+		if($this->length(trim($value)) < 1) {
+					return $defaultToCurrentTime ? $date : null;
+		}
 
 		$pattern = $this->pattern;
 
@@ -233,8 +248,7 @@ 
 			$year = "{$date['year']}";
 			$month = $date['mon'];
 			$day = $date['mday'];
-		}
-		else
+		} else
 		{
 			$year = null;
 			$month = null;
@@ -257,57 +271,61 @@ 
 				if ($token == 'yy')   { $x = 2;$y = 2; }
 				if ($token == 'y')    { $x = 2;$y = 4; }
 				$year = $this->getInteger($value, $i_val, $x, $y);
-				if($year === null)
-					return null;
+				if($year === null) {
+									return null;
+				}
 					//throw new TInvalidDataValueException('Invalid year', $value);
 				$i_val += strlen($year);
 				if(strlen($year) == 2)
 				{
 					$iYear = (int)$year;
-					if($iYear > 70)
-						$year = $iYear + 1900;
-					else
-						$year = $iYear + 2000;
+					if($iYear > 70) {
+											$year = $iYear + 1900;
+					} else {
+											$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);
 				$iMonth = (int)$month;
-				if($month === null || $iMonth < 1 || $iMonth > 12)
-					return null;
+				if($month === null || $iMonth < 1 || $iMonth > 12) {
+									return null;
+				}
 					//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);
 				$iDay = (int)$day;
-				if($day === null || $iDay < 1 || $iDay > 31)
-					return null;
+				if($day === null || $iDay < 1 || $iDay > 31) {
+									return null;
+				}
 					//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;
+				if($this->substring($value, $i_val, $this->length($token)) != $token) {
+									return null;
+				}
 					//throw new TInvalidDataValueException("Subpattern '{$this->pattern}' mismatch", $value);
-				else
-					$i_val += $this->length($token);
+				else {
+									$i_val += $this->length($token);
+				}
 			}
 		}
-		if ($i_val != $this->length($value))
-			return null;
+		if ($i_val != $this->length($value)) {
+					return null;
+		}
 			//throw new TInvalidDataValueException("Pattern '{$this->pattern}' mismatch", $value);
-		if(!$defaultToCurrentTime && ($month === null || $day === null || $year === null))
-			return null;
-		else
+		if(!$defaultToCurrentTime && ($month === null || $day === null || $year === null)) {
+					return null;
+		} else
 		{
 			if(empty($year)) {
 				$year = date('Y');
@@ -369,10 +387,12 @@ 
 		for ($x = $maxlength; $x >= $minlength; $x--)
 		{
 			$token = $this->substring($str, $i, $x);
-			if ($this->length($token) < $minlength)
-				return null;
-			if (preg_match('/^\d+$/', $token))
-				return $token;
+			if ($this->length($token) < $minlength) {
+							return null;
+			}
+			if (preg_match('/^\d+$/', $token)) {
+							return $token;
+			}
 		}
 		return null;
 	}

framework/Util/TFirePhpLogRoute.php

Spacing +6 added lines, -6 removed lines

@@ -36,13 +36,13 @@ 
 
 	public function processLogs($logs)
 	{
-		if(empty($logs) || $this->getApplication()->getMode() === 'Performance')
+		if (empty($logs) || $this->getApplication()->getMode() === 'Performance')
 			return;
 
-		if(headers_sent()) {
+		if (headers_sent()) {
 			echo '
 				<div style="width:100%; background-color:darkred; color:#FFF; padding:2px">
-					TFirePhpLogRoute.GroupLabel "<i>' . $this -> getGroupLabel() . '</i>" -
+					TFirePhpLogRoute.GroupLabel "<i>' . $this -> getGroupLabel().'</i>" -
 					Routing to FirePHP impossible, because headers already sent!
 				</div>
 			';
@@ -58,7 +58,7 @@ 
 
 		$first = $logs[0][3];
 		$c = count($logs);
-		for($i = 0,$n = $c;$i < $n;++$i)
+		for ($i = 0, $n = $c; $i < $n; ++$i)
 		{
 			$message = $logs[$i][0];
 			$level = $logs[$i][1];
@@ -89,7 +89,7 @@ 
 	 */
 	protected static function translateLogLevel($level)
 	{
-		switch($level)
+		switch ($level)
 		{
 			case TLogger::INFO:
 				return FirePHP::INFO;
@@ -112,7 +112,7 @@ 
 	 */
 	public function getGroupLabel()
 	{
-		if($this->_groupLabel === null)
+		if ($this->_groupLabel === null)
 			$this->_groupLabel = self::DEFAULT_LABEL;
 
 		return $this->_groupLabel;

Braces +7 added lines, -6 removed lines

@@ -36,8 +36,9 @@ 
 
 	public function processLogs($logs)
 	{
-		if(empty($logs) || $this->getApplication()->getMode() === 'Performance')
-			return;
+		if(empty($logs) || $this->getApplication()->getMode() === 'Performance') {
+					return;
+		}
 
 		if(headers_sent()) {
 			echo '
@@ -68,8 +69,7 @@ 
 			{
 				$delta = $logs[$i + 1][3] - $logs[$i][3];
 				$total = $logs[$i + 1][3] - $first;
-			}
-			else
+			} else
 			{
 				$delta = '?';
 				$total = $logs[$i][3] - $first;
@@ -112,8 +112,9 @@ 
 	 */
 	public function getGroupLabel()
 	{
-		if($this->_groupLabel === null)
-			$this->_groupLabel = self::DEFAULT_LABEL;
+		if($this->_groupLabel === null) {
+					$this->_groupLabel = self::DEFAULT_LABEL;
+		}
 
 		return $this->_groupLabel;
 	}

framework/Util/TBrowserLogRoute.php

Spacing +11 added lines, -11 removed lines

@@ -32,12 +32,12 @@ 
 
 	public function processLogs($logs)
 	{
-		if(empty($logs) || $this->getApplication()->getMode() === 'Performance') return;
+		if (empty($logs) || $this->getApplication()->getMode() === 'Performance') return;
 		$first = $logs[0][3];
 		$even = true;
 		$response = $this->getApplication()->getResponse();
 		$response->write($this->renderHeader());
-		for($i = 0,$n = count($logs);$i < $n;++$i)
+		for ($i = 0, $n = count($logs); $i < $n; ++$i)
 		{
 			if ($i < $n - 1)
 			{
@@ -74,7 +74,7 @@ 
 	protected function renderHeader()
 	{
 		$string = '';
-		if($className = $this->getCssClass())
+		if ($className = $this->getCssClass())
 		{
 			$string = <<<EOD
 <table class="$className">
@@ -112,7 +112,7 @@ 
 		$delta = sprintf('%0.6f', $info['delta']);
 		$msg = preg_replace('/\(line[^\)]+\)$/', '', $log[0]); //remove line number info
 		$msg = THttpUtility::htmlEncode($msg);
-		if($this->getCssClass())
+		if ($this->getCssClass())
 		{
 			$colorCssClass = $log[1];
 			$messageCssClass = $info['even'] ? 'even' : 'odd';
@@ -145,7 +145,7 @@ 
 
 	protected function getColorLevel($level)
 	{
-		switch($level)
+		switch ($level)
 		{
 			case TLogger::DEBUG: return 'green';
 			case TLogger::INFO: return 'black';
@@ -161,21 +161,21 @@ 
 	protected function renderFooter()
 	{
 		$string = '';
-		if($this->getCssClass())
+		if ($this->getCssClass())
 		{
 			$string .= '<tr class="footer"><td colspan="5">';
-			foreach(self::$_levelValues as $name => $level)
+			foreach (self::$_levelValues as $name => $level)
 			{
-				$string .= '<span class="level' . $level . '">' . strtoupper($name) . "</span>";
+				$string .= '<span class="level'.$level.'">'.strtoupper($name)."</span>";
 			}
 		}
 		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)
+			foreach (self::$_levelValues as $name => $level)
 			{
-				$string .= "<span style=\"color:white; border:1px solid white; background-color:" . $this->getColorLevel($level);
-				$string .= ";margin: 0.5em; padding:0.01em;\">" . strtoupper($name) . "</span>";
+				$string .= "<span style=\"color:white; border:1px solid white; background-color:".$this->getColorLevel($level);
+				$string .= ";margin: 0.5em; padding:0.01em;\">".strtoupper($name)."</span>";
 			}
 		}
 		$string .= '</td></tr></table>';

Braces +7 added lines, -9 removed lines

@@ -32,7 +32,9 @@ 
 
 	public function processLogs($logs)
 	{
-		if(empty($logs) || $this->getApplication()->getMode() === 'Performance') return;
+		if(empty($logs) || $this->getApplication()->getMode() === 'Performance') {
+			return;
+		}
 		$first = $logs[0][3];
 		$even = true;
 		$response = $this->getApplication()->getResponse();
@@ -43,8 +45,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;
@@ -87,8 +88,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">
@@ -125,8 +125,7 @@ 
 		<td class="cumulatedtime">{$total}</td>
 	</tr>
 EOD;
-		}
-		else
+		} else
 		{
 			$bgcolor = $info['even'] ? "#fff" : "#eee";
 			$color = $this->getColorLevel($log[1]);
@@ -168,8 +167,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/TRpcClient.php

Spacing +3 added lines, -3 removed lines

@@ -81,7 +81,7 @@ 
 	 */
 	public static function create($type, $serverUrl, $isNotification = false)
 	{
-		if(($_handler = constant('TRpcClientTypesEnumerable::' . strtoupper($type))) === null)
+		if (($_handler = constant('TRpcClientTypesEnumerable::'.strtoupper($type))) === null)
 			throw new TApplicationException('rpcclient_unsupported_handler');
 
 		return new $_handler($serverUrl, $isNotification);
@@ -111,8 +111,8 @@ 
 	 */
 	protected function performRequest($serverUrl, $payload, $mimeType)
 	{
-		if(($_response = @file_get_contents($serverUrl, false, $this->createStreamContext($payload, $mimeType))) === false)
-			throw new TRpcClientRequestException('Request failed ("' . $http_response_header[0] . '")');
+		if (($_response = @file_get_contents($serverUrl, false, $this->createStreamContext($payload, $mimeType))) === false)
+			throw new TRpcClientRequestException('Request failed ("'.$http_response_header[0].'")');
 
 		return $_response;
 	}

Braces +6 added lines, -4 removed lines

@@ -81,8 +81,9 @@ 
 	 */
 	public static function create($type, $serverUrl, $isNotification = false)
 	{
-		if(($_handler = constant('TRpcClientTypesEnumerable::' . strtoupper($type))) === null)
-			throw new TApplicationException('rpcclient_unsupported_handler');
+		if(($_handler = constant('TRpcClientTypesEnumerable::' . strtoupper($type))) === null) {
+					throw new TApplicationException('rpcclient_unsupported_handler');
+		}
 
 		return new $_handler($serverUrl, $isNotification);
 	}
@@ -111,8 +112,9 @@ 
 	 */
 	protected function performRequest($serverUrl, $payload, $mimeType)
 	{
-		if(($_response = @file_get_contents($serverUrl, false, $this->createStreamContext($payload, $mimeType))) === false)
-			throw new TRpcClientRequestException('Request failed ("' . $http_response_header[0] . '")');
+		if(($_response = @file_get_contents($serverUrl, false, $this->createStreamContext($payload, $mimeType))) === false) {
+					throw new TRpcClientRequestException('Request failed ("' . $http_response_header[0] . '")');
+		}
 
 		return $_response;
 	}