pradosoft / prado

bin/prado-cli.php

Spacing +94 added lines, -94 removed lines

@@ -9,15 +9,15 @@ 
  * @license https://github.com/pradosoft/prado/blob/master/LICENSE
  */
 
-if(!isset($_SERVER['argv']) || php_sapi_name() !== 'cli')
+if (!isset($_SERVER['argv']) || php_sapi_name() !== 'cli')
 	die('Must be run from the command line');
 
 // Locate composer's autoloader
-if(file_exists($autoloader = realpath(__DIR__ . '/../vendor/autoload.php')))
+if (file_exists($autoloader = realpath(__DIR__.'/../vendor/autoload.php')))
 {
 	// if we are running inside a prado repo checkout, get out of bin/
 	include($autoloader);
-} elseif(file_exists($autoloader = realpath(__DIR__ . '/../../../autoload.php'))) {
+} elseif (file_exists($autoloader = realpath(__DIR__.'/../../../autoload.php'))) {
 	// if we are running from inside an application's vendor/ directory, get out of pradosoft/prado/bin/
 	include($autoloader);
 }
@@ -78,14 +78,14 @@ 
 	public static function getInstance()
 	{
 		static $instance;
-		if($instance === null)
+		if ($instance === null)
 			$instance = new self;
 		return $instance;
 	}
 
 	public static function printGreeting()
 	{
-		echo "Command line tools for Prado " . Prado::getVersion() . ".\n";
+		echo "Command line tools for Prado ".Prado::getVersion().".\n";
 	}
 
 	/**
@@ -94,12 +94,12 @@ 
 	 */
 	public function run($args)
 	{
-		if(count($args) > 1)
+		if (count($args) > 1)
 			array_shift($args);
 		$valid = false;
-		foreach($this->_actions as $class => $action)
+		foreach ($this->_actions as $class => $action)
 		{
-			if($action->isValidAction($args))
+			if ($action->isValidAction($args))
 			{
 				$valid |= $action->performAction($args);
 				break;
@@ -109,7 +109,7 @@ 
 				$valid = false;
 			}
 		}
-		if(!$valid)
+		if (!$valid)
 			$this->printHelp();
 	}
 
@@ -123,7 +123,7 @@ 
 		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)
+		foreach ($this->_actions as $action)
 			echo $action->renderHelp();
 	}
 }
