pradosoft / prado

framework/Data/TDbDataReader.php

Braces +1 added lines, -2 removed lines

@@ -180,8 +180,7 @@
 		{
 			$this->_row = $this->_statement->fetch();
 			$this->_index = 0;
-		}
-		else
+		} else
 			throw new TDbException('dbdatareader_rewind_invalid');
 	}
 

Spacing +1 added lines, -1 removed lines

@@ -79,7 +79,7 @@
 	public function setFetchMode($mode)
 	{
 		$params = func_get_args();
-		call_user_func_array([$this->_statement,'setFetchMode'], $params);
+		call_user_func_array([$this->_statement, 'setFetchMode'], $params);
 	}
 
 	/**

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');
 	}
 

Spacing +8 added lines, -8 removed lines

@@ -141,7 +141,7 @@ 
 	public function __sleep()
 	{
 //		$this->close(); - DO NOT CLOSE the current connection as serializing doesn't neccessarily mean we don't this connection anymore in the current session
-		return array_diff(parent::__sleep(), ["\0Prado\Data\TDbConnection\0_pdo","\0Prado\Data\TDbConnection\0_active"]);
+		return array_diff(parent::__sleep(), ["\0Prado\Data\TDbConnection\0_pdo", "\0Prado\Data\TDbConnection\0_active"]);
 	}
 
 	/**
@@ -188,7 +188,7 @@ 
 		{
 			try
 			{
-				$this->_pdo = new PDO($this->getConnectionString(),$this->getUsername(),
+				$this->_pdo = new PDO($this->getConnectionString(), $this->getUsername(),
 									$this->getPassword(), $this->_attributes);
 				// This attribute is only useful for PDO::MySql driver.
 				// Ignore the warning if a driver doesn't understand this.
@@ -197,7 +197,7 @@ 
 				$this->_active = true;
 				$this->setConnectionCharset();
 			}
-			catch(PDOException $e)
+			catch (PDOException $e)
 			{
 				throw new TDbException('dbconnection_open_failed', $e->getMessage());
 			}
@@ -221,9 +221,9 @@ 
 	 */
 	protected function setConnectionCharset()
 	{
-		if ($this->_charset === '' || $this->_active === false)
+		if($this->_charset === '' || $this->_active === false)
 			return;
-		switch ($this->_pdo->getAttribute(PDO::ATTR_DRIVER_NAME))
+		switch($this->_pdo->getAttribute(PDO::ATTR_DRIVER_NAME))
 		{
 			case 'mysql':
 			case 'sqlite':
@@ -290,7 +290,7 @@ 
 	/**
 	 * @return string the charset used for database connection. Defaults to emtpy string.
 	 */
-	public function getCharset ()
+	public function getCharset()
 	{
 		return $this->_charset;
 	}
@@ -298,7 +298,7 @@ 
 	/**
 	 * @param string the charset used for database connection
 	 */
-	public function setCharset ($value)
+	public function setCharset($value)
 	{
 		$this->_charset = $value;
 		$this->setConnectionCharset();
@@ -371,7 +371,7 @@ 
 	 */
 	public function setTransactionClass($value)
 	{
-		$this->_transactionClass = (string)$value;
+		$this->_transactionClass = (string) $value;
 	}
 
 	/**

framework/Caching/TChainedCacheDependency.php

Braces +3 added lines, -2 removed lines

@@ -51,9 +51,10 @@
 	{
 		if($this->_dependencies !== null)
 		{
-			foreach($this->_dependencies as $dependency)
-				if($dependency->getHasChanged())
+			foreach($this->_dependencies as $dependency) {
+							if($dependency->getHasChanged())
 					return true;
+			}
 		}
 		return false;
 	}

framework/Caching/TXCache.php

Spacing +2 added lines, -2 removed lines

@@ -56,8 +56,8 @@
 		if(!function_exists('xcache_isset'))
 			throw new TConfigurationException('xcache_extension_required');
 
-		$enabled = (int)ini_get('xcache.cacher') !== 0;
-		$var_size = (int)ini_get('xcache.var_size');
+		$enabled = (int) ini_get('xcache.cacher') !== 0;
+		$var_size = (int) ini_get('xcache.var_size');
 
 		if(!($enabled && $var_size > 0))
 			throw new TConfigurationException('xcache_extension_not_enabled');

framework/PradoBase.php

Braces +14 added lines, -20 removed lines

@@ -160,8 +160,7 @@ 
 		{
 			$am = self::$_application->getAssetManager();
 			$url = $am->publishFilePath(self::getPathOfNamespace('Prado\\' . $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>';
 	}
@@ -213,8 +212,7 @@ 
 		if(self::$_application !== null && ($errorHandler = self::$_application->getErrorHandler()) !== null)
 		{
 			$errorHandler->handleError(null, $exception);
-		}
-		else
+		} else
 		{
 			echo $exception;
 		}
@@ -322,14 +320,14 @@ 
 				break;
 				default:
 					$s = '$args[1]';
-					for($i = 2;$i < $n;++$i)
-						$s .= ",\$args[$i]";
+					for($i = 2;$i < $n;++$i) {
+											$s .= ",\$args[$i]";
+					}
 					eval("\$component=new $type($s);");
 					return $component;
 				break;
 			}
-		}
-		else
+		} else
 			return new $type;
 	}
 
@@ -383,8 +381,7 @@ 
 			if($className === '*')  // a directory
 			{
 				self::$_usings[substr($namespace, 0, $pos)] = $path;
-			}
-			else  // a file
+			} else  // a file
 			{
 				//self::$_usings[$namespace]=$path;
 				if(!$checkClassExistence || (!class_exists($className, false) && !interface_exists($className, false)))
@@ -394,8 +391,7 @@ 
 						include_once($path);
 						if(class_exists($namespace, false) || interface_exists($namespace, false))
 							class_alias($namespace, $className);
-					}
-					catch(\Exception $e)
+					} catch(\Exception $e)
 					{
 						if($checkClassExistence && !class_exists($className, false))
 							throw new TInvalidOperationException('prado_component_unknown', $className, $e->getMessage());
@@ -471,8 +467,7 @@ 
 				self::$_aliases[$alias] = $rp;
 			else
 				throw new TInvalidDataValueException('prado_aliasname_invalid', $alias);
-		}
-		else
+		} else
 			throw new TInvalidDataValueException('prado_alias_invalid', $alias, $path);
 	}
 
@@ -517,8 +512,7 @@ 
 							echo "'" . substr($str, 0, 70) . "...'";
 						else
 							echo "'" . $str . "'";
-					}
-					elseif (is_int($item) || is_float($item))
+					} elseif (is_int($item) || is_float($item))
 						echo $item;
 					elseif (is_object($item))
 						echo get_class($item);
@@ -613,8 +607,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);
 	}
@@ -677,8 +670,9 @@ 
 		$app = Prado::getApplication()->getGlobalization(false);
 
 		$params = [];
-		foreach($parameters as $key => $value)
-			$params['{' . $key . '}'] = $value;
+		foreach($parameters as $key => $value) {
+					$params['{' . $key . '}'] = $value;
+		}
 
 		//no translation handler provided
 		if($app === null || ($config = $app->getTranslationConfiguration()) === null)

Spacing +18 added lines, -18 removed lines

@@ -124,15 +124,15 @@ 
 		/**
 		 * Sets error handler to be Prado::phpErrorHandler
 		 */
-		set_error_handler(['\Prado\PradoBase','phpErrorHandler']);
+		set_error_handler(['\Prado\PradoBase', 'phpErrorHandler']);
 		/**
 		 * Sets shutdown function to be Prado::phpFatalErrorHandler
 		 */
-		register_shutdown_function(['PradoBase','phpFatalErrorHandler']);
+		register_shutdown_function(['PradoBase', 'phpFatalErrorHandler']);
 		/**
 		 * Sets exception handler to be Prado::exceptionHandler
 		 */
-		set_exception_handler(['\Prado\PradoBase','exceptionHandler']);
+		set_exception_handler(['\Prado\PradoBase', 'exceptionHandler']);
 		/**
 		 * Disable php's builtin error reporting to avoid duplicated reports
 		 */
@@ -155,7 +155,7 @@ 
 	 */
 	public static function poweredByPrado($logoType = 0)
 	{
-		$logoName = $logoType == 1?'powered2':'powered';
+		$logoName = $logoType == 1 ? 'powered2' : 'powered';
 		if(self::$_application !== null)
 		{
 			$am = self::$_application->getAssetManager();
@@ -322,7 +322,7 @@ 
 				break;
 				default:
 					$s = '$args[1]';
-					for($i = 2;$i < $n;++$i)
+					for($i = 2; $i < $n; ++$i)
 						$s .= ",\$args[$i]";
 					eval("\$component=new $type($s);");
 					return $component;
@@ -395,7 +395,7 @@ 
 						if(class_exists($namespace, false) || interface_exists($namespace, false))
 							class_alias($namespace, $className);
 					}
-					catch(\Exception $e)
+					catch (\Exception $e)
 					{
 						if($checkClassExistence && !class_exists($className, false))
 							throw new TInvalidOperationException('prado_component_unknown', $className, $e->getMessage());
@@ -447,7 +447,7 @@ 
 	 */
 	public static function getPathOfAlias($alias)
 	{
-		return isset(self::$_aliases[$alias])?self::$_aliases[$alias]:null;
+		return isset(self::$_aliases[$alias]) ?self::$_aliases[$alias] : null;
 	}
 
 	protected static function getPathAliases()
@@ -513,25 +513,25 @@ 
 					if(is_string($item))
 					{
 						$str = htmlentities(str_replace("\r\n", "", $item), ENT_QUOTES);
-						if (strlen($item) > 70)
+						if(strlen($item) > 70)
 							echo "'" . substr($str, 0, 70) . "...'";
 						else
 							echo "'" . $str . "'";
 					}
-					elseif (is_int($item) || is_float($item))
+					elseif(is_int($item) || is_float($item))
 						echo $item;
-					elseif (is_object($item))
+					elseif(is_object($item))
 						echo get_class($item);
-					elseif (is_array($item))
+					elseif(is_array($item))
 						echo 'array(' . count($item) . ')';
-					elseif (is_bool($item))
+					elseif(is_bool($item))
 						echo $item ? 'true' : 'false';
-					elseif ($item === null)
+					elseif($item === null)
 						echo 'NULL';
-					elseif (is_resource($item))
+					elseif(is_resource($item))
 						echo get_resource_type($item);
 					$count++;
-					if (count($t['args']) > $count)
+					if(count($t['args']) > $count)
 						echo ', ';
 				}
 			}
@@ -561,7 +561,7 @@ 
 				foreach(explode(',', $_SERVER['HTTP_ACCEPT_LANGUAGE']) as $language)
 				{
 					$array = explode(';q=', trim($language));
-					$languages[trim($array[0])] = isset($array[1])?(float)$array[1]:1.0;
+					$languages[trim($array[0])] = isset($array[1]) ? (float) $array[1] : 1.0;
 				}
 				arsort($languages);
 				$languages = array_keys($languages);
@@ -684,8 +684,8 @@ 
 		if($app === null || ($config = $app->getTranslationConfiguration()) === null)
 			return strtr($text, $params);
 
-		if ($catalogue === null)
-			$catalogue = isset($config['catalogue'])?$config['catalogue']:'messages';
+		if($catalogue === null)
+			$catalogue = isset($config['catalogue']) ? $config['catalogue'] : 'messages';
 
 		Translation::init($catalogue);
 

framework/Exceptions/THttpException.php

Braces +3 added lines, -2 removed lines

@@ -46,8 +46,9 @@
 		array_shift($args);
 		$n = count($args);
 		$tokens = [];
-		for($i = 0;$i < $n;++$i)
-			$tokens['{' . $i . '}'] = TPropertyValue::ensureString($args[$i]);
+		for($i = 0;$i < $n;++$i) {
+					$tokens['{' . $i . '}'] = TPropertyValue::ensureString($args[$i]);
+		}
 		parent::__construct(strtr($errorMessage, $tokens));
 	}
 

Spacing +1 added lines, -1 removed lines

@@ -46,7 +46,7 @@
 		array_shift($args);
 		$n = count($args);
 		$tokens = [];
-		for($i = 0;$i < $n;++$i)
+		for($i = 0; $i < $n; ++$i)
 			$tokens['{' . $i . '}'] = TPropertyValue::ensureString($args[$i]);
 		parent::__construct(strtr($errorMessage, $tokens));
 	}

framework/Exceptions/TPhpErrorException.php

Spacing +1 added lines, -1 removed lines

@@ -46,7 +46,7 @@
 			E_USER_NOTICE => "User Notice",
 			E_STRICT => "Runtime Notice"
 		];
-		$errorType = isset($errorTypes[$errno])?$errorTypes[$errno]:'Unknown Error';
+		$errorType = isset($errorTypes[$errno]) ? $errorTypes[$errno] : 'Unknown Error';
 		parent::__construct("[$errorType] $errstr (@line $errline in file $errfile).");
 	}
 

framework/Security/TUser.php

Spacing +1 added lines, -1 removed lines

@@ -174,7 +174,7 @@
 	 */
 	protected function getState($key, $defaultValue = null)
 	{
-		return isset($this->_state[$key])?$this->_state[$key]:$defaultValue;
+		return isset($this->_state[$key]) ? $this->_state[$key] : $defaultValue;
 	}
 
 	/**

Braces +3 added lines, -2 removed lines

@@ -132,9 +132,10 @@
 	 */
 	public function isInRole($role)
 	{
-		foreach($this->getRoles() as $r)
-			if(strcasecmp($role, $r) === 0)
+		foreach($this->getRoles() as $r) {
+					if(strcasecmp($role, $r) === 0)
 				return true;
+		}
 		return false;
 	}