@@ -145,18 +145,18 @@ 
 
 	protected function createDirectory($dir, $mask)
 	{
-		if(!is_dir($dir))
+		if (!is_dir($dir))
 		{
 			mkdir($dir);
 			echo "creating $dir\n";
 		}
-		if(is_dir($dir))
+		if (is_dir($dir))
 			chmod($dir, $mask);
 	}
 
 	protected function createFile($filename, $content)
 	{
-		if(!is_file($filename))
+		if (!is_file($filename))
 		{
 			file_put_contents($filename, $content);
 			echo "creating $filename\n";
@@ -172,16 +172,16 @@ 
 	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 . ']';
-		$optional = (strlen($parameters) ? ' ' : '') . implode($options, ' ');
+		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}
@@ -191,17 +191,17 @@ 
 
 	protected function initializePradoApplication($directory)
 	{
-		$_SERVER['SCRIPT_FILENAME'] = $directory . '/index.php';
-		$app_dir = realpath($directory . '/protected/');
-		if($app_dir !== false && is_dir($app_dir))
+		$_SERVER['SCRIPT_FILENAME'] = $directory.'/index.php';
+		$app_dir = realpath($directory.'/protected/');
+		if ($app_dir !== false && is_dir($app_dir))
 		{
-			if(Prado::getApplication() === null)
+			if (Prado::getApplication() === null)
 			{
 				$app = new PradoShellApplication($app_dir);
 				$app->run();
 				$dir = substr(str_replace(realpath('./'), '', $app_dir), 1);
 				PradoCommandLineInterpreter::printGreeting();
-				echo '** Loaded PRADO appplication in directory "' . $dir . "\".\n";
+				echo '** Loaded PRADO appplication in directory "'.$dir."\".\n";
 			}
 
 			return Prado::getApplication();
@@ -209,9 +209,9 @@ 
 		else
 		{
 			PradoCommandLineInterpreter::printGreeting();
-			echo '+' . str_repeat('-', 77) . "+\n";
-			echo '** Unable to load PRADO application in directory "' . $directory . "\".\n";
-			echo '+' . str_repeat('-', 77) . "+\n";
+			echo '+'.str_repeat('-', 77)."+\n";
+			echo '** Unable to load PRADO application in directory "'.$directory."\".\n";
+			echo '+'.str_repeat('-', 77)."+\n";
 		}
 		return false;
 	}
@@ -243,25 +243,25 @@ 
 	 */
 	protected function createNewPradoProject($dir)
 	{
-		if(strlen(trim($dir)) == 0)
+		if (strlen(trim($dir)) == 0)
 			return;
 
 		$rootPath = realpath(dirname(trim($dir)));
 
-		if(basename($dir) !== '.')
-			$basePath = $rootPath . DIRECTORY_SEPARATOR . basename($dir);
+		if (basename($dir) !== '.')
+			$basePath = $rootPath.DIRECTORY_SEPARATOR.basename($dir);
 		else
 			$basePath = $rootPath;
 		$appName = basename($basePath);
-		$assetPath = $basePath . DIRECTORY_SEPARATOR . 'assets';
-		$protectedPath = $basePath . DIRECTORY_SEPARATOR . 'protected';
-		$runtimePath = $basePath . DIRECTORY_SEPARATOR . 'protected' . DIRECTORY_SEPARATOR . 'runtime';
-		$pagesPath = $protectedPath . DIRECTORY_SEPARATOR . 'pages';
+		$assetPath = $basePath.DIRECTORY_SEPARATOR.'assets';
+		$protectedPath = $basePath.DIRECTORY_SEPARATOR.'protected';
+		$runtimePath = $basePath.DIRECTORY_SEPARATOR.'protected'.DIRECTORY_SEPARATOR.'runtime';
+		$pagesPath = $protectedPath.DIRECTORY_SEPARATOR.'pages';
 
-		$indexFile = $basePath . DIRECTORY_SEPARATOR . 'index.php';
-		$htaccessFile = $protectedPath . DIRECTORY_SEPARATOR . '.htaccess';
-		$configFile = $protectedPath . DIRECTORY_SEPARATOR . 'application.xml';
-		$defaultPageFile = $pagesPath . DIRECTORY_SEPARATOR . 'Home.page';
+		$indexFile = $basePath.DIRECTORY_SEPARATOR.'index.php';
+		$htaccessFile = $protectedPath.DIRECTORY_SEPARATOR.'.htaccess';
+		$configFile = $protectedPath.DIRECTORY_SEPARATOR.'application.xml';
+		$defaultPageFile = $pagesPath.DIRECTORY_SEPARATOR.'Home.page';
 
 		$this->createDirectory($basePath, 0755);
 		$this->createDirectory($assetPath, 0777);
@@ -277,10 +277,10 @@ 
 
 	protected function renderIndexFile()
 	{
-		$framework = realpath(dirname(dirname(__FILE__))) . DIRECTORY_SEPARATOR . 'framework' . DIRECTORY_SEPARATOR . 'prado.php';
+		$framework = realpath(dirname(dirname(__FILE__))).DIRECTORY_SEPARATOR.'framework'.DIRECTORY_SEPARATOR.'prado.php';
 return '<?php
 
-$frameworkPath=\'' . $framework . '\';
+$frameworkPath=\'' . $framework.'\';
 
 // The following directory checks may be removed if performance is required
 $basePath=dirname(__FILE__);
@@ -390,22 +390,22 @@ 
 
 	protected function createTestFixtures($dir)
 	{
-		if(strlen(trim($dir)) == 0)
+		if (strlen(trim($dir)) == 0)
 			return;
 
 		$rootPath = realpath(dirname(trim($dir)));
-		$basePath = $rootPath . '/' . basename($dir);
+		$basePath = $rootPath.'/'.basename($dir);
 
-		$tests = $basePath . '/tests';
-		$unit_tests = $tests . '/unit';
-		$functional_tests = $tests . '/functional';
+		$tests = $basePath.'/tests';
+		$unit_tests = $tests.'/unit';
+		$functional_tests = $tests.'/functional';
 
 		$this->createDirectory($tests, 0755);
 		$this->createDirectory($unit_tests, 0755);
 		$this->createDirectory($functional_tests, 0755);
 
-		$unit_test_index = $tests . '/unit.php';
-		$functional_test_index = $tests . '/functional.php';
+		$unit_test_index = $tests.'/unit.php';
+		$functional_test_index = $tests.'/functional.php';
 
 		$this->createFile($unit_test_index, $this->renderUnitTestFixture());
 		$this->createFile($functional_test_index, $this->renderFunctionalTestFixture());
@@ -413,10 +413,10 @@ 
 
 	protected function renderUnitTestFixture()
 	{
-		$tester = realpath(dirname(dirname(__FILE__))) . '/tests/test_tools/unit_tests.php';
+		$tester = realpath(dirname(dirname(__FILE__))).'/tests/test_tools/unit_tests.php';
 return '<?php
 
-include_once \'' . $tester . '\';
+include_once \'' . $tester.'\';
 
 $app_directory = "../protected";
 $test_cases = dirname(__FILE__)."/unit";
@@ -428,10 +428,10 @@ 
 
 	protected function renderFunctionalTestFixture()
 	{
-		$tester = realpath(dirname(dirname(__FILE__))) . '/tests/test_tools/functional_tests.php';
+		$tester = realpath(dirname(dirname(__FILE__))).'/tests/test_tools/functional_tests.php';
 return '<?php
 
-include_once \'' . $tester . '\';
+include_once \'' . $tester.'\';
 
 $test_cases = dirname(__FILE__)."/functional";
 
@@ -457,7 +457,7 @@ 
 
 	public function performAction($args)
 	{
-		if(count($args) > 1)
+		if (count($args) > 1)
 			$this->initializePradoApplication($args[1]);
 
 		\Psy\debug([], Prado::getApplication());
@@ -483,13 +483,13 @@ 
 	{
 		$app_dir = count($args) > 3 ? $this->getAppDir($args[3]) : $this->getAppDir();
 		$this->_soap = count($args) > 4;
-		if($app_dir !== false)
+		if ($app_dir !== false)
 		{
 			$config = $this->getActiveRecordConfig($app_dir);
 			$output = $this->getOutputFile($app_dir, $args[2]);
-			if(is_file($output))
+			if (is_file($output))
 				echo "** File $output already exists, skiping. \n";
-			elseif($config !== false && $output !== false)
+			elseif ($config !== false && $output !== false)
 				$this->generateActiveRecord($config, $args[1], $output);
 		}
 		return true;
@@ -497,68 +497,68 @@ 
 
 	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";
+		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";
+		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";
+			echo '** Unable to find TActiveRecordConfig module in '.$xml."\n";
 		}
 		return false;
 	}
 
 	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, ".php");
-		if($file !== null && false !== ($path = realpath(dirname($file))) && is_dir($path))
+		if ($file !== null && false !== ($path = realpath(dirname($file))) && is_dir($path))
 		{
-			if(strpos($path, $app_dir) === 0)
+			if (strpos($path, $app_dir) === 0)
 				return $file;
 		}
-		echo '** Output file ' . $file . ' must be within directory ' . $app_dir . "\n";
+		echo '** Output file '.$file.' must be within directory '.$app_dir."\n";
 		return false;
 	}
 
 	protected function generateActiveRecord($config, $tablename, $output)
 	{
 		$manager = TActiveRecordManager::getInstance();
-		if($manager->getDbConnection()) {
+		if ($manager->getDbConnection()) {
 			$gateway = $manager->getRecordGateway();
 			$tableInfo = $gateway->getTableInfo($manager->getDbConnection(), $tablename);
-			if(count($tableInfo->getColumns()) === 0)
+			if (count($tableInfo->getColumns()) === 0)
 			{
-				echo '** Unable to find table or view "' . $tablename . '" in "' . $manager->getDbConnection()->getConnectionString() . "\".\n";
+				echo '** Unable to find table or view "'.$tablename.'" in "'.$manager->getDbConnection()->getConnectionString()."\".\n";
 				return false;
 			}
 			else
 			{
 				$properties = [];
-				foreach($tableInfo->getColumns() as $field => $column)
+				foreach ($tableInfo->getColumns() as $field => $column)
 					$properties[] = $this->generateProperty($field, $column);
 			}
 
@@ -567,16 +567,16 @@ 
 			echo "  Writing class $classname to file $output\n";
 			file_put_contents($output, $class);
 		} else {
-			echo '** Unable to connect to database with ConnectionID=\'' . $config->getConnectionID() . "'. Please check your settings in application.xml and ensure your database connection is set up first.\n";
+			echo '** Unable to connect to database with ConnectionID=\''.$config->getConnectionID()."'. Please check your settings in application.xml and ensure your database connection is set up first.\n";
 		}
 	}
 
 	protected function generateProperty($field, $column)
 	{
 		$prop = '';
-		$name = '$' . $field;
+		$name = '$'.$field;
 		$type = $column->getPHPType();
-		if($this->_soap)
+		if ($this->_soap)
 		{
 			$prop .= <<<EOD
 
@@ -648,7 +648,7 @@ 
 			$con = $manager->getDbConnection();
 			$con->Active = true;
 
-			switch($con->getDriverName())
+			switch ($con->getDriverName())
 			   {
 				case 'mysqli':
 				case 'mysql':
@@ -665,7 +665,7 @@ 
 				case 'oci':
 //				case 'ibm':
 				default:
-					echo "\n    Sorry, generateAll is not implemented for " . $con->getDriverName() . "\n";
+					echo "\n    Sorry, generateAll is not implemented for ".$con->getDriverName()."\n";
 					
 			   }
 
@@ -677,9 +677,9 @@ 
 			}
 			$con->Active = false;
 			foreach ($tables as $key => $table) {
-				$output = $args[1] . "." . $this->_prefix . ucfirst($table) . $this->_postfix;
+				$output = $args[1].".".$this->_prefix.ucfirst($table).$this->_postfix;
 				if ($config !== false && $output !== false) {
-					$this->generate("generate " . $table . " " . $output . " " . $this->_soap . " " . $this->_overwrite);
+					$this->generate("generate ".$table." ".$output." ".$this->_soap." ".$this->_overwrite);
 				}
 			}
 		}
@@ -689,14 +689,14 @@ 
 	public function generate($l)
 	{
 		$input = explode(" ", trim($l));
-		if(count($input) > 2)
+		if (count($input) > 2)
 		{
 			$app_dir = '.';
-			if(Prado::getApplication() !== null)
+			if (Prado::getApplication() !== null)
 				$app_dir = dirname(Prado::getApplication()->getBasePath());
-			$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];
+			if (count($input) > 3)
+				$args = [$input[0], $input[1], $input[2], $app_dir, 'soap'];
 			$cmd = new PradoCommandLineActiveRecordGen;
 			$cmd->performAction($args);
 		}
@@ -709,18 +709,18 @@ 
 	protected function getAppDir($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";
+		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";
+		echo '** Unable to find application.xml in '.$app_dir."\n";
 		return false;
 	}
 
@@ -732,7 +732,7 @@ 
 			foreach ($app->getModules() as $module)
 				if ($module instanceof TActiveRecordConfig)
 					return $module;
-			echo '** Unable to find TActiveRecordConfig module in ' . $xml . "\n";
+			echo '** Unable to find TActiveRecordConfig module in '.$xml."\n";
 		}
 		return false;
 	}
@@ -745,7 +745,7 @@ 
 			if (strpos($path, $app_dir) === 0)
 				return $file;
 		}
-		echo '** Output file ' . $file . ' must be within directory ' . $app_dir . "\n";
+		echo '** Output file '.$file.' must be within directory '.$app_dir."\n";
 		return false;
 	}
 

Braces +106 added lines, -77 removed lines

@@ -9,8 +9,9 @@ 
  * @license https://github.com/pradosoft/prado/blob/master/LICENSE
  */
 
-if(!isset($_SERVER['argv']) || php_sapi_name() !== 'cli')
+if(!isset($_SERVER['argv']) || php_sapi_name() !== 'cli') {
 	die('Must be run from the command line');
+}
 
 // Locate composer's autoloader
 if(file_exists($autoloader = realpath(__DIR__ . '/../vendor/autoload.php')))
@@ -78,8 +79,9 @@ 
 	public static function getInstance()
 	{
 		static $instance;
-		if($instance === null)
-			$instance = new self;
+		if($instance === null) {
+					$instance = new self;
+		}
 		return $instance;
 	}
 
@@ -94,8 +96,9 @@ 
 	 */
 	public function run($args)
 	{
-		if(count($args) > 1)
-			array_shift($args);
+		if(count($args) > 1) {
+					array_shift($args);
+		}
 		$valid = false;
 		foreach($this->_actions as $class => $action)
 		{
@@ -103,14 +106,14 @@ 
 			{
 				$valid |= $action->performAction($args);
 				break;
-			}
-			else
+			} else
 			{
 				$valid = false;
 			}
 		}
-		if(!$valid)
-			$this->printHelp();
+		if(!$valid) {
+					$this->printHelp();
+		}
 	}
 
 	/**
@@ -123,8 +126,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();
+		}
 	}
 }
 
@@ -150,8 +154,9 @@ 
 			mkdir($dir);
 			echo "creating $dir\n";
 		}
-		if(is_dir($dir))
-			chmod($dir, $mask);
+		if(is_dir($dir)) {
+					chmod($dir, $mask);
+		}
 	}
 
 	protected function createFile($filename, $content)
@@ -172,16 +177,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 +213,7 @@ 
 			}
 
 			return Prado::getApplication();
-		}
-		else
+		} else
 		{
 			PradoCommandLineInterpreter::printGreeting();
 			echo '+' . str_repeat('-', 77) . "+\n";
@@ -243,15 +250,17 @@ 
 	 */
 	protected function createNewPradoProject($dir)
 	{
-		if(strlen(trim($dir)) == 0)
-			return;
+		if(strlen(trim($dir)) == 0) {
+					return;
+		}
 
 		$rootPath = realpath(dirname(trim($dir)));
 
-		if(basename($dir) !== '.')
-			$basePath = $rootPath . DIRECTORY_SEPARATOR . basename($dir);
-		else
-			$basePath = $rootPath;
+		if(basename($dir) !== '.') {
+					$basePath = $rootPath . DIRECTORY_SEPARATOR . basename($dir);
+		} else {
+					$basePath = $rootPath;
+		}
 		$appName = basename($basePath);
 		$assetPath = $basePath . DIRECTORY_SEPARATOR . 'assets';
 		$protectedPath = $basePath . DIRECTORY_SEPARATOR . 'protected';
@@ -390,8 +399,9 @@ 
 
 	protected function createTestFixtures($dir)
 	{
-		if(strlen(trim($dir)) == 0)
-			return;
+		if(strlen(trim($dir)) == 0) {
+					return;
+		}
 
 		$rootPath = realpath(dirname(trim($dir)));
 		$basePath = $rootPath . '/' . basename($dir);
@@ -457,8 +467,9 @@ 
 
 	public function performAction($args)
 	{
-		if(count($args) > 1)
-			$this->initializePradoApplication($args[1]);
+		if(count($args) > 1) {
+					$this->initializePradoApplication($args[1]);
+		}
 
 		\Psy\debug([], Prado::getApplication());
 		return true;
@@ -487,44 +498,51 @@ 
 		{
 			$config = $this->getActiveRecordConfig($app_dir);
 			$output = $this->getOutputFile($app_dir, $args[2]);
-			if(is_file($output))
-				echo "** File $output already exists, skiping. \n";
-			elseif($config !== false && $output !== false)
-				$this->generateActiveRecord($config, $args[1], $output);
+			if(is_file($output)) {
+							echo "** File $output already exists, skiping. \n";
+			} elseif($config !== false && $output !== false) {
+							$this->generateActiveRecord($config, $args[1], $output);
+			}
 		}
 		return true;
 	}
 
 	protected function getAppDir($dir = ".")
 	{
-		if(is_dir($dir))
-			return realpath($dir);
-		if(false !== ($app_dir = realpath($dir . '/protected/')) && is_dir($app_dir))
-			return $app_dir;
+		if(is_dir($dir)) {
+					return realpath($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))
-			return $xml;
-		if(false !== ($xml = realpath($app_dir . '/protected/application.xml')) && is_file($xml))
-			return $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)) {
+					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)))
-			return false;
+		if(false === ($xml = $this->getXmlFile($app_dir))) {
+					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;
@@ -532,13 +550,15 @@ 
 
 	protected function getOutputFile($app_dir, $namespace)
 	{
-		if(is_file($namespace) && strpos($namespace, $app_dir) === 0)
-				return $namespace;
+		if(is_file($namespace) && strpos($namespace, $app_dir) === 0) {
+						return $namespace;
+		}
 		$file = Prado::getPathOfNamespace($namespace, ".php");
 		if($file !== null && false !== ($path = realpath(dirname($file))) && is_dir($path))
 		{
-			if(strpos($path, $app_dir) === 0)
-				return $file;
+			if(strpos($path, $app_dir) === 0) {
+							return $file;
+			}
 		}
 		echo '** Output file ' . $file . ' must be within directory ' . $app_dir . "\n";
 		return false;
@@ -554,12 +574,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');
@@ -692,58 +712,67 @@ 
 		if(count($input) > 2)
 		{
 			$app_dir = '.';
-			if(Prado::getApplication() !== null)
-				$app_dir = dirname(Prado::getApplication()->getBasePath());
+			if(Prado::getApplication() !== null) {
+							$app_dir = dirname(Prado::getApplication()->getBasePath());
+			}
 			$args = [$input[0],$input[1], $input[2],$app_dir];
-			if(count($input) > 3)
-				$args = [$input[0],$input[1], $input[2],$app_dir,'soap'];
+			if(count($input) > 3) {
+							$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";
 		}
 	}
 
 	protected function getAppDir($dir = ".") {
-		if (is_dir($dir))
-			return realpath($dir);
-		if (false !== ($app_dir = realpath($dir . '/protected/')) && is_dir($app_dir))
-			return $app_dir;
+		if (is_dir($dir)) {
+					return realpath($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))
-			return $xml;
-		if (false !== ($xml = realpath($app_dir . '/protected/application.xml')) && is_file($xml))
-			return $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)) {
+					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)))
-			return false;
+		if (false === ($xml = $this->getXmlFile($app_dir))) {
+					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;
 	}
 
 	protected function getOutputFile($app_dir, $namespace) {
-		if (is_file($namespace) && strpos($namespace, $app_dir) === 0)
-			return $namespace;
+		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)
-				return $file;
+			if (strpos($path, $app_dir) === 0) {
+							return $file;
+			}
 		}
 		echo '** Output file ' . $file . ' must be within directory ' . $app_dir . "\n";
 		return false;

framework/TApplication.php

Spacing +75 added lines, -75 removed lines

@@ -300,13 +300,13 @@ 
 		$this->setConfigurationType($configType);
 		$this->resolvePaths($basePath);
 
-		if($cacheConfig)
-			$this->_cacheFile = $this->_runtimePath . DIRECTORY_SEPARATOR . self::CONFIGCACHE_FILE;
+		if ($cacheConfig)
+			$this->_cacheFile = $this->_runtimePath.DIRECTORY_SEPARATOR.self::CONFIGCACHE_FILE;
 
 		// 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);
 	}
@@ -324,11 +324,11 @@ 
 	protected function resolvePaths($basePath)
 	{
 		// determine configuration path and file
-		if(empty($basePath) || ($basePath = realpath($basePath)) === false)
+		if (empty($basePath) || ($basePath = realpath($basePath)) === false)
 			throw new TConfigurationException('application_basepath_invalid', $basePath);
-		if(is_dir($basePath) && is_file($basePath . DIRECTORY_SEPARATOR . $this->getConfigurationFileName()))
-			$configFile = $basePath . DIRECTORY_SEPARATOR . $this->getConfigurationFileName();
-		elseif(is_file($basePath))
+		if (is_dir($basePath) && is_file($basePath.DIRECTORY_SEPARATOR.$this->getConfigurationFileName()))
+			$configFile = $basePath.DIRECTORY_SEPARATOR.$this->getConfigurationFileName();
+		elseif (is_file($basePath))
 		{
 			$configFile = $basePath;
 			$basePath = dirname($configFile);
@@ -337,15 +337,15 @@ 
 			$configFile = null;
 
 		// determine runtime path
-		$runtimePath = $basePath . DIRECTORY_SEPARATOR . self::RUNTIME_PATH;
-		if(is_writable($runtimePath))
+		$runtimePath = $basePath.DIRECTORY_SEPARATOR.self::RUNTIME_PATH;
+		if (is_writable($runtimePath))
 		{
-			if($configFile !== null)
+			if ($configFile !== null)
 			{
-				$runtimePath .= DIRECTORY_SEPARATOR . basename($configFile) . '-' . Prado::getVersion();
-				if(!is_dir($runtimePath))
+				$runtimePath .= DIRECTORY_SEPARATOR.basename($configFile).'-'.Prado::getVersion();
+				if (!is_dir($runtimePath))
 				{
-					if(@mkdir($runtimePath) === false)
+					if (@mkdir($runtimePath) === false)
 						throw new TConfigurationException('application_runtimepath_failed', $runtimePath);
 					@chmod($runtimePath, PRADO_CHMOD); //make it deletable
 				}
@@ -372,11 +372,11 @@ 
 			$n = count(self::$_steps);
 			$this->_step = 0;
 			$this->_requestCompleted = false;
-			while($this->_step < $n)
+			while ($this->_step < $n)
 			{
-				if($this->_mode === TApplicationMode::Off)
+				if ($this->_mode === TApplicationMode::Off)
 					throw new THttpException(503, 'application_unavailable');
-				if($this->_requestCompleted)
+				if ($this->_requestCompleted)
 					break;
 				$method = self::$_steps[$this->_step];
 				Prado::trace("Executing $method()", 'Prado\TApplication');
@@ -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;
 	}
 
 	/**
@@ -435,11 +435,11 @@ 
 	public function setGlobalState($key, $value, $defaultValue = null, $forceSave = false)
 	{
 		$this->_stateChanged = true;
-		if($value === $defaultValue)
+		if ($value === $defaultValue)
 			unset($this->_globals[$key]);
 		else
 			$this->_globals[$key] = $value;
-		if($forceSave)
+		if ($forceSave)
 			$this->saveGlobals();
 	}
 
@@ -472,7 +472,7 @@ 
 	 */
 	protected function saveGlobals()
 	{
-		if($this->_stateChanged)
+		if ($this->_stateChanged)
 		{
 			$this->_stateChanged = false;
 			$this->getApplicationStatePersister()->save($this->_globals);
@@ -588,9 +588,9 @@ 
 	 */
 	public function getConfigurationFileExt()
 	{
-		if($this->_configFileExt === null)
+		if ($this->_configFileExt === null)
 		{
-			switch($this->_configType)
+			switch ($this->_configType)
 			{
 				case TApplication::CONFIG_TYPE_PHP:
 					$this->_configFileExt = TApplication::CONFIG_FILE_EXT_PHP;
@@ -608,9 +608,9 @@ 
 	public function getConfigurationFileName()
 	{
 		static $fileName;
-		if($fileName == null)
+		if ($fileName == null)
 		{
-			switch($this->_configType)
+			switch ($this->_configType)
 			{
 				case TApplication::CONFIG_TYPE_PHP:
 					$fileName = TApplication::CONFIG_FILE_PHP;
@@ -636,8 +636,8 @@ 
 	public function setRuntimePath($value)
 	{
 		$this->_runtimePath = $value;
-		if($this->_cacheFile)
-			$this->_cacheFile = $this->_runtimePath . DIRECTORY_SEPARATOR . self::CONFIGCACHE_FILE;
+		if ($this->_cacheFile)
+			$this->_cacheFile = $this->_runtimePath.DIRECTORY_SEPARATOR.self::CONFIGCACHE_FILE;
 		// generates unique ID by hashing the runtime path
 		$this->_uniqueID = md5($this->_runtimePath);
 	}
@@ -666,7 +666,7 @@ 
 	 */
 	public function setModule($id, IModule $module = null)
 	{
-		if(isset($this->_modules[$id]))
+		if (isset($this->_modules[$id]))
 			throw new TConfigurationException('application_moduleid_duplicated', $id);
 		else
 			$this->_modules[$id] = $module;
@@ -677,11 +677,11 @@ 
 	 */
 	public function getModule($id)
 	{
-		if(!array_key_exists($id, $this->_modules))
+		if (!array_key_exists($id, $this->_modules))
 			return null;
 
 		// force loading of a lazy module
-		if($this->_modules[$id] === null)
+		if ($this->_modules[$id] === null)
 		{
 			$module = $this->internalLoadModule($id, true);
 			$module[0]->init($module[1]);
@@ -716,7 +716,7 @@ 
 	 */
 	public function getRequest()
 	{
-		if(!$this->_request)
+		if (!$this->_request)
 		{
 			$this->_request = new \Prado\Web\THttpRequest;
 			$this->_request->init(null);
@@ -737,7 +737,7 @@ 
 	 */
 	public function getResponse()
 	{
-		if(!$this->_response)
+		if (!$this->_response)
 		{
 			$this->_response = new THttpResponse;
 			$this->_response->init(null);
@@ -758,7 +758,7 @@ 
 	 */
 	public function getSession()
 	{
-		if(!$this->_session)
+		if (!$this->_session)
 		{
 			$this->_session = new THttpSession;
 			$this->_session->init(null);
@@ -779,7 +779,7 @@ 
 	 */
 	public function getErrorHandler()
 	{
-		if(!$this->_errorHandler)
+		if (!$this->_errorHandler)
 		{
 			$this->_errorHandler = new TErrorHandler;
 			$this->_errorHandler->init(null);
@@ -800,7 +800,7 @@ 
 	 */
 	public function getSecurityManager()
 	{
-		if(!$this->_security)
+		if (!$this->_security)
 		{
 			$this->_security = new TSecurityManager;
 			$this->_security->init(null);
@@ -821,7 +821,7 @@ 
 	 */
 	public function getAssetManager()
 	{
-		if(!$this->_assetManager)
+		if (!$this->_assetManager)
 		{
 			$this->_assetManager = new TAssetManager;
 			$this->_assetManager->init(null);
@@ -842,7 +842,7 @@ 
 	 */
 	public function getApplicationStatePersister()
 	{
-		if(!$this->_statePersister)
+		if (!$this->_statePersister)
 		{
 			$this->_statePersister = new TApplicationStatePersister;
 			$this->_statePersister->init(null);
@@ -896,7 +896,7 @@ 
 	 */
 	public function getGlobalization($createIfNotExists = true)
 	{
-		if($this->_globalization === null && $createIfNotExists)
+		if ($this->_globalization === null && $createIfNotExists)
 		{
 			$this->_globalization = new TGlobalization;
 			$this->_globalization->init(null);
@@ -917,7 +917,7 @@ 
 	 */
 	public function getAuthorizationRules()
 	{
-		if($this->_authRules === null)
+		if ($this->_authRules === null)
 			$this->_authRules = new \Prado\Security\TAuthorizationRuleCollection;
 		return $this->_authRules;
 	}
@@ -930,7 +930,7 @@ 
 	protected function internalLoadModule($id, $force = false)
 	{
 		list($moduleClass, $initProperties, $configElement) = $this->_lazyModules[$id];
-		if(isset($initProperties['lazy']) && $initProperties['lazy'] && !$force)
+		if (isset($initProperties['lazy']) && $initProperties['lazy'] && !$force)
 		{
 			Prado::trace("Postponed loading of lazy module $id ({$moduleClass})", '\Prado\TApplication');
 			$this->setModule($id, null);
@@ -939,16 +939,16 @@ 
 
 		Prado::trace("Loading module $id ({$moduleClass})", '\Prado\TApplication');
 		$module = Prado::createComponent($moduleClass);
-		foreach($initProperties as $name => $value)
+		foreach ($initProperties as $name => $value)
 		{
-			if($name === 'lazy') continue;
+			if ($name === 'lazy') continue;
 			$module->setSubProperty($name, $value);
 		}
 		$this->setModule($id, $module);
 		// 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.
@@ -957,32 +957,32 @@ 
 	 */
 	public function applyConfiguration($config, $withinService = false)
 	{
-		if($config->getIsEmpty())
+		if ($config->getIsEmpty())
 			return;
 
 		// set path aliases and using namespaces
-		foreach($config->getAliases() as $alias => $path)
+		foreach ($config->getAliases() as $alias => $path)
 			Prado::setPathOfAlias($alias, $path);
-		foreach($config->getUsings() as $using)
+		foreach ($config->getUsings() as $using)
 			Prado::using($using);
 
 		// set application properties
-		if(!$withinService)
+		if (!$withinService)
 		{
-			foreach($config->getProperties() as $name => $value)
+			foreach ($config->getProperties() as $name => $value)
 				$this->setSubProperty($name, $value);
 		}
 
-		if(empty($this->_services))
-			$this->_services = [$this->getPageServiceID() => ['Prado\Web\Services\TPageService',[],null]];
+		if (empty($this->_services))
+			$this->_services = [$this->getPageServiceID() => ['Prado\Web\Services\TPageService', [], null]];
 
 		// load parameters
-		foreach($config->getParameters() as $id => $parameter)
+		foreach ($config->getParameters() as $id => $parameter)
 		{
-			if(is_array($parameter))
+			if (is_array($parameter))
 			{
 				$component = Prado::createComponent($parameter[0]);
-				foreach($parameter[1] as $name => $value)
+				foreach ($parameter[1] as $name => $value)
 					$component->setSubProperty($name, $value);
 				$this->_parameters->add($id, $component);
 			}
@@ -992,29 +992,29 @@ 
 
 		// load and init modules specified in app config
 		$modules = [];
-		foreach($config->getModules() as $id => $moduleConfig)
+		foreach ($config->getModules() as $id => $moduleConfig)
 		{
-			if(!is_string($id))
-				$id = '_module' . count($this->_lazyModules);
+			if (!is_string($id))
+				$id = '_module'.count($this->_lazyModules);
 			$this->_lazyModules[$id] = $moduleConfig;
-			if($module = $this->internalLoadModule($id))
+			if ($module = $this->internalLoadModule($id))
 				$modules[] = $module;
 		}
-		foreach($modules as $module)
+		foreach ($modules as $module)
 			$module[0]->init($module[1]);
 
 		// load service
-		foreach($config->getServices() as $serviceID => $serviceConfig)
+		foreach ($config->getServices() as $serviceID => $serviceConfig)
 			$this->_services[$serviceID] = $serviceConfig;
 
 		// external configurations
-		foreach($config->getExternalConfigurations() as $filePath => $condition)
+		foreach ($config->getExternalConfigurations() as $filePath => $condition)
 		{
-			if($condition !== true)
+			if ($condition !== true)
 				$condition = $this->evaluateExpression($condition);
-			if($condition)
+			if ($condition)
 			{
-				if(($path = Prado::getPathOfNamespace($filePath, $this->getConfigurationFileExt())) === null || !is_file($path))
+				if (($path = Prado::getPathOfNamespace($filePath, $this->getConfigurationFileExt())) === null || !is_file($path))
 					throw new TConfigurationException('application_includefile_invalid', $filePath);
 				$cn = $this->getApplicationConfigurationClass();
 				$c = new $cn;
@@ -1037,13 +1037,13 @@ 
 	{
 		Prado::trace('Initializing application', 'Prado\TApplication');
 
-		if($this->_configFile !== null)
+		if ($this->_configFile !== null)
 		{
-			if($this->_cacheFile === null || @filemtime($this->_cacheFile) < filemtime($this->_configFile))
+			if ($this->_cacheFile === null || @filemtime($this->_cacheFile) < filemtime($this->_configFile))
 			{
 				$config = new TApplicationConfiguration;
 				$config->loadFromFile($this->_configFile);
-				if($this->_cacheFile !== null)
+				if ($this->_cacheFile !== null)
 					file_put_contents($this->_cacheFile, serialize($config), LOCK_EX);
 			}
 			else
@@ -1052,7 +1052,7 @@ 
 			$this->applyConfiguration($config, false);
 		}
 
-		if(($serviceID = $this->getRequest()->resolveRequest(array_keys($this->_services))) === null)
+		if (($serviceID = $this->getRequest()->resolveRequest(array_keys($this->_services))) === null)
 			$serviceID = $this->getPageServiceID();
 
 		$this->startService($serviceID);
@@ -1066,24 +1066,24 @@ 
 	 */
 	public function startService($serviceID)
 	{
-		if(isset($this->_services[$serviceID]))
+		if (isset($this->_services[$serviceID]))
 		{
 			list($serviceClass, $initProperties, $configElement) = $this->_services[$serviceID];
 			$service = Prado::createComponent($serviceClass);
-			if(!($service instanceof IService))
+			if (!($service instanceof IService))
 				throw new THttpException(500, 'application_service_invalid', $serviceClass);
-			if(!$service->getEnabled())
+			if (!$service->getEnabled())
 				throw new THttpException(500, 'application_service_unavailable', $serviceClass);
 			$service->setID($serviceID);
 			$this->setService($service);
 
-			foreach($initProperties as $name => $value)
+			foreach ($initProperties as $name => $value)
 				$service->setSubProperty($name, $value);
 
-			if($configElement !== null)
+			if ($configElement !== null)
 			{
 				$config = new TApplicationConfiguration;
-				if($this->getConfigurationType() == self::CONFIG_TYPE_PHP)
+				if ($this->getConfigurationType() == self::CONFIG_TYPE_PHP)
 					$config->loadFromPhp($configElement, $this->getBasePath());
 				else
 					$config->loadFromXml($configElement, $this->getBasePath());
@@ -1190,7 +1190,7 @@ 
 	 */
 	public function runService()
 	{
-		if($this->_service)
+		if ($this->_service)
 			$this->_service->run();
 	}
 
@@ -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);
 	}
 }

Braces +113 added lines, -82 removed lines

@@ -300,8 +300,9 @@ 
 		$this->setConfigurationType($configType);
 		$this->resolvePaths($basePath);
 
-		if($cacheConfig)
-			$this->_cacheFile = $this->_runtimePath . DIRECTORY_SEPARATOR . self::CONFIGCACHE_FILE;
+		if($cacheConfig) {
+					$this->_cacheFile = $this->_runtimePath . DIRECTORY_SEPARATOR . self::CONFIGCACHE_FILE;
+		}
 
 		// generates unique ID by hashing the runtime path
 		$this->_uniqueID = md5($this->_runtimePath);
@@ -324,17 +325,18 @@ 
 	protected function resolvePaths($basePath)
 	{
 		// determine configuration path and file
-		if(empty($basePath) || ($basePath = realpath($basePath)) === false)
-			throw new TConfigurationException('application_basepath_invalid', $basePath);
-		if(is_dir($basePath) && is_file($basePath . DIRECTORY_SEPARATOR . $this->getConfigurationFileName()))
-			$configFile = $basePath . DIRECTORY_SEPARATOR . $this->getConfigurationFileName();
-		elseif(is_file($basePath))
+		if(empty($basePath) || ($basePath = realpath($basePath)) === false) {
+					throw new TConfigurationException('application_basepath_invalid', $basePath);
+		}
+		if(is_dir($basePath) && is_file($basePath . DIRECTORY_SEPARATOR . $this->getConfigurationFileName())) {
+					$configFile = $basePath . DIRECTORY_SEPARATOR . $this->getConfigurationFileName();
+		} elseif(is_file($basePath))
 		{
 			$configFile = $basePath;
 			$basePath = dirname($configFile);
+		} else {
+					$configFile = null;
 		}
-		else
-			$configFile = null;
 
 		// determine runtime path
 		$runtimePath = $basePath . DIRECTORY_SEPARATOR . self::RUNTIME_PATH;
@@ -345,17 +347,18 @@ 
 				$runtimePath .= DIRECTORY_SEPARATOR . basename($configFile) . '-' . Prado::getVersion();
 				if(!is_dir($runtimePath))
 				{
-					if(@mkdir($runtimePath) === false)
-						throw new TConfigurationException('application_runtimepath_failed', $runtimePath);
+					if(@mkdir($runtimePath) === false) {
+											throw new TConfigurationException('application_runtimepath_failed', $runtimePath);
+					}
 					@chmod($runtimePath, PRADO_CHMOD); //make it deletable
 				}
 				$this->setConfigurationFile($configFile);
 			}
 			$this->setBasePath($basePath);
 			$this->setRuntimePath($runtimePath);
+		} else {
+					throw new TConfigurationException('application_runtimepath_invalid', $runtimePath);
 		}
-		else
-			throw new TConfigurationException('application_runtimepath_invalid', $runtimePath);
 
 	}
 
@@ -374,17 +377,18 @@ 
 			$this->_requestCompleted = false;
 			while($this->_step < $n)
 			{
-				if($this->_mode === TApplicationMode::Off)
-					throw new THttpException(503, 'application_unavailable');
-				if($this->_requestCompleted)
-					break;
+				if($this->_mode === TApplicationMode::Off) {
+									throw new THttpException(503, 'application_unavailable');
+				}
+				if($this->_requestCompleted) {
+									break;
+				}
 				$method = self::$_steps[$this->_step];
 				Prado::trace("Executing $method()", 'Prado\TApplication');
 				$this->$method();
 				$this->_step++;
 			}
-		}
-		catch(\Exception $e)
+		} catch(\Exception $e)
 		{
 			$this->onError($e);
 		}
@@ -435,12 +439,14 @@ 
 	public function setGlobalState($key, $value, $defaultValue = null, $forceSave = false)
 	{
 		$this->_stateChanged = true;
-		if($value === $defaultValue)
-			unset($this->_globals[$key]);
-		else
-			$this->_globals[$key] = $value;
-		if($forceSave)
-			$this->saveGlobals();
+		if($value === $defaultValue) {
+					unset($this->_globals[$key]);
+		} else {
+					$this->_globals[$key] = $value;
+		}
+		if($forceSave) {
+					$this->saveGlobals();
+		}
 	}
 
 	/**
@@ -636,8 +642,9 @@ 
 	public function setRuntimePath($value)
 	{
 		$this->_runtimePath = $value;
-		if($this->_cacheFile)
-			$this->_cacheFile = $this->_runtimePath . DIRECTORY_SEPARATOR . self::CONFIGCACHE_FILE;
+		if($this->_cacheFile) {
+					$this->_cacheFile = $this->_runtimePath . DIRECTORY_SEPARATOR . self::CONFIGCACHE_FILE;
+		}
 		// generates unique ID by hashing the runtime path
 		$this->_uniqueID = md5($this->_runtimePath);
 	}
@@ -666,10 +673,11 @@ 
 	 */
 	public function setModule($id, IModule $module = null)
 	{
-		if(isset($this->_modules[$id]))
-			throw new TConfigurationException('application_moduleid_duplicated', $id);
-		else
-			$this->_modules[$id] = $module;
+		if(isset($this->_modules[$id])) {
+					throw new TConfigurationException('application_moduleid_duplicated', $id);
+		} else {
+					$this->_modules[$id] = $module;
+		}
 	}
 
 	/**
@@ -677,8 +685,9 @@ 
 	 */
 	public function getModule($id)
 	{
-		if(!array_key_exists($id, $this->_modules))
-			return null;
+		if(!array_key_exists($id, $this->_modules)) {
+					return null;
+		}
 
 		// force loading of a lazy module
 		if($this->_modules[$id] === null)
@@ -917,8 +926,9 @@ 
 	 */
 	public function getAuthorizationRules()
 	{
-		if($this->_authRules === null)
-			$this->_authRules = new \Prado\Security\TAuthorizationRuleCollection;
+		if($this->_authRules === null) {
+					$this->_authRules = new \Prado\Security\TAuthorizationRuleCollection;
+		}
 		return $this->_authRules;
 	}
 
@@ -941,7 +951,9 @@ 
 		$module = Prado::createComponent($moduleClass);
 		foreach($initProperties as $name => $value)
 		{
-			if($name === 'lazy') continue;
+			if($name === 'lazy') {
+				continue;
+			}
 			$module->setSubProperty($name, $value);
 		}
 		$this->setModule($id, $module);
@@ -957,24 +969,29 @@ 
 	 */
 	public function applyConfiguration($config, $withinService = false)
 	{
-		if($config->getIsEmpty())
-			return;
+		if($config->getIsEmpty()) {
+					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))
-			$this->_services = [$this->getPageServiceID() => ['Prado\Web\Services\TPageService',[],null]];
+		if(empty($this->_services)) {
+					$this->_services = [$this->getPageServiceID() => ['Prado\Web\Services\TPageService',[],null]];
+		}
 
 		// load parameters
 		foreach($config->getParameters() as $id => $parameter)
@@ -982,40 +999,47 @@ 
 			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 {
+							$this->_parameters->add($id, $parameter);
 			}
-			else
-				$this->_parameters->add($id, $parameter);
 		}
 
 		// load and init modules specified in app config
 		$modules = [];
 		foreach($config->getModules() as $id => $moduleConfig)
 		{
-			if(!is_string($id))
-				$id = '_module' . count($this->_lazyModules);
+			if(!is_string($id)) {
+							$id = '_module' . count($this->_lazyModules);
+			}
 			$this->_lazyModules[$id] = $moduleConfig;
-			if($module = $this->internalLoadModule($id))
-				$modules[] = $module;
+			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)
 		{
-			if($condition !== true)
-				$condition = $this->evaluateExpression($condition);
+			if($condition !== true) {
+							$condition = $this->evaluateExpression($condition);
+			}
 			if($condition)
 			{
-				if(($path = Prado::getPathOfNamespace($filePath, $this->getConfigurationFileExt())) === null || !is_file($path))
-					throw new TConfigurationException('application_includefile_invalid', $filePath);
+				if(($path = Prado::getPathOfNamespace($filePath, $this->getConfigurationFileExt())) === null || !is_file($path)) {
+									throw new TConfigurationException('application_includefile_invalid', $filePath);
+				}
 				$cn = $this->getApplicationConfigurationClass();
 				$c = new $cn;
 				$c->loadFromFile($path);
@@ -1043,17 +1067,19 @@ 
 			{
 				$config = new TApplicationConfiguration;
 				$config->loadFromFile($this->_configFile);
-				if($this->_cacheFile !== null)
-					file_put_contents($this->_cacheFile, serialize($config), LOCK_EX);
+				if($this->_cacheFile !== null) {
+									file_put_contents($this->_cacheFile, serialize($config), LOCK_EX);
+				}
+			} else {
+							$config = unserialize(file_get_contents($this->_cacheFile));
 			}
-			else
-				$config = unserialize(file_get_contents($this->_cacheFile));
 
 			$this->applyConfiguration($config, false);
 		}
 
-		if(($serviceID = $this->getRequest()->resolveRequest(array_keys($this->_services))) === null)
-			$serviceID = $this->getPageServiceID();
+		if(($serviceID = $this->getRequest()->resolveRequest(array_keys($this->_services))) === null) {
+					$serviceID = $this->getPageServiceID();
+		}
 
 		$this->startService($serviceID);
 	}
@@ -1070,30 +1096,34 @@ 
 		{
 			list($serviceClass, $initProperties, $configElement) = $this->_services[$serviceID];
 			$service = Prado::createComponent($serviceClass);
-			if(!($service instanceof IService))
-				throw new THttpException(500, 'application_service_invalid', $serviceClass);
-			if(!$service->getEnabled())
-				throw new THttpException(500, 'application_service_unavailable', $serviceClass);
+			if(!($service instanceof IService)) {
+							throw new THttpException(500, 'application_service_invalid', $serviceClass);
+			}
+			if(!$service->getEnabled()) {
+							throw new THttpException(500, 'application_service_unavailable', $serviceClass);
+			}
 			$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)
 			{
 				$config = new TApplicationConfiguration;
-				if($this->getConfigurationType() == self::CONFIG_TYPE_PHP)
-					$config->loadFromPhp($configElement, $this->getBasePath());
-				else
-					$config->loadFromXml($configElement, $this->getBasePath());
+				if($this->getConfigurationType() == self::CONFIG_TYPE_PHP) {
+									$config->loadFromPhp($configElement, $this->getBasePath());
+				} else {
+									$config->loadFromXml($configElement, $this->getBasePath());
+				}
 				$this->applyConfiguration($config, true);
 			}
 
 			$service->init($configElement);
+		} else {
+					throw new THttpException(500, 'application_service_unknown', $serviceID);
 		}
-		else
-			throw new THttpException(500, 'application_service_unknown', $serviceID);
 	}
 
 	/**
@@ -1190,8 +1220,9 @@ 
 	 */
 	public function runService()
 	{
-		if($this->_service)
-			$this->_service->run();
+		if($this->_service) {
+					$this->_service->run();
+		}
 	}
 
 	/**

framework/Security/TUserManager.php

Spacing +36 added lines, -36 removed lines

@@ -111,9 +111,9 @@ 
 	public function init($config)
 	{
 		$this->loadUserData($config);
-		if($this->_userFile !== null)
+		if ($this->_userFile !== null)
 		{
-			if($this->getApplication()->getConfigurationType() == TApplication::CONFIG_TYPE_PHP)
+			if ($this->getApplication()->getConfigurationType() == TApplication::CONFIG_TYPE_PHP)
 			{
 				$userFile = include $this->_userFile;
 				$this->loadUserDataFromPhp($userFile);
@@ -134,7 +134,7 @@ 
 	 */
 	private function loadUserData($config)
 	{
-		if($this->getApplication()->getConfigurationType() == TApplication::CONFIG_TYPE_PHP)
+		if ($this->getApplication()->getConfigurationType() == TApplication::CONFIG_TYPE_PHP)
 			$this->loadUserDataFromPhp($config);
 		else
 			$this->loadUserDataFromXml($config);
@@ -146,33 +146,33 @@ 
 	 */
 	private function loadUserDataFromPhp($config)
 	{
-		if(isset($config['users']) && is_array($config['users']))
+		if (isset($config['users']) && is_array($config['users']))
 		{
-			foreach($config['users'] as $user)
+			foreach ($config['users'] as $user)
 			{
-				$name = trim(strtolower(isset($user['name'])?$user['name']:''));
-				$password = isset($user['password'])?$user['password']:'';
+				$name = trim(strtolower(isset($user['name']) ? $user['name'] : ''));
+				$password = isset($user['password']) ? $user['password'] : '';
 				$this->_users[$name] = $password;
-				$roles = isset($user['roles'])?$user['roles']:'';
-				if($roles !== '')
+				$roles = isset($user['roles']) ? $user['roles'] : '';
+				if ($roles !== '')
 				{
-					foreach(explode(',', $roles) as $role)
+					foreach (explode(',', $roles) as $role)
 					{
-						if(($role = trim($role)) !== '')
+						if (($role = trim($role)) !== '')
 							$this->_roles[$name][] = $role;
 					}
 				}
 			}
 		}
-		if(isset($config['roles']) && is_array($config['roles']))
+		if (isset($config['roles']) && is_array($config['roles']))
 		{
-			foreach($config['roles'] as $role)
+			foreach ($config['roles'] as $role)
 			{
-				$name = isset($role['name'])?$role['name']:'';
-				$users = isset($role['users'])?$role['users']:'';
-				foreach(explode(',', $users) as $user)
+				$name = isset($role['name']) ? $role['name'] : '';
+				$users = isset($role['users']) ? $role['users'] : '';
+				foreach (explode(',', $users) as $user)
 				{
-					if(($user = trim($user)) !== '')
+					if (($user = trim($user)) !== '')
 						$this->_roles[strtolower($user)][] = $name;
 				}
 			}
@@ -185,24 +185,24 @@ 
 	 */
 	private function loadUserDataFromXml($xmlNode)
 	{
-		foreach($xmlNode->getElementsByTagName('user') as $node)
+		foreach ($xmlNode->getElementsByTagName('user') as $node)
 		{
 			$name = trim(strtolower($node->getAttribute('name')));
 			$this->_users[$name] = $node->getAttribute('password');
-			if(($roles = trim($node->getAttribute('roles'))) !== '')
+			if (($roles = trim($node->getAttribute('roles'))) !== '')
 			{
-				foreach(explode(',', $roles) as $role)
+				foreach (explode(',', $roles) as $role)
 				{
-					if(($role = trim($role)) !== '')
+					if (($role = trim($role)) !== '')
 						$this->_roles[$name][] = $role;
 				}
 			}
 		}
-		foreach($xmlNode->getElementsByTagName('role') as $node)
+		foreach ($xmlNode->getElementsByTagName('role') as $node)
 		{
-			foreach(explode(',', $node->getAttribute('users')) as $user)
+			foreach (explode(',', $node->getAttribute('users')) as $user)
 			{
-				if(($user = trim($user)) !== '')
+				if (($user = trim($user)) !== '')
 					$this->_roles[strtolower($user)][] = $node->getAttribute('name');
 			}
 		}
@@ -248,9 +248,9 @@ 
 	 */
 	public function setUserFile($value)
 	{
-		if($this->_initialized)
+		if ($this->_initialized)
 			throw new TInvalidOperationException('usermanager_userfile_unchangeable');
-		elseif(($this->_userFile = Prado::getPathOfNamespace($value, self::USER_FILE_EXT)) === null || !is_file($this->_userFile))
+		elseif (($this->_userFile = Prado::getPathOfNamespace($value, self::USER_FILE_EXT)) === null || !is_file($this->_userFile))
 			throw new TConfigurationException('usermanager_userfile_invalid', $value);
 	}
 
@@ -294,9 +294,9 @@ 
 	 */
 	public function validateUser($username, $password)
 	{
-		if($this->_passwordMode === TUserManagerPasswordMode::MD5)
+		if ($this->_passwordMode === TUserManagerPasswordMode::MD5)
 			$password = md5($password);
-		elseif($this->_passwordMode === TUserManagerPasswordMode::SHA1)
+		elseif ($this->_passwordMode === TUserManagerPasswordMode::SHA1)
 			$password = sha1($password);
 		$username = strtolower($username);
 		return (isset($this->_users[$username]) && $this->_users[$username] === $password);
@@ -309,7 +309,7 @@ 
 	 */
 	public function getUser($username = null)
 	{
-		if($username === null)
+		if ($username === null)
 		{
 			$user = new TUser($this);
 			$user->setIsGuest(true);
@@ -318,12 +318,12 @@ 
 		else
 		{
 			$username = strtolower($username);
-			if(isset($this->_users[$username]))
+			if (isset($this->_users[$username]))
 			{
 				$user = new TUser($this);
 				$user->setName($username);
 				$user->setIsGuest(false);
-				if(isset($this->_roles[$username]))
+				if (isset($this->_roles[$username]))
 					$user->setRoles($this->_roles[$username]);
 				return $user;
 			}
@@ -340,13 +340,13 @@ 
 	 */
 	public function getUserFromCookie($cookie)
 	{
-		if(($data = $cookie->getValue()) !== '')
+		if (($data = $cookie->getValue()) !== '')
 		{
 			$data = unserialize($data);
-			if(is_array($data) && count($data) === 2)
+			if (is_array($data) && count($data) === 2)
 			{
 				list($username, $token) = $data;
-				if(isset($this->_users[$username]) && $token === md5($username . $this->_users[$username]))
+				if (isset($this->_users[$username]) && $token === md5($username.$this->_users[$username]))
 					return $this->getUser($username);
 			}
 		}
@@ -362,9 +362,9 @@ 
 	{
 		$user = $this->getApplication()->getUser();
 		$username = strtolower($user->getName());
-		if(isset($this->_users[$username]))
+		if (isset($this->_users[$username]))
 		{
-			$data = [$username,md5($username . $this->_users[$username])];
+			$data = [$username, md5($username.$this->_users[$username])];
 			$cookie->setValue(serialize($data));
 		}
 	}

Braces +37 added lines, -30 removed lines

@@ -117,8 +117,7 @@ 
 			{
 				$userFile = include $this->_userFile;
 				$this->loadUserDataFromPhp($userFile);
-			}
-			else
+			} else
 			{
 				$dom = new TXmlDocument;
 				$dom->loadFromFile($this->_userFile);
@@ -134,10 +133,11 @@ 
 	 */
 	private function loadUserData($config)
 	{
-		if($this->getApplication()->getConfigurationType() == TApplication::CONFIG_TYPE_PHP)
-			$this->loadUserDataFromPhp($config);
-		else
-			$this->loadUserDataFromXml($config);
+		if($this->getApplication()->getConfigurationType() == TApplication::CONFIG_TYPE_PHP) {
+					$this->loadUserDataFromPhp($config);
+		} else {
+					$this->loadUserDataFromXml($config);
+		}
 	}
 
 	/**
@@ -158,8 +158,9 @@ 
 				{
 					foreach(explode(',', $roles) as $role)
 					{
-						if(($role = trim($role)) !== '')
-							$this->_roles[$name][] = $role;
+						if(($role = trim($role)) !== '') {
+													$this->_roles[$name][] = $role;
+						}
 					}
 				}
 			}
@@ -172,8 +173,9 @@ 
 				$users = isset($role['users'])?$role['users']:'';
 				foreach(explode(',', $users) as $user)
 				{
-					if(($user = trim($user)) !== '')
-						$this->_roles[strtolower($user)][] = $name;
+					if(($user = trim($user)) !== '') {
+											$this->_roles[strtolower($user)][] = $name;
+					}
 				}
 			}
 		}
@@ -193,8 +195,9 @@ 
 			{
 				foreach(explode(',', $roles) as $role)
 				{
-					if(($role = trim($role)) !== '')
-						$this->_roles[$name][] = $role;
+					if(($role = trim($role)) !== '') {
+											$this->_roles[$name][] = $role;
+					}
 				}
 			}
 		}
@@ -202,8 +205,9 @@ 
 		{
 			foreach(explode(',', $node->getAttribute('users')) as $user)
 			{
-				if(($user = trim($user)) !== '')
-					$this->_roles[strtolower($user)][] = $node->getAttribute('name');
+				if(($user = trim($user)) !== '') {
+									$this->_roles[strtolower($user)][] = $node->getAttribute('name');
+				}
 			}
 		}
 	}
@@ -248,10 +252,11 @@ 
 	 */
 	public function setUserFile($value)
 	{
-		if($this->_initialized)
-			throw new TInvalidOperationException('usermanager_userfile_unchangeable');
-		elseif(($this->_userFile = Prado::getPathOfNamespace($value, self::USER_FILE_EXT)) === null || !is_file($this->_userFile))
-			throw new TConfigurationException('usermanager_userfile_invalid', $value);
+		if($this->_initialized) {
+					throw new TInvalidOperationException('usermanager_userfile_unchangeable');
+		} elseif(($this->_userFile = Prado::getPathOfNamespace($value, self::USER_FILE_EXT)) === null || !is_file($this->_userFile)) {
+					throw new TConfigurationException('usermanager_userfile_invalid', $value);
+		}
 	}
 
 	/**
@@ -294,10 +299,11 @@ 
 	 */
 	public function validateUser($username, $password)
 	{
-		if($this->_passwordMode === TUserManagerPasswordMode::MD5)
-			$password = md5($password);
-		elseif($this->_passwordMode === TUserManagerPasswordMode::SHA1)
-			$password = sha1($password);
+		if($this->_passwordMode === TUserManagerPasswordMode::MD5) {
+					$password = md5($password);
+		} elseif($this->_passwordMode === TUserManagerPasswordMode::SHA1) {
+					$password = sha1($password);
+		}
 		$username = strtolower($username);
 		return (isset($this->_users[$username]) && $this->_users[$username] === $password);
 	}
@@ -314,8 +320,7 @@ 
 			$user = new TUser($this);
 			$user->setIsGuest(true);
 			return $user;
-		}
-		else
+		} else
 		{
 			$username = strtolower($username);
 			if(isset($this->_users[$username]))
@@ -323,12 +328,13 @@ 
 				$user = new TUser($this);
 				$user->setName($username);
 				$user->setIsGuest(false);
-				if(isset($this->_roles[$username]))
-					$user->setRoles($this->_roles[$username]);
+				if(isset($this->_roles[$username])) {
+									$user->setRoles($this->_roles[$username]);
+				}
 				return $user;
+			} else {
+							return null;
 			}
-			else
-				return null;
 		}
 	}
 
@@ -346,8 +352,9 @@ 
 			if(is_array($data) && count($data) === 2)
 			{
 				list($username, $token) = $data;
-				if(isset($this->_users[$username]) && $token === md5($username . $this->_users[$username]))
-					return $this->getUser($username);
+				if(isset($this->_users[$username]) && $token === md5($username . $this->_users[$username])) {
+									return $this->getUser($username);
+				}
 			}
 		}
 		return null;

framework/Security/TAuthManager.php

Spacing +34 added lines, -34 removed lines

@@ -89,22 +89,22 @@ 
 	 */
 	public function init($config)
 	{
-		if($this->_userManager === null)
+		if ($this->_userManager === null)
 			throw new TConfigurationException('authmanager_usermanager_required');
-		if($this->_returnUrlVarName === null)
-			$this->_returnUrlVarName = $this->getApplication()->getID() . ':' . self::RETURN_URL_VAR;
+		if ($this->_returnUrlVarName === null)
+			$this->_returnUrlVarName = $this->getApplication()->getID().':'.self::RETURN_URL_VAR;
 		$application = $this->getApplication();
-		if(is_string($this->_userManager))
+		if (is_string($this->_userManager))
 		{
-			if(($users = $application->getModule($this->_userManager)) === null)
+			if (($users = $application->getModule($this->_userManager)) === null)
 				throw new TConfigurationException('authmanager_usermanager_inexistent', $this->_userManager);
-			if(!($users instanceof IUserManager))
+			if (!($users instanceof IUserManager))
 				throw new TConfigurationException('authmanager_usermanager_invalid', $this->_userManager);
 			$this->_userManager = $users;
 		}
-		$application->attachEventHandler('OnAuthentication', [$this,'doAuthentication']);
-		$application->attachEventHandler('OnEndRequest', [$this,'leave']);
-		$application->attachEventHandler('OnAuthorization', [$this,'doAuthorization']);
+		$application->attachEventHandler('OnAuthentication', [$this, 'doAuthentication']);
+		$application->attachEventHandler('OnEndRequest', [$this, 'leave']);
+		$application->attachEventHandler('OnAuthorization', [$this, 'doAuthorization']);
 		$this->_initialized = true;
 	}
 
@@ -122,9 +122,9 @@ 
 	 */
 	public function setUserManager($provider)
 	{
-		if($this->_initialized)
+		if ($this->_initialized)
 			throw new TInvalidOperationException('authmanager_usermanager_unchangeable');
-		if(!is_string($provider) && !($provider instanceof IUserManager))
+		if (!is_string($provider) && !($provider instanceof IUserManager))
 			throw new TConfigurationException('authmanager_usermanager_invalid', $this->_userManager);
 		$this->_userManager = $provider;
 	}
@@ -160,7 +160,7 @@ 
 		$this->onAuthenticate($param);
 
 		$service = $this->getService();
-		if(($service instanceof TPageService) && $service->getRequestedPagePath() === $this->getLoginPage())
+		if (($service instanceof TPageService) && $service->getRequestedPagePath() === $this->getLoginPage())
 			$this->_skipAuthorization = true;
 	}
 
@@ -173,7 +173,7 @@ 
 	 */
 	public function doAuthorization($sender, $param)
 	{
-		if(!$this->_skipAuthorization)
+		if (!$this->_skipAuthorization)
 		{
 			$this->onAuthorize($param);
 		}
@@ -189,10 +189,10 @@ 
 	public function leave($sender, $param)
 	{
 		$application = $this->getApplication();
-		if($application->getResponse()->getStatusCode() === 401)
+		if ($application->getResponse()->getStatusCode() === 401)
 		{
 			$service = $application->getService();
-			if($service instanceof TPageService)
+			if ($service instanceof TPageService)
 			{
 				$returnUrl = $application->getRequest()->getRequestUri();
 				$this->setReturnUrl($returnUrl);
@@ -284,7 +284,7 @@ 
 		$application = $this->getApplication();
 
 		// restoring user info from session
-		if(($session = $application->getSession()) === null)
+		if (($session = $application->getSession()) === null)
 			throw new TConfigurationException('authmanager_session_required');
 		$session->open();
 		$sessionInfo = $session->itemAt($this->getUserKey());
@@ -295,12 +295,12 @@ 
 		($expiretime = $session->itemAt('AuthExpireTime')) && $expiretime < time();
 
 		// try authenticating through cookie if possible
-		if($this->getAllowAutoLogin() && ($user->getIsGuest() || $isAuthExpired))
+		if ($this->getAllowAutoLogin() && ($user->getIsGuest() || $isAuthExpired))
 		{
 			$cookie = $this->getRequest()->getCookies()->itemAt($this->getUserKey());
-			if($cookie instanceof THttpCookie)
+			if ($cookie instanceof THttpCookie)
 			{
-				if(($user2 = $this->_userManager->getUserFromCookie($cookie)) !== null)
+				if (($user2 = $this->_userManager->getUserFromCookie($cookie)) !== null)
 				{
 					$user = $user2;
 					$this->updateSessionUser($user);
@@ -313,13 +313,13 @@ 
 		$application->setUser($user);
 
 		// handle authentication expiration or update expiration time
-		if($isAuthExpired)
+		if ($isAuthExpired)
 			$this->onAuthExpire($param);
 		else
 			$session->add('AuthExpireTime', time() + $this->_authExpire);
 
 		// event handler gets a chance to do further auth work
-		if($this->hasEventHandler('OnAuthenticate'))
+		if ($this->hasEventHandler('OnAuthenticate'))
 			$this->raiseEvent('OnAuthenticate', $this, $application);
 	}
 
@@ -331,7 +331,7 @@ 
 	public function onAuthExpire($param)
 	{
 		$this->logout();
-		if($this->hasEventHandler('OnAuthExpire'))
+		if ($this->hasEventHandler('OnAuthExpire'))
 			$this->raiseEvent('OnAuthExpire', $this, $param);
 	}
 
@@ -345,9 +345,9 @@ 
 	public function onAuthorize($param)
 	{
 		$application = $this->getApplication();
-		if($this->hasEventHandler('OnAuthorize'))
+		if ($this->hasEventHandler('OnAuthorize'))
 			$this->raiseEvent('OnAuthorize', $this, $application);
-		if(!$application->getAuthorizationRules()->isUserAllowed($application->getUser(), $application->getRequest()->getRequestType(), $application->getRequest()->getUserHostAddress()))
+		if (!$application->getAuthorizationRules()->isUserAllowed($application->getUser(), $application->getRequest()->getRequestType(), $application->getRequest()->getUserHostAddress()))
 		{
 			$application->getResponse()->setStatusCode(401);
 			$application->completeRequest();
@@ -360,7 +360,7 @@ 
 	 */
 	public function getUserKey()
 	{
-		if($this->_userKey === null)
+		if ($this->_userKey === null)
 			$this->_userKey = $this->generateUserKey();
 		return $this->_userKey;
 	}
@@ -371,7 +371,7 @@ 
 	 */
 	protected function generateUserKey()
 	{
-		return md5($this->getApplication()->getUniqueID() . 'prado:user');
+		return md5($this->getApplication()->getUniqueID().'prado:user');
 	}
 
 	/**
@@ -381,9 +381,9 @@ 
 	 */
 	public function updateSessionUser($user)
 	{
-		if(!$user->getIsGuest())
+		if (!$user->getIsGuest())
 		{
-			if(($session = $this->getSession()) === null)
+			if (($session = $this->getSession()) === null)
 				throw new TConfigurationException('authmanager_session_required');
 			else
 				$session->add($this->getUserKey(), $user->saveToString());
@@ -398,7 +398,7 @@ 
 	 */
 	public function switchUser($username)
 	{
-		if(($user = $this->_userManager->getUser($username)) === null)
+		if (($user = $this->_userManager->getUser($username)) === null)
 			return false;
 		$this->updateSessionUser($user);
 		$this->getApplication()->setUser($user);
@@ -416,14 +416,14 @@ 
 	 */
 	public function login($username, $password, $expire = 0)
 	{
-		if($this->_userManager->validateUser($username, $password))
+		if ($this->_userManager->validateUser($username, $password))
 		{
-			if(($user = $this->_userManager->getUser($username)) === null)
+			if (($user = $this->_userManager->getUser($username)) === null)
 				return false;
 			$this->updateSessionUser($user);
 			$this->getApplication()->setUser($user);
 
-			if($expire > 0)
+			if ($expire > 0)
 			{
 				$cookie = new THttpCookie($this->getUserKey(), '');
 				$cookie->setExpire(time() + $expire);
@@ -443,11 +443,11 @@ 
 	 */
 	public function logout()
 	{
-		if(($session = $this->getSession()) === null)
+		if (($session = $this->getSession()) === null)
 			throw new TConfigurationException('authmanager_session_required');
 		$this->getApplication()->getUser()->setIsGuest(true);
 		$session->destroy();
-		if($this->getAllowAutoLogin())
+		if ($this->getAllowAutoLogin())
 		{
 			$cookie = new THttpCookie($this->getUserKey(), '');
 			$this->getResponse()->getCookies()->add($cookie);

Braces +57 added lines, -40 removed lines

@@ -89,17 +89,21 @@ 
 	 */
 	public function init($config)
 	{
-		if($this->_userManager === null)
-			throw new TConfigurationException('authmanager_usermanager_required');
-		if($this->_returnUrlVarName === null)
-			$this->_returnUrlVarName = $this->getApplication()->getID() . ':' . self::RETURN_URL_VAR;
+		if($this->_userManager === null) {
+					throw new TConfigurationException('authmanager_usermanager_required');
+		}
+		if($this->_returnUrlVarName === null) {
+					$this->_returnUrlVarName = $this->getApplication()->getID() . ':' . self::RETURN_URL_VAR;
+		}
 		$application = $this->getApplication();
 		if(is_string($this->_userManager))
 		{
-			if(($users = $application->getModule($this->_userManager)) === null)
-				throw new TConfigurationException('authmanager_usermanager_inexistent', $this->_userManager);
-			if(!($users instanceof IUserManager))
-				throw new TConfigurationException('authmanager_usermanager_invalid', $this->_userManager);
+			if(($users = $application->getModule($this->_userManager)) === null) {
+							throw new TConfigurationException('authmanager_usermanager_inexistent', $this->_userManager);
+			}
+			if(!($users instanceof IUserManager)) {
+							throw new TConfigurationException('authmanager_usermanager_invalid', $this->_userManager);
+			}
 			$this->_userManager = $users;
 		}
 		$application->attachEventHandler('OnAuthentication', [$this,'doAuthentication']);
@@ -122,10 +126,12 @@ 
 	 */
 	public function setUserManager($provider)
 	{
-		if($this->_initialized)
-			throw new TInvalidOperationException('authmanager_usermanager_unchangeable');
-		if(!is_string($provider) && !($provider instanceof IUserManager))
-			throw new TConfigurationException('authmanager_usermanager_invalid', $this->_userManager);
+		if($this->_initialized) {
+					throw new TInvalidOperationException('authmanager_usermanager_unchangeable');
+		}
+		if(!is_string($provider) && !($provider instanceof IUserManager)) {
+					throw new TConfigurationException('authmanager_usermanager_invalid', $this->_userManager);
+		}
 		$this->_userManager = $provider;
 	}
 
@@ -160,8 +166,9 @@ 
 		$this->onAuthenticate($param);
 
 		$service = $this->getService();
-		if(($service instanceof TPageService) && $service->getRequestedPagePath() === $this->getLoginPage())
-			$this->_skipAuthorization = true;
+		if(($service instanceof TPageService) && $service->getRequestedPagePath() === $this->getLoginPage()) {
+					$this->_skipAuthorization = true;
+		}
 	}
 
 	/**
@@ -284,8 +291,9 @@ 
 		$application = $this->getApplication();
 
 		// restoring user info from session
-		if(($session = $application->getSession()) === null)
-			throw new TConfigurationException('authmanager_session_required');
+		if(($session = $application->getSession()) === null) {
+					throw new TConfigurationException('authmanager_session_required');
+		}
 		$session->open();
 		$sessionInfo = $session->itemAt($this->getUserKey());
 		$user = $this->_userManager->getUser(null)->loadFromString($sessionInfo);
@@ -313,14 +321,16 @@ 
 		$application->setUser($user);
 
 		// handle authentication expiration or update expiration time
-		if($isAuthExpired)
-			$this->onAuthExpire($param);
-		else
-			$session->add('AuthExpireTime', time() + $this->_authExpire);
+		if($isAuthExpired) {
+					$this->onAuthExpire($param);
+		} else {
+					$session->add('AuthExpireTime', time() + $this->_authExpire);
+		}
 
 		// event handler gets a chance to do further auth work
-		if($this->hasEventHandler('OnAuthenticate'))
-			$this->raiseEvent('OnAuthenticate', $this, $application);
+		if($this->hasEventHandler('OnAuthenticate')) {
+					$this->raiseEvent('OnAuthenticate', $this, $application);
+		}
 	}
 
 	/**
@@ -331,8 +341,9 @@ 
 	public function onAuthExpire($param)
 	{
 		$this->logout();
-		if($this->hasEventHandler('OnAuthExpire'))
-			$this->raiseEvent('OnAuthExpire', $this, $param);
+		if($this->hasEventHandler('OnAuthExpire')) {
+					$this->raiseEvent('OnAuthExpire', $this, $param);
+		}
 	}
 
 	/**
@@ -345,8 +356,9 @@ 
 	public function onAuthorize($param)
 	{
 		$application = $this->getApplication();
-		if($this->hasEventHandler('OnAuthorize'))
-			$this->raiseEvent('OnAuthorize', $this, $application);
+		if($this->hasEventHandler('OnAuthorize')) {
+					$this->raiseEvent('OnAuthorize', $this, $application);
+		}
 		if(!$application->getAuthorizationRules()->isUserAllowed($application->getUser(), $application->getRequest()->getRequestType(), $application->getRequest()->getUserHostAddress()))
 		{
 			$application->getResponse()->setStatusCode(401);
@@ -360,8 +372,9 @@ 
 	 */
 	public function getUserKey()
 	{
-		if($this->_userKey === null)
-			$this->_userKey = $this->generateUserKey();
+		if($this->_userKey === null) {
+					$this->_userKey = $this->generateUserKey();
+		}
 		return $this->_userKey;
 	}
 
@@ -383,10 +396,11 @@ 
 	{
 		if(!$user->getIsGuest())
 		{
-			if(($session = $this->getSession()) === null)
-				throw new TConfigurationException('authmanager_session_required');
-			else
-				$session->add($this->getUserKey(), $user->saveToString());
+			if(($session = $this->getSession()) === null) {
+							throw new TConfigurationException('authmanager_session_required');
+			} else {
+							$session->add($this->getUserKey(), $user->saveToString());
+			}
 		}
 	}
 
@@ -398,8 +412,9 @@ 
 	 */
 	public function switchUser($username)
 	{
-		if(($user = $this->_userManager->getUser($username)) === null)
-			return false;
+		if(($user = $this->_userManager->getUser($username)) === null) {
+					return false;
+		}
 		$this->updateSessionUser($user);
 		$this->getApplication()->setUser($user);
 		return true;
@@ -418,8 +433,9 @@ 
 	{
 		if($this->_userManager->validateUser($username, $password))
 		{
-			if(($user = $this->_userManager->getUser($username)) === null)
-				return false;
+			if(($user = $this->_userManager->getUser($username)) === null) {
+							return false;
+			}
 			$this->updateSessionUser($user);
 			$this->getApplication()->setUser($user);
 
@@ -431,9 +447,9 @@ 
 				$this->getResponse()->getCookies()->add($cookie);
 			}
 			return true;
+		} else {
+					return false;
 		}
-		else
-			return false;
 	}
 
 	/**
@@ -443,8 +459,9 @@ 
 	 */
 	public function logout()
 	{
-		if(($session = $this->getSession()) === null)
-			throw new TConfigurationException('authmanager_session_required');
+		if(($session = $this->getSession()) === null) {
+					throw new TConfigurationException('authmanager_session_required');
+		}
 		$this->getApplication()->getUser()->setIsGuest(true);
 		$session->destroy();
 		if($this->getAllowAutoLogin())

framework/Security/TDbUser.php

Spacing +4 added lines, -4 removed lines

@@ -37,19 +37,19 @@
 	 */
 	public function getDbConnection()
 	{
-		if($this->_connection === null)
+		if ($this->_connection === null)
 		{
 			$userManager = $this->getManager();
-			if($userManager instanceof TDbUserManager)
+			if ($userManager instanceof TDbUserManager)
 			{
 				$connection = $userManager->getDbConnection();
-				if($connection instanceof TDbConnection)
+				if ($connection instanceof TDbConnection)
 				{
 					$connection->setActive(true);
 					$this->_connection = $connection;
 				}
 			}
-			if($this->_connection === null)
+			if ($this->_connection === null)
 				throw new TConfigurationException('dbuser_dbconnection_invalid');
 		}
 		return $this->_connection;

Braces +3 added lines, -2 removed lines

@@ -49,8 +49,9 @@
 					$this->_connection = $connection;
 				}
 			}
-			if($this->_connection === null)
-				throw new TConfigurationException('dbuser_dbconnection_invalid');
+			if($this->_connection === null) {
+							throw new TConfigurationException('dbuser_dbconnection_invalid');
+			}
 		}
 		return $this->_connection;
 	}

framework/Security/TAuthorizationRule.php

Spacing +22 added lines, -22 removed lines

@@ -78,7 +78,7 @@ 
 	public function __construct($action, $users, $roles, $verb = '', $ipRules = '')
 	{
 		$action = strtolower(trim($action));
-		if($action === 'allow' || $action === 'deny')
+		if ($action === 'allow' || $action === 'deny')
 			$this->_action = $action;
 		else
 			throw new TInvalidDataValueException('authorizationrule_action_invalid', $action);
@@ -89,46 +89,46 @@ 
 		$this->_guest = false;
 		$this->_authenticated = false;
 
-		if(trim($users) === '')
+		if (trim($users) === '')
 			$users = '*';
-		foreach(explode(',', $users) as $user)
+		foreach (explode(',', $users) as $user)
 		{
-			if(($user = trim(strtolower($user))) !== '')
+			if (($user = trim(strtolower($user))) !== '')
 			{
-				if($user === '*')
+				if ($user === '*')
 				{
 					$this->_everyone = true;
 					break;
 				}
-				elseif($user === '?')
+				elseif ($user === '?')
 					$this->_guest = true;
-				elseif($user === '@')
+				elseif ($user === '@')
 					$this->_authenticated = true;
 				else
 					$this->_users[] = $user;
 			}
 		}
 
-		if(trim($roles) === '')
+		if (trim($roles) === '')
 			$roles = '*';
-		foreach(explode(',', $roles) as $role)
+		foreach (explode(',', $roles) as $role)
 		{
-			if(($role = trim(strtolower($role))) !== '')
+			if (($role = trim(strtolower($role))) !== '')
 				$this->_roles[] = $role;
 		}
 
-		if(($verb = trim(strtolower($verb))) === '')
+		if (($verb = trim(strtolower($verb))) === '')
 			$verb = '*';
-		if($verb === '*' || $verb === 'get' || $verb === 'post')
+		if ($verb === '*' || $verb === 'get' || $verb === 'post')
 			$this->_verb = $verb;
 		else
 			throw new TInvalidDataValueException('authorizationrule_verb_invalid', $verb);
 
-		if(trim($ipRules) === '')
+		if (trim($ipRules) === '')
 			$ipRules = '*';
-		foreach(explode(',', $ipRules) as $ipRule)
+		foreach (explode(',', $ipRules) as $ipRule)
 		{
-			if(($ipRule = trim($ipRule)) !== '')
+			if (($ipRule = trim($ipRule)) !== '')
 				$this->_ipRules[] = $ipRule;
 		}
 	}
@@ -206,19 +206,19 @@ 
 	 */
 	public function isUserAllowed(IUser $user, $verb, $ip)
 	{
-		if($this->isVerbMatched($verb) && $this->isIpMatched($ip) && $this->isUserMatched($user) && $this->isRoleMatched($user))
-			return ($this->_action === 'allow')?1:-1;
+		if ($this->isVerbMatched($verb) && $this->isIpMatched($ip) && $this->isUserMatched($user) && $this->isRoleMatched($user))
+			return ($this->_action === 'allow') ? 1 : -1;
 		else
 			return 0;
 	}
 
 	private function isIpMatched($ip)
 	{
-		if(empty($this->_ipRules))
+		if (empty($this->_ipRules))
 			return 1;
-		foreach($this->_ipRules as $rule)
+		foreach ($this->_ipRules as $rule)
 		{
-			if($rule === '*' || $rule === $ip || (($pos = strpos($rule, '*')) !== false && strncmp($ip, $rule, $pos) === 0))
+			if ($rule === '*' || $rule === $ip || (($pos = strpos($rule, '*')) !== false && strncmp($ip, $rule, $pos) === 0))
 				return 1;
 		}
 		return 0;
@@ -231,9 +231,9 @@ 
 
 	private function isRoleMatched($user)
 	{
-		foreach($this->_roles as $role)
+		foreach ($this->_roles as $role)
 		{
-			if($role === '*' || $user->isInRole($role))
+			if ($role === '*' || $user->isInRole($role))
 				return true;
 		}
 		return false;

Braces +48 added lines, -36 removed lines

@@ -78,10 +78,11 @@ 
 	public function __construct($action, $users, $roles, $verb = '', $ipRules = '')
 	{
 		$action = strtolower(trim($action));
-		if($action === 'allow' || $action === 'deny')
-			$this->_action = $action;
-		else
-			throw new TInvalidDataValueException('authorizationrule_action_invalid', $action);
+		if($action === 'allow' || $action === 'deny') {
+					$this->_action = $action;
+		} else {
+					throw new TInvalidDataValueException('authorizationrule_action_invalid', $action);
+		}
 		$this->_users = [];
 		$this->_roles = [];
 		$this->_ipRules = [];
@@ -89,8 +90,9 @@ 
 		$this->_guest = false;
 		$this->_authenticated = false;
 
-		if(trim($users) === '')
-			$users = '*';
+		if(trim($users) === '') {
+					$users = '*';
+		}
 		foreach(explode(',', $users) as $user)
 		{
 			if(($user = trim(strtolower($user))) !== '')
@@ -99,37 +101,43 @@ 
 				{
 					$this->_everyone = true;
 					break;
+				} elseif($user === '?') {
+									$this->_guest = true;
+				} elseif($user === '@') {
+									$this->_authenticated = true;
+				} else {
+									$this->_users[] = $user;
 				}
-				elseif($user === '?')
-					$this->_guest = true;
-				elseif($user === '@')
-					$this->_authenticated = true;
-				else
-					$this->_users[] = $user;
 			}
 		}
 
-		if(trim($roles) === '')
-			$roles = '*';
+		if(trim($roles) === '') {
+					$roles = '*';
+		}
 		foreach(explode(',', $roles) as $role)
 		{
-			if(($role = trim(strtolower($role))) !== '')
-				$this->_roles[] = $role;
+			if(($role = trim(strtolower($role))) !== '') {
+							$this->_roles[] = $role;
+			}
 		}
 
-		if(($verb = trim(strtolower($verb))) === '')
-			$verb = '*';
-		if($verb === '*' || $verb === 'get' || $verb === 'post')
-			$this->_verb = $verb;
-		else
-			throw new TInvalidDataValueException('authorizationrule_verb_invalid', $verb);
+		if(($verb = trim(strtolower($verb))) === '') {
+					$verb = '*';
+		}
+		if($verb === '*' || $verb === 'get' || $verb === 'post') {
+					$this->_verb = $verb;
+		} else {
+					throw new TInvalidDataValueException('authorizationrule_verb_invalid', $verb);
+		}
 
-		if(trim($ipRules) === '')
-			$ipRules = '*';
+		if(trim($ipRules) === '') {
+					$ipRules = '*';
+		}
 		foreach(explode(',', $ipRules) as $ipRule)
 		{
-			if(($ipRule = trim($ipRule)) !== '')
-				$this->_ipRules[] = $ipRule;
+			if(($ipRule = trim($ipRule)) !== '') {
+							$this->_ipRules[] = $ipRule;
+			}
 		}
 	}
 
@@ -206,20 +214,23 @@ 
 	 */
 	public function isUserAllowed(IUser $user, $verb, $ip)
 	{
-		if($this->isVerbMatched($verb) && $this->isIpMatched($ip) && $this->isUserMatched($user) && $this->isRoleMatched($user))
-			return ($this->_action === 'allow')?1:-1;
-		else
-			return 0;
+		if($this->isVerbMatched($verb) && $this->isIpMatched($ip) && $this->isUserMatched($user) && $this->isRoleMatched($user)) {
+					return ($this->_action === 'allow')?1:-1;
+		} else {
+					return 0;
+		}
 	}
 
 	private function isIpMatched($ip)
 	{
-		if(empty($this->_ipRules))
-			return 1;
+		if(empty($this->_ipRules)) {
+					return 1;
+		}
 		foreach($this->_ipRules as $rule)
 		{
-			if($rule === '*' || $rule === $ip || (($pos = strpos($rule, '*')) !== false && strncmp($ip, $rule, $pos) === 0))
-				return 1;
+			if($rule === '*' || $rule === $ip || (($pos = strpos($rule, '*')) !== false && strncmp($ip, $rule, $pos) === 0)) {
+							return 1;
+			}
 		}
 		return 0;
 	}
@@ -233,8 +244,9 @@ 
 	{
 		foreach($this->_roles as $role)
 		{
-			if($role === '*' || $user->isInRole($role))
-				return true;
+			if($role === '*' || $user->isInRole($role)) {
+							return true;
+			}
 		}
 		return false;
 	}

framework/Security/TAuthorizationRuleCollection.php

Spacing +4 added lines, -4 removed lines

@@ -32,12 +32,12 @@ 
 	 */
 	public function isUserAllowed($user, $verb, $ip)
 	{
-		if($user instanceof IUser)
+		if ($user instanceof IUser)
 		{
 			$verb = strtolower(trim($verb));
-			foreach($this as $rule)
+			foreach ($this as $rule)
 			{
-				if(($decision = $rule->isUserAllowed($user, $verb, $ip)) !== 0)
+				if (($decision = $rule->isUserAllowed($user, $verb, $ip)) !== 0)
 					return ($decision > 0);
 			}
 			return true;
@@ -56,7 +56,7 @@ 
 	 */
 	public function insertAt($index, $item)
 	{
-		if($item instanceof TAuthorizationRule)
+		if ($item instanceof TAuthorizationRule)
 			parent::insertAt($index, $item);
 		else
 			throw new TInvalidDataTypeException('authorizationrulecollection_authorizationrule_required');

Braces +10 added lines, -8 removed lines

@@ -37,13 +37,14 @@ 
 			$verb = strtolower(trim($verb));
 			foreach($this as $rule)
 			{
-				if(($decision = $rule->isUserAllowed($user, $verb, $ip)) !== 0)
-					return ($decision > 0);
+				if(($decision = $rule->isUserAllowed($user, $verb, $ip)) !== 0) {
+									return ($decision > 0);
+				}
 			}
 			return true;
+		} else {
+					return false;
 		}
-		else
-			return false;
 	}
 
 	/**
@@ -56,9 +57,10 @@ 
 	 */
 	public function insertAt($index, $item)
 	{
-		if($item instanceof TAuthorizationRule)
-			parent::insertAt($index, $item);
-		else
-			throw new TInvalidDataTypeException('authorizationrulecollection_authorizationrule_required');
+		if($item instanceof TAuthorizationRule) {
+					parent::insertAt($index, $item);
+		} else {
+					throw new TInvalidDataTypeException('authorizationrulecollection_authorizationrule_required');
+		}
 	}
 }
\ No newline at end of file

framework/Security/TUser.php

Spacing +10 added lines, -10 removed lines

@@ -91,7 +91,7 @@ 
 	 */
 	public function setIsGuest($value)
 	{
-		if($isGuest = TPropertyValue::ensureBoolean($value))
+		if ($isGuest = TPropertyValue::ensureBoolean($value))
 		{
 			$this->setName($this->_manager->getGuestName());
 			$this->setRoles([]);
@@ -112,14 +112,14 @@ 
 	 */
 	public function setRoles($value)
 	{
-		if(is_array($value))
+		if (is_array($value))
 			$this->setState('Roles', $value, []);
 		else
 		{
 			$roles = [];
-			foreach(explode(',', $value) as $role)
+			foreach (explode(',', $value) as $role)
 			{
-				if(($role = trim($role)) !== '')
+				if (($role = trim($role)) !== '')
 					$roles[] = $role;
 			}
 			$this->setState('Roles', $roles, []);
@@ -132,8 +132,8 @@ 
 	 */
 	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;
 	}
@@ -152,9 +152,9 @@ 
 	 */
 	public function loadFromString($data)
 	{
-		if(!empty($data))
+		if (!empty($data))
 			$this->_state = unserialize($data);
-		if(!is_array($this->_state))
+		if (!is_array($this->_state))
 			$this->_state = [];
 		return $this;
 	}
@@ -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;
 	}
 
 	/**
@@ -193,7 +193,7 @@ 
 	 */
 	protected function setState($key, $value, $defaultValue = null)
 	{
-		if($value === $defaultValue)
+		if ($value === $defaultValue)
 			unset($this->_state[$key]);
 		else
 			$this->_state[$key] = $value;

Braces +20 added lines, -15 removed lines

@@ -112,15 +112,16 @@ 
 	 */
 	public function setRoles($value)
 	{
-		if(is_array($value))
-			$this->setState('Roles', $value, []);
-		else
+		if(is_array($value)) {
+					$this->setState('Roles', $value, []);
+		} else
 		{
 			$roles = [];
 			foreach(explode(',', $value) as $role)
 			{
-				if(($role = trim($role)) !== '')
-					$roles[] = $role;
+				if(($role = trim($role)) !== '') {
+									$roles[] = $role;
+				}
 			}
 			$this->setState('Roles', $roles, []);
 		}
@@ -132,9 +133,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;
 	}
 
@@ -152,10 +154,12 @@ 
 	 */
 	public function loadFromString($data)
 	{
-		if(!empty($data))
-			$this->_state = unserialize($data);
-		if(!is_array($this->_state))
-			$this->_state = [];
+		if(!empty($data)) {
+					$this->_state = unserialize($data);
+		}
+		if(!is_array($this->_state)) {
+					$this->_state = [];
+		}
 		return $this;
 	}
 
@@ -193,10 +197,11 @@ 
 	 */
 	protected function setState($key, $value, $defaultValue = null)
 	{
-		if($value === $defaultValue)
-			unset($this->_state[$key]);
-		else
-			$this->_state[$key] = $value;
+		if($value === $defaultValue) {
+					unset($this->_state[$key]);
+		} else {
+					$this->_state[$key] = $value;
+		}
 		$this->_stateChanged = true;
 	}
 

framework/Security/TDbUserManager.php

Spacing +7 added lines, -7 removed lines

@@ -61,10 +61,10 @@ 
 	 */
 	public function init($config)
 	{
-		if($this->_userClass === '')
+		if ($this->_userClass === '')
 			throw new TConfigurationException('dbusermanager_userclass_required');
 		$this->_userFactory = Prado::createComponent($this->_userClass, $this);
-		if(!($this->_userFactory instanceof TDbUser))
+		if (!($this->_userFactory instanceof TDbUser))
 			throw new TInvalidDataTypeException('dbusermanager_userclass_invalid', $this->_userClass);
 	}
 
@@ -118,7 +118,7 @@ 
 	 */
 	public function getUser($username = null)
 	{
-		if($username === null)
+		if ($username === null)
 		{
 			$user = Prado::createComponent($this->_userClass, $this);
 			$user->setIsGuest(true);
@@ -152,7 +152,7 @@ 
 	 */
 	public function getDbConnection()
 	{
-		if($this->_conn === null)
+		if ($this->_conn === null)
 		{
 			$this->_conn = $this->createDbConnection($this->_connID);
 			$this->_conn->setActive(true);
@@ -168,10 +168,10 @@ 
 	 */
 	protected function createDbConnection($connectionID)
 	{
-		if($connectionID !== '')
+		if ($connectionID !== '')
 		{
 			$conn = $this->getApplication()->getModule($connectionID);
-			if($conn instanceof TDataSourceConfig)
+			if ($conn instanceof TDataSourceConfig)
 				return $conn->getDbConnection();
 			else
 				throw new TConfigurationException('dbusermanager_connectionid_invalid', $connectionID);
@@ -199,7 +199,7 @@ 
 	public function saveUserToCookie($cookie)
 	{
 		$user = $this->getApplication()->getUser();
-		if($user instanceof TDbUser)
+		if ($user instanceof TDbUser)
 			$user->saveUserToCookie($cookie);
 	}
 }
\ No newline at end of file

Braces +18 added lines, -14 removed lines

@@ -61,11 +61,13 @@ 
 	 */
 	public function init($config)
 	{
-		if($this->_userClass === '')
-			throw new TConfigurationException('dbusermanager_userclass_required');
+		if($this->_userClass === '') {
+					throw new TConfigurationException('dbusermanager_userclass_required');
+		}
 		$this->_userFactory = Prado::createComponent($this->_userClass, $this);
-		if(!($this->_userFactory instanceof TDbUser))
-			throw new TInvalidDataTypeException('dbusermanager_userclass_invalid', $this->_userClass);
+		if(!($this->_userFactory instanceof TDbUser)) {
+					throw new TInvalidDataTypeException('dbusermanager_userclass_invalid', $this->_userClass);
+		}
 	}
 
 	/**
@@ -123,9 +125,9 @@ 
 			$user = Prado::createComponent($this->_userClass, $this);
 			$user->setIsGuest(true);
 			return $user;
+		} else {
+					return $this->_userFactory->createUser($username);
 		}
-		else
-			return $this->_userFactory->createUser($username);
 	}
 
 	/**
@@ -171,13 +173,14 @@ 
 		if($connectionID !== '')
 		{
 			$conn = $this->getApplication()->getModule($connectionID);
-			if($conn instanceof TDataSourceConfig)
-				return $conn->getDbConnection();
-			else
-				throw new TConfigurationException('dbusermanager_connectionid_invalid', $connectionID);
+			if($conn instanceof TDataSourceConfig) {
+							return $conn->getDbConnection();
+			} else {
+							throw new TConfigurationException('dbusermanager_connectionid_invalid', $connectionID);
+			}
+		} else {
+					throw new TConfigurationException('dbusermanager_connectionid_required');
 		}
-		else
-			throw new TConfigurationException('dbusermanager_connectionid_required');
 	}
 
 	/**
@@ -199,7 +202,8 @@ 
 	public function saveUserToCookie($cookie)
 	{
 		$user = $this->getApplication()->getUser();
-		if($user instanceof TDbUser)
-			$user->saveUserToCookie($cookie);
+		if($user instanceof TDbUser) {
+					$user->saveUserToCookie($cookie);
+		}
 	}
 }
\ No newline at end of file