pradosoft / prado

bin/prado-cli.php

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

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

Spacing +60 added lines, -60 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,7 +78,7 @@ 
 	public static function getInstance()
 	{
 		static $instance;
-		if ($instance === null) {
+		if($instance === null) {
 			$instance = new self;
 		}
 		return $instance;
@@ -95,19 +95,19 @@ 
 	 */
 	public function run($args)
 	{
-		if (count($args) > 1) {
+		if(count($args) > 1) {
 			array_shift($args);
 		}
 		$valid = false;
-		foreach ($this->_actions as $class => $action) {
-			if ($action->isValidAction($args)) {
+		foreach($this->_actions as $class => $action) {
+			if($action->isValidAction($args)) {
 				$valid |= $action->performAction($args);
 				break;
 			} else {
 				$valid = false;
 			}
 		}
-		if (!$valid) {
+		if(!$valid) {
 			$this->printHelp();
 		}
 	}
@@ -122,7 +122,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";
 		}
@@ -171,17 +171,17 @@ 
 	public function renderHelp()
 	{
 		$params = [];
-		foreach ($this->parameters as $v) {
+		foreach($this->parameters as $v) {
 			$params[] = '<' . $v . '>';
 		}
 		$parameters = implode($params, ' ');
 		$options = [];
-		foreach ($this->optional as $v) {
+		foreach($this->optional as $v) {
 			$options[] = '[' . $v . ']';
 		}
 		$optional = (strlen($parameters) ? ' ' : '') . implode($options, ' ');
 		$description = '';
-		foreach (explode("\n", wordwrap($this->description, 65)) as $line) {
+		foreach(explode("\n", wordwrap($this->description, 65)) as $line) {
 			$description .= '    ' . $line . "\n";
 		}
 		return <<<EOD
@@ -195,8 +195,8 @@ 
 	{
 		$_SERVER['SCRIPT_FILENAME'] = $directory . '/index.php';
 		$app_dir = realpath($directory . '/protected/');
-		if ($app_dir !== false && is_dir($app_dir)) {
-			if (Prado::getApplication() === null) {
+		if($app_dir !== false && is_dir($app_dir)) {
+			if(Prado::getApplication() === null) {
 				$app = new PradoShellApplication($app_dir);
 				$app->run();
 				$dir = substr(str_replace(realpath('./'), '', $app_dir), 1);
@@ -240,13 +240,13 @@ 
 	 */
 	protected function createNewPradoProject($dir)
 	{
-		if (strlen(trim($dir)) == 0) {
+		if(strlen(trim($dir)) == 0) {
 			return;
 		}
 
 		$rootPath = realpath(dirname(trim($dir)));
 
-		if (basename($dir) !== '.') {
+		if(basename($dir) !== '.') {
 			$basePath = $rootPath . DIRECTORY_SEPARATOR . basename($dir);
 		} else {
 			$basePath = $rootPath;
@@ -389,7 +389,7 @@ 
 
 	protected function createTestFixtures($dir)
 	{
-		if (strlen(trim($dir)) == 0) {
+		if(strlen(trim($dir)) == 0) {
 			return;
 		}
 
@@ -456,7 +456,7 @@ 
 
 	public function performAction($args)
 	{
-		if (count($args) > 1) {
+		if(count($args) > 1) {
 			$this->initializePradoApplication($args[1]);
 		}
 
@@ -483,12 +483,12 @@ 
 	{
 		$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);
 			}
 		}
@@ -497,10 +497,10 @@ 
 
 	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";
@@ -509,10 +509,10 @@ 
 
 	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";
@@ -521,13 +521,13 @@ 
 
 	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;
 				}
 			}
@@ -538,12 +538,12 @@ 
 
 	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 (strpos($path, $app_dir) === 0) {
+		if($file !== null && false !== ($path = realpath(dirname($file))) && is_dir($path)) {
+			if(strpos($path, $app_dir) === 0) {
 				return $file;
 			}
 		}
@@ -554,15 +554,15 @@ 
 	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";
 				return false;
 			} else {
 				$properties = [];
-				foreach ($tableInfo->getColumns() as $field => $column) {
+				foreach($tableInfo->getColumns() as $field => $column) {
 					$properties[] = $this->generateProperty($field, $column);
 				}
 			}
@@ -581,7 +581,7 @@ 
 		$prop = '';
 		$name = '$' . $field;
 		$type = $column->getPHPType();
-		if ($this->_soap) {
+		if($this->_soap) {
 			$prop .= <<<EOD
 
 	/**
@@ -646,14 +646,14 @@ 
 		$this->_prefix = count($args) > 5 ? $args[5] : '';
 		$this->_postfix = count($args) > 6 ? $args[6] : '';
 
-		if ($app_dir !== false) {
+		if($app_dir !== false) {
 			$config = $this->getActiveRecordConfig($app_dir);
 
 			$manager = TActiveRecordManager::getInstance();
 			$con = $manager->getDbConnection();
 			$con->Active = true;
 
-			switch ($con->getDriverName()) {
+			switch($con->getDriverName()) {
 				case 'mysqli':
 				case 'mysql':
 					$command = $con->createCommand("SHOW TABLES");
@@ -676,13 +676,13 @@ 
 			$dataReader = $command->query();
 			$dataReader->bindColumn(1, $table);
 			$tables = [];
-			while ($dataReader->read() !== false) {
+			while($dataReader->read() !== false) {
 				$tables[] = $table;
 			}
 			$con->Active = false;
-			foreach ($tables as $key => $table) {
+			foreach($tables as $key => $table) {
 				$output = $args[1] . "." . $this->_prefix . ucfirst($table) . $this->_postfix;
-				if ($config !== false && $output !== false) {
+				if($config !== false && $output !== false) {
 					$this->generate("generate " . $table . " " . $output . " " . $this->_soap . " " . $this->_overwrite);
 				}
 			}
@@ -693,14 +693,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);
@@ -711,10 +711,10 @@ 
 
 	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";
@@ -723,10 +723,10 @@ 
 
 	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";
@@ -735,13 +735,13 @@ 
 
 	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;
 				}
 			}
@@ -752,12 +752,12 @@ 
 
 	protected function getOutputFile($app_dir, $namespace)
 	{
-		if (is_file($namespace) && strpos($namespace, $app_dir) === 0) {
+		if(is_file($namespace) && strpos($namespace, $app_dir) === 0) {
 			return $namespace;
 		}
 		$file = Prado::getPathOfNamespace($namespace, "");
-		if ($file !== null && false !== ($path = realpath(dirname($file))) && is_dir($path)) {
-			if (strpos($path, $app_dir) === 0) {
+		if($file !== null && false !== ($path = realpath(dirname($file))) && is_dir($path)) {
+			if(strpos($path, $app_dir) === 0) {
 				return $file;
 			}
 		}

framework/TComponent.php

Spacing +173 added lines, -173 removed lines

@@ -346,13 +346,13 @@ 
 	 */
 	public function __construct()
 	{
-		if ($this->getAutoGlobalListen()) {
+		if($this->getAutoGlobalListen()) {
 			$this->listen();
 		}
 
 		$classes = array_reverse($this->getClassHierarchy(true));
-		foreach ($classes as $class) {
-			if (isset(self::$_um[$class])) {
+		foreach($classes as $class) {
+			if(isset(self::$_um[$class])) {
 				$this->attachBehaviors(self::$_um[$class]);
 			}
 		}
@@ -386,7 +386,7 @@ 
 	 */
 	public function __destruct()
 	{
-		if ($this->_listeningenabled) {
+		if($this->_listeningenabled) {
 			$this->unlisten();
 		}
 	}
@@ -412,10 +412,10 @@ 
 	{
 		$class = get_class($this);
 		$classes = [$class];
-		while ($class = get_parent_class($class)) {
+		while($class = get_parent_class($class)) {
 			array_unshift($classes, $class);
 		}
-		if ($lowercase) {
+		if($lowercase) {
 			return array_map('strtolower', $classes);
 		}
 		return $classes;
@@ -438,18 +438,18 @@ 
 	 */
 	public function listen()
 	{
-		if ($this->_listeningenabled) {
+		if($this->_listeningenabled) {
 			return;
 		}
 
-		$fx = array_filter(get_class_methods($this), [$this,'filter_prado_fx']);
+		$fx = array_filter(get_class_methods($this), [$this, 'filter_prado_fx']);
 
-		foreach ($fx as $func) {
-			$this->attachEventHandler($func, [$this,$func]);
+		foreach($fx as $func) {
+			$this->attachEventHandler($func, [$this, $func]);
 		}
 
-		if (is_a($this, 'Prado\\Util\\IDynamicMethods')) {
-			$this->attachEventHandler(TComponent::GLOBAL_RAISE_EVENT_LISTENER, [$this,'__dycall']);
+		if(is_a($this, 'Prado\\Util\\IDynamicMethods')) {
+			$this->attachEventHandler(TComponent::GLOBAL_RAISE_EVENT_LISTENER, [$this, '__dycall']);
 			array_push($fx, TComponent::GLOBAL_RAISE_EVENT_LISTENER);
 		}
 
@@ -475,18 +475,18 @@ 
 	 */
 	public function unlisten()
 	{
-		if (!$this->_listeningenabled) {
+		if(!$this->_listeningenabled) {
 			return;
 		}
 
-		$fx = array_filter(get_class_methods($this), [$this,'filter_prado_fx']);
+		$fx = array_filter(get_class_methods($this), [$this, 'filter_prado_fx']);
 
-		foreach ($fx as $func) {
-			$this->detachEventHandler($func, [$this,$func]);
+		foreach($fx as $func) {
+			$this->detachEventHandler($func, [$this, $func]);
 		}
 
-		if (is_a($this, 'Prado\\Util\\IDynamicMethods')) {
-			$this->detachEventHandler(TComponent::GLOBAL_RAISE_EVENT_LISTENER, [$this,'__dycall']);
+		if(is_a($this, 'Prado\\Util\\IDynamicMethods')) {
+			$this->detachEventHandler(TComponent::GLOBAL_RAISE_EVENT_LISTENER, [$this, '__dycall']);
 			array_push($fx, TComponent::GLOBAL_RAISE_EVENT_LISTENER);
 		}
 
@@ -533,59 +533,59 @@ 
 	public function __call($method, $args)
 	{
 		$getset = substr($method, 0, 3);
-		if (($getset == 'get') || ($getset == 'set')) {
+		if(($getset == 'get') || ($getset == 'set')) {
 			$propname = substr($method, 3);
 			$jsmethod = $getset . 'js' . $propname;
-			if (method_exists($this, $jsmethod)) {
-				if (count($args) > 0) {
-					if ($args[0] && !($args[0] instanceof TJavaScriptString)) {
+			if(method_exists($this, $jsmethod)) {
+				if(count($args) > 0) {
+					if($args[0] && !($args[0] instanceof TJavaScriptString)) {
 						$args[0] = new TJavaScriptString($args[0]);
 					}
 				}
-				return call_user_func_array([$this,$jsmethod], $args);
+				return call_user_func_array([$this, $jsmethod], $args);
 			}
 
-			if (($getset == 'set') && method_exists($this, 'getjs' . $propname)) {
+			if(($getset == 'set') && method_exists($this, 'getjs' . $propname)) {
 				throw new TInvalidOperationException('component_property_readonly', get_class($this), $method);
 			}
 		}
 
-		if ($this->_m !== null && $this->_behaviorsenabled) {
-			if (strncasecmp($method, 'dy', 2) === 0) {
+		if($this->_m !== null && $this->_behaviorsenabled) {
+			if(strncasecmp($method, 'dy', 2) === 0) {
 				$callchain = new TCallChain($method);
-				foreach ($this->_m->toArray() as $behavior) {
-					if ((!($behavior instanceof IBehavior) || $behavior->getEnabled()) && (method_exists($behavior, $method) || ($behavior instanceof IDynamicMethods))) {
+				foreach($this->_m->toArray() as $behavior) {
+					if((!($behavior instanceof IBehavior) || $behavior->getEnabled()) && (method_exists($behavior, $method) || ($behavior instanceof IDynamicMethods))) {
 						$behavior_args = $args;
-						if ($behavior instanceof IClassBehavior) {
+						if($behavior instanceof IClassBehavior) {
 							array_unshift($behavior_args, $this);
 						}
-						$callchain->addCall([$behavior,$method], $behavior_args);
+						$callchain->addCall([$behavior, $method], $behavior_args);
 					}
 				}
-				if ($callchain->getCount() > 0) {
-					return call_user_func_array([$callchain,'call'], $args);
+				if($callchain->getCount() > 0) {
+					return call_user_func_array([$callchain, 'call'], $args);
 				}
 			} else {
-				foreach ($this->_m->toArray() as $behavior) {
-					if ((!($behavior instanceof IBehavior) || $behavior->getEnabled()) && method_exists($behavior, $method)) {
-						if ($behavior instanceof IClassBehavior) {
+				foreach($this->_m->toArray() as $behavior) {
+					if((!($behavior instanceof IBehavior) || $behavior->getEnabled()) && method_exists($behavior, $method)) {
+						if($behavior instanceof IClassBehavior) {
 							array_unshift($args, $this);
 						}
-						return call_user_func_array([$behavior,$method], $args);
+						return call_user_func_array([$behavior, $method], $args);
 					}
 				}
 			}
 		}
 
-		if (strncasecmp($method, 'dy', 2) === 0 || strncasecmp($method, 'fx', 2) === 0) {
-			if ($this instanceof IDynamicMethods) {
+		if(strncasecmp($method, 'dy', 2) === 0 || strncasecmp($method, 'fx', 2) === 0) {
+			if($this instanceof IDynamicMethods) {
 				return $this->__dycall($method, $args);
 			}
 			return isset($args[0]) ? $args[0] : null;
 		}
 
 		// don't thrown an exception for __magicMethods() or any other weird methods natively implemented by php
-		if (!method_exists($this, $method)) {
+		if(!method_exists($this, $method)) {
 			throw new TApplicationException('component_method_undefined', get_class($this), $method);
 		}
 	}
@@ -616,33 +616,33 @@ 
 	 */
 	public function __get($name)
 	{
-		if (method_exists($this, $getter = 'get' . $name)) {
+		if(method_exists($this, $getter = 'get' . $name)) {
 			// getting a property
 			return $this->$getter();
-		} elseif (method_exists($this, $jsgetter = 'getjs' . $name)) {
+		} elseif(method_exists($this, $jsgetter = 'getjs' . $name)) {
 			// getting a javascript property
-			return (string)$this->$jsgetter();
-		} elseif (strncasecmp($name, 'on', 2) === 0 && method_exists($this, $name)) {
+			return (string) $this->$jsgetter();
+		} elseif(strncasecmp($name, 'on', 2) === 0 && method_exists($this, $name)) {
 			// getting an event (handler list)
 			$name = strtolower($name);
-			if (!isset($this->_e[$name])) {
+			if(!isset($this->_e[$name])) {
 				$this->_e[$name] = new TPriorityList;
 			}
 			return $this->_e[$name];
-		} elseif (strncasecmp($name, 'fx', 2) === 0) {
+		} elseif(strncasecmp($name, 'fx', 2) === 0) {
 			// getting a global event (handler list)
 			$name = strtolower($name);
-			if (!isset(self::$_ue[$name])) {
+			if(!isset(self::$_ue[$name])) {
 				self::$_ue[$name] = new TPriorityList;
 			}
 			return self::$_ue[$name];
-		} elseif ($this->_behaviorsenabled) {
+		} elseif($this->_behaviorsenabled) {
 			// getting a behavior property/event (handler list)
-			if (isset($this->_m[$name])) {
+			if(isset($this->_m[$name])) {
 				return $this->_m[$name];
-			} elseif ($this->_m !== null) {
-				foreach ($this->_m->toArray() as $behavior) {
-					if ((!($behavior instanceof IBehavior) || $behavior->getEnabled()) &&
+			} elseif($this->_m !== null) {
+				foreach($this->_m->toArray() as $behavior) {
+					if((!($behavior instanceof IBehavior) || $behavior->getEnabled()) &&
 						(property_exists($behavior, $name) || $behavior->canGetProperty($name) || $behavior->hasEvent($name))) {
 						return $behavior->$name;
 					}
@@ -669,33 +669,33 @@ 
 	 */
 	public function __set($name, $value)
 	{
-		if (method_exists($this, $setter = 'set' . $name)) {
-			if (strncasecmp($name, 'js', 2) === 0 && $value && !($value instanceof TJavaScriptLiteral)) {
+		if(method_exists($this, $setter = 'set' . $name)) {
+			if(strncasecmp($name, 'js', 2) === 0 && $value && !($value instanceof TJavaScriptLiteral)) {
 				$value = new TJavaScriptLiteral($value);
 			}
 			return $this->$setter($value);
-		} elseif (method_exists($this, $jssetter = 'setjs' . $name)) {
-			if ($value && !($value instanceof TJavaScriptString)) {
+		} elseif(method_exists($this, $jssetter = 'setjs' . $name)) {
+			if($value && !($value instanceof TJavaScriptString)) {
 				$value = new TJavaScriptString($value);
 			}
 			return $this->$jssetter($value);
-		} elseif ((strncasecmp($name, 'on', 2) === 0 && method_exists($this, $name)) || strncasecmp($name, 'fx', 2) === 0) {
+		} elseif((strncasecmp($name, 'on', 2) === 0 && method_exists($this, $name)) || strncasecmp($name, 'fx', 2) === 0) {
 			return $this->attachEventHandler($name, $value);
-		} elseif ($this->_m !== null && $this->_m->getCount() > 0 && $this->_behaviorsenabled) {
+		} elseif($this->_m !== null && $this->_m->getCount() > 0 && $this->_behaviorsenabled) {
 			$sets = 0;
-			foreach ($this->_m->toArray() as $behavior) {
-				if ((!($behavior instanceof IBehavior) || $behavior->getEnabled()) &&
+			foreach($this->_m->toArray() as $behavior) {
+				if((!($behavior instanceof IBehavior) || $behavior->getEnabled()) &&
 					(property_exists($behavior, $name) || $behavior->canSetProperty($name) || $behavior->hasEvent($name))) {
 					$behavior->$name = $value;
 					$sets++;
 				}
 			}
-			if ($sets) {
+			if($sets) {
 				return $value;
 			}
 		}
 
-		if (method_exists($this, 'get' . $name) || method_exists($this, 'getjs' . $name)) {
+		if(method_exists($this, 'get' . $name) || method_exists($this, 'getjs' . $name)) {
 			throw new TInvalidOperationException('component_property_readonly', get_class($this), $name);
 		} else {
 			throw new TInvalidOperationException('component_property_undefined', get_class($this), $name);
@@ -716,22 +716,22 @@ 
 	 */
 	public function __isset($name)
 	{
-		if (method_exists($this, $getter = 'get' . $name)) {
+		if(method_exists($this, $getter = 'get' . $name)) {
 			return $this->$getter() !== null;
-		} elseif (method_exists($this, $jsgetter = 'getjs' . $name)) {
+		} elseif(method_exists($this, $jsgetter = 'getjs' . $name)) {
 			return $this->$jsgetter() !== null;
-		} elseif (strncasecmp($name, 'on', 2) === 0 && method_exists($this, $name)) {
+		} elseif(strncasecmp($name, 'on', 2) === 0 && method_exists($this, $name)) {
 			$name = strtolower($name);
 			return isset($this->_e[$name]) && $this->_e[$name]->getCount();
-		} elseif (strncasecmp($name, 'fx', 2) === 0) {
+		} elseif(strncasecmp($name, 'fx', 2) === 0) {
 			$name = strtolower($name);
 			return isset(self::$_ue[$name]) && self::$_ue[$name]->getCount();
-		} elseif ($this->_m !== null && $this->_m->getCount() > 0 && $this->_behaviorsenabled) {
-			if (isset($this->_m[$name])) {
+		} elseif($this->_m !== null && $this->_m->getCount() > 0 && $this->_behaviorsenabled) {
+			if(isset($this->_m[$name])) {
 				return true;
 			}
-			foreach ($this->_m->toArray() as $behavior) {
-				if ((!($behavior instanceof IBehavior) || $behavior->getEnabled())) {
+			foreach($this->_m->toArray() as $behavior) {
+				if((!($behavior instanceof IBehavior) || $behavior->getEnabled())) {
 					return isset($behavior->$name);
 				}
 			}
@@ -752,30 +752,30 @@ 
 	 */
 	public function __unset($name)
 	{
-		if (method_exists($this, $setter = 'set' . $name)) {
+		if(method_exists($this, $setter = 'set' . $name)) {
 			$this->$setter(null);
-		} elseif (method_exists($this, $jssetter = 'setjs' . $name)) {
+		} elseif(method_exists($this, $jssetter = 'setjs' . $name)) {
 			$this->$jssetter(null);
-		} elseif (strncasecmp($name, 'on', 2) === 0 && method_exists($this, $name)) {
+		} elseif(strncasecmp($name, 'on', 2) === 0 && method_exists($this, $name)) {
 			$this->_e[strtolower($name)]->clear();
-		} elseif (strncasecmp($name, 'fx', 2) === 0) {
+		} elseif(strncasecmp($name, 'fx', 2) === 0) {
 			$this->getEventHandlers($name)->remove([$this, $name]);
-		} elseif ($this->_m !== null && $this->_m->getCount() > 0 && $this->_behaviorsenabled) {
-			if (isset($this->_m[$name])) {
+		} elseif($this->_m !== null && $this->_m->getCount() > 0 && $this->_behaviorsenabled) {
+			if(isset($this->_m[$name])) {
 				$this->detachBehavior($name);
 			} else {
 				$unset = 0;
-				foreach ($this->_m->toArray() as $behavior) {
-					if ((!($behavior instanceof IBehavior) || $behavior->getEnabled())) {
+				foreach($this->_m->toArray() as $behavior) {
+					if((!($behavior instanceof IBehavior) || $behavior->getEnabled())) {
 						unset($behavior->$name);
 						$unset++;
 					}
 				}
-				if (!$unset && method_exists($this, 'get' . $name)) {
+				if(!$unset && method_exists($this, 'get' . $name)) {
 					throw new TInvalidOperationException('component_property_readonly', get_class($this), $name);
 				}
 			}
-		} elseif (method_exists($this, 'get' . $name)) {
+		} elseif(method_exists($this, 'get' . $name)) {
 			throw new TInvalidOperationException('component_property_readonly', get_class($this), $name);
 		}
 	}
@@ -803,11 +803,11 @@ 
 	 */
 	public function canGetProperty($name)
 	{
-		if (method_exists($this, 'get' . $name) || method_exists($this, 'getjs' . $name)) {
+		if(method_exists($this, 'get' . $name) || method_exists($this, 'getjs' . $name)) {
 			return true;
-		} elseif ($this->_m !== null && $this->_behaviorsenabled) {
-			foreach ($this->_m->toArray() as $behavior) {
-				if ((!($behavior instanceof IBehavior) || $behavior->getEnabled()) && $behavior->canGetProperty($name)) {
+		} elseif($this->_m !== null && $this->_behaviorsenabled) {
+			foreach($this->_m->toArray() as $behavior) {
+				if((!($behavior instanceof IBehavior) || $behavior->getEnabled()) && $behavior->canGetProperty($name)) {
 					return true;
 				}
 			}
@@ -826,11 +826,11 @@ 
 	 */
 	public function canSetProperty($name)
 	{
-		if (method_exists($this, 'set' . $name) || method_exists($this, 'setjs' . $name)) {
+		if(method_exists($this, 'set' . $name) || method_exists($this, 'setjs' . $name)) {
 			return true;
-		} elseif ($this->_m !== null && $this->_behaviorsenabled) {
-			foreach ($this->_m->toArray() as $behavior) {
-				if ((!($behavior instanceof IBehavior) || $behavior->getEnabled()) && $behavior->canSetProperty($name)) {
+		} elseif($this->_m !== null && $this->_behaviorsenabled) {
+			foreach($this->_m->toArray() as $behavior) {
+				if((!($behavior instanceof IBehavior) || $behavior->getEnabled()) && $behavior->canSetProperty($name)) {
 					return true;
 				}
 			}
@@ -851,7 +851,7 @@ 
 	public function getSubProperty($path)
 	{
 		$object = $this;
-		foreach (explode('.', $path) as $property) {
+		foreach(explode('.', $path) as $property) {
 			$object = $object->$property;
 		}
 		return $object;
@@ -870,7 +870,7 @@ 
 	public function setSubProperty($path, $value)
 	{
 		$object = $this;
-		if (($pos = strrpos($path, '.')) === false) {
+		if(($pos = strrpos($path, '.')) === false) {
 			$property = $path;
 		} else {
 			$object = $this->getSubProperty(substr($path, 0, $pos));
@@ -893,11 +893,11 @@ 
 	 */
 	public function hasEvent($name)
 	{
-		if ((strncasecmp($name, 'on', 2) === 0 && method_exists($this, $name)) || strncasecmp($name, 'fx', 2) === 0 || strncasecmp($name, 'dy', 2) === 0) {
+		if((strncasecmp($name, 'on', 2) === 0 && method_exists($this, $name)) || strncasecmp($name, 'fx', 2) === 0 || strncasecmp($name, 'dy', 2) === 0) {
 			return true;
-		} elseif ($this->_m !== null && $this->_behaviorsenabled) {
-			foreach ($this->_m->toArray() as $behavior) {
-				if ((!($behavior instanceof IBehavior) || $behavior->getEnabled()) && $behavior->hasEvent($name)) {
+		} elseif($this->_m !== null && $this->_behaviorsenabled) {
+			foreach($this->_m->toArray() as $behavior) {
+				if((!($behavior instanceof IBehavior) || $behavior->getEnabled()) && $behavior->hasEvent($name)) {
 					return true;
 				}
 			}
@@ -915,14 +915,14 @@ 
 	public function hasEventHandler($name)
 	{
 		$name = strtolower($name);
-		if (strncasecmp($name, 'fx', 2) === 0) {
+		if(strncasecmp($name, 'fx', 2) === 0) {
 			return isset(self::$_ue[$name]) && self::$_ue[$name]->getCount() > 0;
 		} else {
-			if (isset($this->_e[$name]) && $this->_e[$name]->getCount() > 0) {
+			if(isset($this->_e[$name]) && $this->_e[$name]->getCount() > 0) {
 				return true;
-			} elseif ($this->_m !== null && $this->_behaviorsenabled) {
-				foreach ($this->_m->toArray() as $behavior) {
-					if ((!($behavior instanceof IBehavior) || $behavior->getEnabled()) && $behavior->hasEventHandler($name)) {
+			} elseif($this->_m !== null && $this->_behaviorsenabled) {
+				foreach($this->_m->toArray() as $behavior) {
+					if((!($behavior instanceof IBehavior) || $behavior->getEnabled()) && $behavior->hasEventHandler($name)) {
 						return true;
 					}
 				}
@@ -939,21 +939,21 @@ 
 	 */
 	public function getEventHandlers($name)
 	{
-		if (strncasecmp($name, 'on', 2) === 0 && method_exists($this, $name)) {
+		if(strncasecmp($name, 'on', 2) === 0 && method_exists($this, $name)) {
 			$name = strtolower($name);
-			if (!isset($this->_e[$name])) {
+			if(!isset($this->_e[$name])) {
 				$this->_e[$name] = new TPriorityList;
 			}
 			return $this->_e[$name];
-		} elseif (strncasecmp($name, 'fx', 2) === 0) {
+		} elseif(strncasecmp($name, 'fx', 2) === 0) {
 			$name = strtolower($name);
-			if (!isset(self::$_ue[$name])) {
+			if(!isset(self::$_ue[$name])) {
 				self::$_ue[$name] = new TPriorityList;
 			}
 			return self::$_ue[$name];
-		} elseif ($this->_m !== null && $this->_behaviorsenabled) {
-			foreach ($this->_m->toArray() as $behavior) {
-				if ((!($behavior instanceof IBehavior) || $behavior->getEnabled()) && $behavior->hasEvent($name)) {
+		} elseif($this->_m !== null && $this->_behaviorsenabled) {
+			foreach($this->_m->toArray() as $behavior) {
+				if((!($behavior instanceof IBehavior) || $behavior->getEnabled()) && $behavior->hasEvent($name)) {
 					return $behavior->getEventHandlers($name);
 				}
 			}
@@ -1023,7 +1023,7 @@ 
 	 */
 	public function detachEventHandler($name, $handler, $priority = false)
 	{
-		if ($this->hasEventHandler($name)) {
+		if($this->hasEventHandler($name)) {
 			try {
 				$this->getEventHandlers($name)->remove($handler, $priority);
 				return true;
@@ -1108,12 +1108,12 @@ 
 	public function raiseEvent($name, $sender, $param, $responsetype = null, $postfunction = null)
 	{
 		$p = $param;
-		if (is_callable($responsetype)) {
+		if(is_callable($responsetype)) {
 			$postfunction = $responsetype;
 			$responsetype = null;
 		}
 
-		if ($responsetype === null) {
+		if($responsetype === null) {
 			$responsetype = TEventResults::EVENT_RESULT_FILTER;
 		}
 
@@ -1122,26 +1122,26 @@ 
 
 		$name = $this->dyPreRaiseEvent($name, $sender, $param, $responsetype, $postfunction);
 
-		if ($this->hasEventHandler($name) || $this->hasEventHandler(TComponent::GLOBAL_RAISE_EVENT_LISTENER)) {
+		if($this->hasEventHandler($name) || $this->hasEventHandler(TComponent::GLOBAL_RAISE_EVENT_LISTENER)) {
 			$handlers = $this->getEventHandlers($name);
 			$handlerArray = $handlers->toArray();
-			if (strncasecmp($name, 'fx', 2) === 0 && $this->hasEventHandler(TComponent::GLOBAL_RAISE_EVENT_LISTENER)) {
+			if(strncasecmp($name, 'fx', 2) === 0 && $this->hasEventHandler(TComponent::GLOBAL_RAISE_EVENT_LISTENER)) {
 				$globalhandlers = $this->getEventHandlers(TComponent::GLOBAL_RAISE_EVENT_LISTENER);
 				$handlerArray = array_merge($globalhandlers->toArrayBelowPriority(0), $handlerArray, $globalhandlers->toArrayAbovePriority(0));
 			}
 			$response = null;
-			foreach ($handlerArray as $handler) {
-				if ($this->dyIntraRaiseEventTestHandler($handler, $sender, $param, $name) === false) {
+			foreach($handlerArray as $handler) {
+				if($this->dyIntraRaiseEventTestHandler($handler, $sender, $param, $name) === false) {
 					continue;
 				}
 
-				if (is_string($handler)) {
-					if (($pos = strrpos($handler, '.')) !== false) {
+				if(is_string($handler)) {
+					if(($pos = strrpos($handler, '.')) !== false) {
 						$object = $this->getSubProperty(substr($handler, 0, $pos));
 						$method = substr($handler, $pos + 1);
-						if (method_exists($object, $method) || strncasecmp($method, 'dy', 2) === 0 || strncasecmp($method, 'fx', 2) === 0) {
-							if ($method == '__dycall') {
-								$response = $object->__dycall($name, [$sender,$param,$name]);
+						if(method_exists($object, $method) || strncasecmp($method, 'dy', 2) === 0 || strncasecmp($method, 'fx', 2) === 0) {
+							if($method == '__dycall') {
+								$response = $object->__dycall($name, [$sender, $param, $name]);
 							} else {
 								$response = $object->$method($sender, $param, $name);
 							}
@@ -1151,18 +1151,18 @@ 
 					} else {
 						$response = call_user_func($handler, $sender, $param, $name);
 					}
-				} elseif (is_callable($handler, true)) {
+				} elseif(is_callable($handler, true)) {
 					list($object, $method) = $handler;
-					if (is_string($object)) {
+					if(is_string($object)) {
 						$response = call_user_func($handler, $sender, $param, $name);
 					} else {
-						if (($pos = strrpos($method, '.')) !== false) {
+						if(($pos = strrpos($method, '.')) !== false) {
 							$object = $this->getSubProperty(substr($method, 0, $pos));
 							$method = substr($method, $pos + 1);
 						}
-						if (method_exists($object, $method) || strncasecmp($method, 'dy', 2) === 0 || strncasecmp($method, 'fx', 2) === 0) {
-							if ($method == '__dycall') {
-								$response = $object->__dycall($name, [$sender,$param,$name]);
+						if(method_exists($object, $method) || strncasecmp($method, 'dy', 2) === 0 || strncasecmp($method, 'fx', 2) === 0) {
+							if($method == '__dycall') {
+								$response = $object->__dycall($name, [$sender, $param, $name]);
 							} else {
 								$response = $object->$method($sender, $param, $name);
 							}
@@ -1176,25 +1176,25 @@ 
 
 				$this->dyIntraRaiseEventPostHandler($name, $sender, $param, $handler, $response);
 
-				if ($postfunction) {
-					$response = call_user_func_array($postfunction, [$sender,$param,$this,$response]);
+				if($postfunction) {
+					$response = call_user_func_array($postfunction, [$sender, $param, $this, $response]);
 				}
 
-				if ($responsetype & TEventResults::EVENT_RESULT_ALL) {
-					$responses[] = ['sender' => $sender,'param' => $param,'response' => $response];
+				if($responsetype & TEventResults::EVENT_RESULT_ALL) {
+					$responses[] = ['sender' => $sender, 'param' => $param, 'response' => $response];
 				} else {
 					$responses[] = $response;
 				}
 
-				if ($response !== null && ($responsetype & TEventResults::EVENT_RESULT_FEED_FORWARD)) {
+				if($response !== null && ($responsetype & TEventResults::EVENT_RESULT_FEED_FORWARD)) {
 					$param = $response;
 				}
 			}
-		} elseif (strncasecmp($name, 'on', 2) === 0 && !$this->hasEvent($name)) {
+		} elseif(strncasecmp($name, 'on', 2) === 0 && !$this->hasEvent($name)) {
 			throw new TInvalidOperationException('component_event_undefined', get_class($this), $name);
 		}
 
-		if ($responsetype & TEventResults::EVENT_RESULT_FILTER) {
+		if($responsetype & TEventResults::EVENT_RESULT_FILTER) {
 			$responses = array_filter($responses);
 		}
 
@@ -1224,7 +1224,7 @@ 
 	{
 		$expression = $this->dyEvaluateExpressionFilter($expression);
 		try {
-			if (eval("\$result=$expression;") === false) {
+			if(eval("\$result=$expression;") === false) {
 				throw new \Exception('');
 			}
 			return $result;
@@ -1255,7 +1255,7 @@ 
 		$statements = $this->dyEvaluateStatementsFilter($statements);
 		try {
 			ob_start();
-			if (eval($statements) === false) {
+			if(eval($statements) === false) {
 				throw new \Exception('');
 			}
 			$content = ob_get_contents();
@@ -1324,7 +1324,7 @@ 
 	 */
 	public function fxAttachClassBehavior($sender, $param)
 	{
-		if (in_array($param->getClass(), $this->getClassHierarchy(true))) {
+		if(in_array($param->getClass(), $this->getClassHierarchy(true))) {
 			return $this->attachBehavior($param->getName(), $param->getBehavior(), $param->getPriority());
 		}
 	}
@@ -1340,7 +1340,7 @@ 
 	 */
 	public function fxDetachClassBehavior($sender, $param)
 	{
-		if (in_array($param->getClass(), $this->getClassHierarchy(true))) {
+		if(in_array($param->getClass(), $this->getClassHierarchy(true))) {
 			return $this->detachBehavior($param->getName(), $param->getPriority());
 		}
 	}
@@ -1366,24 +1366,24 @@ 
 	 */
 	public static function attachClassBehavior($name, $behavior, $class = null, $priority = null)
 	{
-		if (!$class && function_exists('get_called_class')) {
+		if(!$class && function_exists('get_called_class')) {
 			$class = get_called_class();
 		}
-		if (!$class) {
+		if(!$class) {
 			throw new TInvalidOperationException('component_no_class_provided_nor_late_binding');
 		}
 
-		if (!is_string($name)) {
+		if(!is_string($name)) {
 			$name = get_class($name);
 		}
 		$class = strtolower($class);
-		if ($class === 'tcomponent') {
+		if($class === 'tcomponent') {
 			throw new TInvalidOperationException('component_no_tcomponent_class_behaviors');
 		}
-		if (empty(self::$_um[$class])) {
+		if(empty(self::$_um[$class])) {
 			self::$_um[$class] = [];
 		}
-		if (isset(self::$_um[$class][$name])) {
+		if(isset(self::$_um[$class][$name])) {
 			throw new TInvalidOperationException('component_class_behavior_defined', $class, $name);
 		}
 		$param = new TClassBehaviorEventParameter($class, $name, $behavior, $priority);
@@ -1407,18 +1407,18 @@ 
 	 */
 	public static function detachClassBehavior($name, $class = null, $priority = false)
 	{
-		if (!$class && function_exists('get_called_class')) {
+		if(!$class && function_exists('get_called_class')) {
 			$class = get_called_class();
 		}
-		if (!$class) {
+		if(!$class) {
 			throw new TInvalidOperationException('component_no_class_provided_nor_late_binding');
 		}
 
 		$class = strtolower($class);
-		if (!is_string($name)) {
+		if(!is_string($name)) {
 			$name = get_class($name);
 		}
-		if (empty(self::$_um[$class]) || !isset(self::$_um[$class][$name])) {
+		if(empty(self::$_um[$class]) || !isset(self::$_um[$class][$name])) {
 			return false;
 		}
 		$param = self::$_um[$class][$name];
@@ -1461,20 +1461,20 @@ 
 	 */
 	public function isa($class)
 	{
-		if ($this instanceof $class) {
+		if($this instanceof $class) {
 			return true;
 		}
-		if ($this->_m !== null && $this->_behaviorsenabled) {
-			foreach ($this->_m->toArray() as $behavior) {
-				if (($behavior instanceof IBehavior) && !$behavior->getEnabled()) {
+		if($this->_m !== null && $this->_behaviorsenabled) {
+			foreach($this->_m->toArray() as $behavior) {
+				if(($behavior instanceof IBehavior) && !$behavior->getEnabled()) {
 					continue;
 				}
 
 				$check = null;
-				if (($behavior->isa('\Prado\Util\IInstanceCheck')) && $check = $behavior->isinstanceof($class, $this)) {
+				if(($behavior->isa('\Prado\Util\IInstanceCheck')) && $check = $behavior->isinstanceof($class, $this)) {
 					return true;
 				}
-				if ($check === null && ($behavior->isa($class))) {
+				if($check === null && ($behavior->isa($class))) {
 					return true;
 				}
 			}
@@ -1492,8 +1492,8 @@ 
 	 */
 	public function attachBehaviors($behaviors)
 	{
-		foreach ($behaviors as $name => $behavior) {
-			if ($behavior instanceof TClassBehaviorEventParameter) {
+		foreach($behaviors as $name => $behavior) {
+			if($behavior instanceof TClassBehaviorEventParameter) {
 				$this->attachBehavior($behavior->getName(), $behavior->getBehavior(), $behavior->getPriority());
 			} else {
 				$this->attachBehavior($name, $behavior);
@@ -1511,9 +1511,9 @@ 
 	 */
 	public function detachBehaviors($behaviors)
 	{
-		if ($this->_m !== null) {
-			foreach ($behaviors as $name => $behavior) {
-				if ($behavior instanceof TClassBehaviorEventParameter) {
+		if($this->_m !== null) {
+			foreach($behaviors as $name => $behavior) {
+				if($behavior instanceof TClassBehaviorEventParameter) {
 					$this->detachBehavior($behavior->getName(), $behavior->getPriority());
 				} else {
 					$this->detachBehavior(is_string($behavior) ? $behavior : $name);
@@ -1528,8 +1528,8 @@ 
 	 */
 	public function clearBehaviors()
 	{
-		if ($this->_m !== null) {
-			foreach ($this->_m->toArray() as $name => $behavior) {
+		if($this->_m !== null) {
+			foreach($this->_m->toArray() as $name => $behavior) {
 				$this->detachBehavior($name);
 			}
 			$this->_m = null;
@@ -1558,16 +1558,16 @@ 
 	 */
 	public function attachBehavior($name, $behavior, $priority = null)
 	{
-		if (is_string($behavior)) {
+		if(is_string($behavior)) {
 			$behavior = Prado::createComponent($behavior);
 		}
-		if (!($behavior instanceof IBaseBehavior)) {
+		if(!($behavior instanceof IBaseBehavior)) {
 			throw new TInvalidDataTypeException('component_not_a_behavior', get_class($behavior));
 		}
-		if ($behavior instanceof IBehavior) {
+		if($behavior instanceof IBehavior) {
 			$behavior->setEnabled(true);
 		}
-		if ($this->_m === null) {
+		if($this->_m === null) {
 			$this->_m = new TPriorityMap;
 		}
 		$behavior->attach($this);
@@ -1595,7 +1595,7 @@ 
 	 */
 	public function detachBehavior($name, $priority = false)
 	{
-		if ($this->_m != null && isset($this->_m[$name])) {
+		if($this->_m != null && isset($this->_m[$name])) {
 			$this->_m[$name]->detach($this);
 			$behavior = $this->_m->itemAt($name);
 			$this->_m->remove($name, $priority);
@@ -1618,7 +1618,7 @@ 
 	 */
 	public function enableBehaviors()
 	{
-		if (!$this->_behaviorsenabled) {
+		if(!$this->_behaviorsenabled) {
 			$this->_behaviorsenabled = true;
 			$this->dyEnableBehaviors();
 		}
@@ -1638,7 +1638,7 @@ 
 	 */
 	public function disableBehaviors()
 	{
-		if ($this->_behaviorsenabled) {
+		if($this->_behaviorsenabled) {
 			$this->dyDisableBehaviors();
 			$this->_behaviorsenabled = false;
 		}
@@ -1673,8 +1673,8 @@ 
 	 */
 	public function enableBehavior($name)
 	{
-		if ($this->_m != null && isset($this->_m[$name])) {
-			if ($this->_m[$name] instanceof IBehavior) {
+		if($this->_m != null && isset($this->_m[$name])) {
+			if($this->_m[$name] instanceof IBehavior) {
 				$this->_m[$name]->setEnabled(true);
 				$this->dyEnableBehavior($name, $this->_m[$name]);
 				return true;
@@ -1701,8 +1701,8 @@ 
 	 */
 	public function disableBehavior($name)
 	{
-		if ($this->_m != null && isset($this->_m[$name])) {
-			if ($this->_m[$name] instanceof IBehavior) {
+		if($this->_m != null && isset($this->_m[$name])) {
+			if($this->_m[$name] instanceof IBehavior) {
 				$this->_m[$name]->setEnabled(false);
 				$this->dyDisableBehavior($name, $this->_m[$name]);
 				return true;
@@ -1719,7 +1719,7 @@ 
 	 */
 	public function __sleep()
 	{
-		$a = (array)$this;
+		$a = (array) $this;
 		$a = array_keys($a);
 		$exprops = [];
 		$this->_getZappableSleepProps($exprops);
@@ -1734,16 +1734,16 @@ 
 	 */
 	protected function _getZappableSleepProps(&$exprops)
 	{
-		if ($this->_listeningenabled === false) {
+		if($this->_listeningenabled === false) {
 			$exprops[] = "\0Prado\TComponent\0_listeningenabled";
 		}
-		if ($this->_behaviorsenabled === true) {
+		if($this->_behaviorsenabled === true) {
 			$exprops[] = "\0Prado\TComponent\0_behaviorsenabled";
 		}
-		if ($this->_e === []) {
+		if($this->_e === []) {
 			$exprops[] = "\0Prado\TComponent\0_e";
 		}
-		if ($this->_m === null) {
+		if($this->_m === null) {
 			$exprops[] = "\0Prado\TComponent\0_m";
 		}
 	}

framework/PradoBase.php

Spacing +74 added lines, -74 removed lines

@@ -23,17 +23,17 @@ 
 use Prado\I18N\Translation;
 
 // Defines the PRADO framework installation path.
-if (!defined('PRADO_DIR')) {
+if(!defined('PRADO_DIR')) {
 	define('PRADO_DIR', __DIR__);
 }
 
 // Defines the default permission for writable directories and files
-if (!defined('PRADO_CHMOD')) {
+if(!defined('PRADO_CHMOD')) {
 	define('PRADO_CHMOD', 0777);
 }
 
 // Defines the Composer's vendor/ path.
-if (!defined('PRADO_VENDORDIR')) {
+if(!defined('PRADO_VENDORDIR')) {
 	$reflector = new \ReflectionClass('\Composer\Autoload\ClassLoader');
 	define('PRADO_VENDORDIR', dirname(dirname($reflector->getFileName())));
 }
@@ -120,15 +120,15 @@ 
 		/**
 		 * Sets error handler to be Prado::phpErrorHandler
 		 */
-		set_error_handler(['\Prado\PradoBase','phpErrorHandler']);
+		set_error_handler(['\Prado\PradoBase', 'phpErrorHandler']);
 		/**
 		 * Sets shutdown function to be Prado::phpFatalErrorHandler
 		 */
-		register_shutdown_function(['PradoBase','phpFatalErrorHandler']);
+		register_shutdown_function(['PradoBase', 'phpFatalErrorHandler']);
 		/**
 		 * Sets exception handler to be Prado::exceptionHandler
 		 */
-		set_exception_handler(['\Prado\PradoBase','exceptionHandler']);
+		set_exception_handler(['\Prado\PradoBase', 'exceptionHandler']);
 		/**
 		 * Disable php's builtin error reporting to avoid duplicated reports
 		 */
@@ -152,7 +152,7 @@ 
 	public static function poweredByPrado($logoType = 0)
 	{
 		$logoName = $logoType == 1 ? 'powered2' : 'powered';
-		if (self::$_application !== null) {
+		if(self::$_application !== null) {
 			$am = self::$_application->getAssetManager();
 			$url = $am->publishFilePath(self::getPathOfNamespace('Prado\\' . $logoName, '.gif'));
 		} else {
@@ -173,7 +173,7 @@ 
 	 */
 	public static function phpErrorHandler($errno, $errstr, $errfile, $errline)
 	{
-		if (error_reporting() & $errno) {
+		if(error_reporting() & $errno) {
 			throw new TPhpErrorException($errno, $errstr, $errfile, $errline);
 		}
 	}
@@ -187,7 +187,7 @@ 
 	public static function phpFatalErrorHandler()
 	{
 		$error = error_get_last();
-		if ($error &&
+		if($error &&
 			TPhpErrorException::isFatalError($error) &&
 			error_reporting() & $error['type']) {
 			self::exceptionHandler(new TPhpFatalErrorException($error['type'], $error['message'], $error['file'], $error['line']));
@@ -205,7 +205,7 @@ 
 	 */
 	public static function exceptionHandler($exception)
 	{
-		if (self::$_application !== null && ($errorHandler = self::$_application->getErrorHandler()) !== null) {
+		if(self::$_application !== null && ($errorHandler = self::$_application->getErrorHandler()) !== null) {
 			$errorHandler->handleError(null, $exception);
 		} else {
 			echo $exception;
@@ -224,7 +224,7 @@ 
 	 */
 	public static function setApplication($application)
 	{
-		if (self::$_application !== null && !defined('PRADO_TEST_RUN')) {
+		if(self::$_application !== null && !defined('PRADO_TEST_RUN')) {
 			throw new TInvalidOperationException('prado_application_singleton_required');
 		}
 		self::$_application = $application;
@@ -254,11 +254,11 @@ 
 
 	protected static function prado3NamespaceToPhpNamespace($type)
 	{
-		if (substr($type, 0, 6) === 'System') {
+		if(substr($type, 0, 6) === 'System') {
 			$type = 'Prado' . substr($type, 6);
 		}
 
-		if (false === strpos($type, '\\')) {
+		if(false === strpos($type, '\\')) {
 			return str_replace('.', '\\', $type);
 		} else {
 			return $type;
@@ -281,11 +281,11 @@ 
 	public static function createComponent($requestedType)
 	{
 		$type = static::prado3NamespaceToPhpNamespace($requestedType);
-		if (!isset(self::$classExists[$type])) {
+		if(!isset(self::$classExists[$type])) {
 			self::$classExists[$type] = class_exists($type, false);
 		}
 
-		if (!isset(self::$_usings[$type]) && !self::$classExists[$type]) {
+		if(!isset(self::$_usings[$type]) && !self::$classExists[$type]) {
 			static::using($type);
 			self::$classExists[$type] = class_exists($type, false);
 		}
@@ -297,13 +297,13 @@ 
 		 * \Application\Common\MyDataModule)
 		 * Skip this if the class is inside the Prado\* namespace, since all Prado classes are now namespaced
 		 */
-		if (($pos = strrpos($type, '\\')) !== false && ($requestedType != $type) && strpos($type, 'Prado\\') !== 0) {
+		if(($pos = strrpos($type, '\\')) !== false && ($requestedType != $type) && strpos($type, 'Prado\\') !== 0) {
 			$type = substr($type, $pos + 1);
 		}
 
-		if (($n = func_num_args()) > 1) {
+		if(($n = func_num_args()) > 1) {
 			$args = func_get_args();
-			switch ($n) {
+			switch($n) {
 				case 2:
 					return new $type($args[1]);
 				break;
@@ -318,7 +318,7 @@ 
 				break;
 				default:
 					$s = '$args[1]';
-					for ($i = 2;$i < $n;++$i) {
+					for($i = 2; $i < $n; ++$i) {
 						$s .= ",\$args[$i]";
 					}
 					eval("\$component=new $type($s);");
@@ -343,27 +343,27 @@ 
 	{
 		$namespace = static::prado3NamespaceToPhpNamespace($namespace);
 
-		if (isset(self::$_usings[$namespace]) || class_exists($namespace, false)) {
+		if(isset(self::$_usings[$namespace]) || class_exists($namespace, false)) {
 			return;
 		}
 
-		if (array_key_exists($namespace, self::$classMap)) {
+		if(array_key_exists($namespace, self::$classMap)) {
 			// fast autoload a Prado3 class name
 			$phpNamespace = self::$classMap[$namespace];
-			if (class_exists($phpNamespace, true) || interface_exists($phpNamespace, true)) {
-				if (!class_exists($namespace) && !interface_exists($namespace)) {
+			if(class_exists($phpNamespace, true) || interface_exists($phpNamespace, true)) {
+				if(!class_exists($namespace) && !interface_exists($namespace)) {
 					class_alias($phpNamespace, $namespace);
 				}
 				return;
 			}
-		} elseif (($pos = strrpos($namespace, '\\')) === false) {
+		} elseif(($pos = strrpos($namespace, '\\')) === false) {
 			// trying to autoload an old class name
-			foreach (self::$_usings as $k => $v) {
+			foreach(self::$_usings as $k => $v) {
 				$path = $v . DIRECTORY_SEPARATOR . $namespace . self::CLASS_FILE_EXT;
-				if (file_exists($path)) {
+				if(file_exists($path)) {
 					$phpNamespace = '\\' . $k . '\\' . $namespace;
-					if (class_exists($phpNamespace, true) || interface_exists($phpNamespace, true)) {
-						if (!class_exists($namespace) && !interface_exists($namespace)) {
+					if(class_exists($phpNamespace, true) || interface_exists($phpNamespace, true)) {
+						if(!class_exists($namespace) && !interface_exists($namespace)) {
 							class_alias($phpNamespace, $namespace);
 						}
 						return;
@@ -371,23 +371,23 @@ 
 				}
 			}
 
-			if ($checkClassExistence && !class_exists($namespace, false) && !interface_exists($namespace, false)) {
+			if($checkClassExistence && !class_exists($namespace, false) && !interface_exists($namespace, false)) {
 				throw new TInvalidOperationException('prado_component_unknown', $namespace, '');
 			}
-		} elseif (($path = self::getPathOfNamespace($namespace, self::CLASS_FILE_EXT)) !== null) {
+		} elseif(($path = self::getPathOfNamespace($namespace, self::CLASS_FILE_EXT)) !== null) {
 			$className = substr($namespace, $pos + 1);
-			if ($className === '*') {  // a directory
+			if($className === '*') {  // a directory
 				self::$_usings[substr($namespace, 0, $pos)] = $path;
 			} else {  // a file
 				//self::$_usings[$namespace]=$path;
-				if (!$checkClassExistence || (!class_exists($className, false) && !interface_exists($className, false))) {
+				if(!$checkClassExistence || (!class_exists($className, false) && !interface_exists($className, false))) {
 					try {
 						include_once($path);
-						if (class_exists($namespace, false) || interface_exists($namespace, false)) {
+						if(class_exists($namespace, false) || interface_exists($namespace, false)) {
 							class_alias($namespace, $className);
 						}
 					} catch (\Exception $e) {
-						if ($checkClassExistence && !class_exists($className, false)) {
+						if($checkClassExistence && !class_exists($className, false)) {
 							throw new TInvalidOperationException('prado_component_unknown', $className, $e->getMessage());
 						} else {
 							throw $e;
@@ -414,12 +414,12 @@ 
 	{
 		$namespace = static::prado3NamespaceToPhpNamespace($namespace);
 
-		if (self::CLASS_FILE_EXT === $ext || empty($ext)) {
-			if (isset(self::$_usings[$namespace])) {
+		if(self::CLASS_FILE_EXT === $ext || empty($ext)) {
+			if(isset(self::$_usings[$namespace])) {
 				return self::$_usings[$namespace];
 			}
 
-			if (isset(self::$_aliases[$namespace])) {
+			if(isset(self::$_aliases[$namespace])) {
 				return self::$_aliases[$namespace];
 			}
 		}
@@ -427,7 +427,7 @@ 
 		$segs = explode('\\', $namespace);
 		$alias = array_shift($segs);
 
-		if (null !== ($file = array_pop($segs)) && null !== ($root = self::getPathOfAlias($alias))) {
+		if(null !== ($file = array_pop($segs)) && null !== ($root = self::getPathOfAlias($alias))) {
 			return rtrim($root . DIRECTORY_SEPARATOR . implode(DIRECTORY_SEPARATOR, $segs), '/\\') . (($file === '*') ? '' : DIRECTORY_SEPARATOR . $file . $ext);
 		}
 
@@ -456,10 +456,10 @@ 
 	 */
 	public static function setPathOfAlias($alias, $path)
 	{
-		if (isset(self::$_aliases[$alias]) && !defined('PRADO_TEST_RUN')) {
+		if(isset(self::$_aliases[$alias]) && !defined('PRADO_TEST_RUN')) {
 			throw new TInvalidOperationException('prado_alias_redefined', $alias);
-		} elseif (($rp = realpath($path)) !== false && is_dir($rp)) {
-			if (strpos($alias, '.') === false) {
+		} elseif(($rp = realpath($path)) !== false && is_dir($rp)) {
+			if(strpos($alias, '.') === false) {
 				self::$_aliases[$alias] = $rp;
 			} else {
 				throw new TInvalidDataValueException('prado_aliasname_invalid', $alias);
@@ -479,53 +479,53 @@ 
 	{
 		echo '<h1>Fatal Error</h1>';
 		echo '<p>' . $msg . '</p>';
-		if (!function_exists('debug_backtrace')) {
+		if(!function_exists('debug_backtrace')) {
 			return;
 		}
 		echo '<h2>Debug Backtrace</h2>';
 		echo '<pre>';
 		$index = -1;
-		foreach (debug_backtrace() as $t) {
+		foreach(debug_backtrace() as $t) {
 			$index++;
-			if ($index == 0) {  // hide the backtrace of this function
+			if($index == 0) {  // hide the backtrace of this function
 				continue;
 			}
 			echo '#' . $index . ' ';
-			if (isset($t['file'])) {
+			if(isset($t['file'])) {
 				echo basename($t['file']) . ':' . $t['line'];
 			} else {
 				echo '<PHP inner-code>';
 			}
 			echo ' -- ';
-			if (isset($t['class'])) {
+			if(isset($t['class'])) {
 				echo $t['class'] . $t['type'];
 			}
 			echo $t['function'] . '(';
-			if (isset($t['args']) && count($t['args']) > 0) {
+			if(isset($t['args']) && count($t['args']) > 0) {
 				$count = 0;
-				foreach ($t['args'] as $item) {
-					if (is_string($item)) {
+				foreach($t['args'] as $item) {
+					if(is_string($item)) {
 						$str = htmlentities(str_replace("\r\n", "", $item), ENT_QUOTES);
-						if (strlen($item) > 70) {
+						if(strlen($item) > 70) {
 							echo "'" . substr($str, 0, 70) . "...'";
 						} else {
 							echo "'" . $str . "'";
 						}
-					} elseif (is_int($item) || is_float($item)) {
+					} elseif(is_int($item) || is_float($item)) {
 						echo $item;
-					} elseif (is_object($item)) {
+					} elseif(is_object($item)) {
 						echo get_class($item);
-					} elseif (is_array($item)) {
+					} elseif(is_array($item)) {
 						echo 'array(' . count($item) . ')';
-					} elseif (is_bool($item)) {
+					} elseif(is_bool($item)) {
 						echo $item ? 'true' : 'false';
-					} elseif ($item === null) {
+					} elseif($item === null) {
 						echo 'NULL';
-					} elseif (is_resource($item)) {
+					} elseif(is_resource($item)) {
 						echo get_resource_type($item);
 					}
 					$count++;
-					if (count($t['args']) > $count) {
+					if(count($t['args']) > $count) {
 						echo ', ';
 					}
 				}
@@ -546,18 +546,18 @@ 
 	public static function getUserLanguages()
 	{
 		static $languages = null;
-		if ($languages === null) {
-			if (!isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
+		if($languages === null) {
+			if(!isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
 				$languages[0] = 'en';
 			} else {
 				$languages = [];
-				foreach (explode(',', $_SERVER['HTTP_ACCEPT_LANGUAGE']) as $language) {
+				foreach(explode(',', $_SERVER['HTTP_ACCEPT_LANGUAGE']) as $language) {
 					$array = explode(';q=', trim($language));
-					$languages[trim($array[0])] = isset($array[1]) ? (float)$array[1] : 1.0;
+					$languages[trim($array[0])] = isset($array[1]) ? (float) $array[1] : 1.0;
 				}
 				arsort($languages);
 				$languages = array_keys($languages);
-				if (empty($languages)) {
+				if(empty($languages)) {
 					$languages[0] = 'en';
 				}
 			}
@@ -572,10 +572,10 @@ 
 	public static function getPreferredLanguage()
 	{
 		static $language = null;
-		if ($language === null) {
+		if($language === null) {
 			$langs = Prado::getUserLanguages();
 			$lang = explode('-', $langs[0]);
-			if (empty($lang[0]) || !ctype_alpha($lang[0])) {
+			if(empty($lang[0]) || !ctype_alpha($lang[0])) {
 				$language = 'en';
 			} else {
 				$language = $lang[0];
@@ -598,12 +598,12 @@ 
 	 */
 	public static function trace($msg, $category = 'Uncategorized', $ctl = null)
 	{
-		if (self::$_application && self::$_application->getMode() === TApplicationMode::Performance) {
+		if(self::$_application && self::$_application->getMode() === TApplicationMode::Performance) {
 			return;
 		}
-		if (!self::$_application || self::$_application->getMode() === TApplicationMode::Debug) {
+		if(!self::$_application || self::$_application->getMode() === TApplicationMode::Debug) {
 			$trace = debug_backtrace();
-			if (isset($trace[0]['file']) && isset($trace[0]['line'])) {
+			if(isset($trace[0]['file']) && isset($trace[0]['line'])) {
 				$msg .= " (line {$trace[0]['line']}, {$trace[0]['file']})";
 			}
 			$level = TLogger::DEBUG;
@@ -627,7 +627,7 @@ 
 	 */
 	public static function log($msg, $level = TLogger::INFO, $category = 'Uncategorized', $ctl = null)
 	{
-		if (self::$_logger === null) {
+		if(self::$_logger === null) {
 			self::$_logger = new TLogger;
 		}
 		self::$_logger->log($msg, $level, $category, $ctl);
@@ -638,7 +638,7 @@ 
 	 */
 	public static function getLogger()
 	{
-		if (self::$_logger === null) {
+		if(self::$_logger === null) {
 			self::$_logger = new TLogger;
 		}
 		return self::$_logger;
@@ -673,16 +673,16 @@ 
 		$app = Prado::getApplication()->getGlobalization(false);
 
 		$params = [];
-		foreach ($parameters as $key => $value) {
+		foreach($parameters as $key => $value) {
 			$params['{' . $key . '}'] = $value;
 		}
 
 		//no translation handler provided
-		if ($app === null || ($config = $app->getTranslationConfiguration()) === null) {
+		if($app === null || ($config = $app->getTranslationConfiguration()) === null) {
 			return strtr($text, $params);
 		}
 
-		if ($catalogue === null) {
+		if($catalogue === null) {
 			$catalogue = isset($config['catalogue']) ? $config['catalogue'] : 'messages';
 		}
 
@@ -695,10 +695,10 @@ 
 		$defaultCharset = ($app === null) ? 'UTF-8' : $app->getDefaultCharset();
 
 		//fall back
-		if (empty($charset)) {
+		if(empty($charset)) {
 			$charset = $appCharset;
 		}
-		if (empty($charset)) {
+		if(empty($charset)) {
 			$charset = $defaultCharset;
 		}
 

framework/TApplicationConfiguration.php

Spacing +59 added lines, -59 removed lines

@@ -66,7 +66,7 @@ 
 	 */
 	public function loadFromFile($fname)
 	{
-		if (Prado::getApplication()->getConfigurationType() == TApplication::CONFIG_TYPE_PHP) {
+		if(Prado::getApplication()->getConfigurationType() == TApplication::CONFIG_TYPE_PHP) {
 			$fcontent = include $fname;
 			$this->loadFromPhp($fcontent, dirname($fname));
 		} else {
@@ -92,30 +92,30 @@ 
 	public function loadFromPhp($config, $configPath)
 	{
 		// application properties
-		if (isset($config['application'])) {
-			foreach ($config['application'] as $name => $value) {
+		if(isset($config['application'])) {
+			foreach($config['application'] as $name => $value) {
 				$this->_properties[$name] = $value;
 			}
 			$this->_empty = false;
 		}
 
-		if (isset($config['paths']) && is_array($config['paths'])) {
+		if(isset($config['paths']) && is_array($config['paths'])) {
 			$this->loadPathsPhp($config['paths'], $configPath);
 		}
 
-		if (isset($config['modules']) && is_array($config['modules'])) {
+		if(isset($config['modules']) && is_array($config['modules'])) {
 			$this->loadModulesPhp($config['modules'], $configPath);
 		}
 
-		if (isset($config['services']) && is_array($config['services'])) {
+		if(isset($config['services']) && is_array($config['services'])) {
 			$this->loadServicesPhp($config['services'], $configPath);
 		}
 
-		if (isset($config['parameters']) && is_array($config['parameters'])) {
+		if(isset($config['parameters']) && is_array($config['parameters'])) {
 			$this->loadParametersPhp($config['parameters'], $configPath);
 		}
 
-		if (isset($config['includes']) && is_array($config['includes'])) {
+		if(isset($config['includes']) && is_array($config['includes'])) {
 			$this->loadExternalXml($config['includes'], $configPath);
 		}
 	}
@@ -128,13 +128,13 @@ 
 	public function loadFromXml($dom, $configPath)
 	{
 		// application properties
-		foreach ($dom->getAttributes() as $name => $value) {
+		foreach($dom->getAttributes() as $name => $value) {
 			$this->_properties[$name] = $value;
 			$this->_empty = false;
 		}
 
-		foreach ($dom->getElements() as $element) {
-			switch ($element->getTagName()) {
+		foreach($dom->getElements() as $element) {
+			switch($element->getTagName()) {
 				case 'paths':
 					$this->loadPathsXml($element, $configPath);
 					break;
@@ -164,26 +164,26 @@ 
 	 */
 	protected function loadPathsPhp($pathsNode, $configPath)
 	{
-		if (isset($pathsNode['aliases']) && is_array($pathsNode['aliases'])) {
-			foreach ($pathsNode['aliases'] as $id => $path) {
+		if(isset($pathsNode['aliases']) && is_array($pathsNode['aliases'])) {
+			foreach($pathsNode['aliases'] as $id => $path) {
 				$path = str_replace('\\', '/', $path);
-				if (preg_match('/^\\/|.:\\/|.:\\\\/', $path)) {	// if absolute path
+				if(preg_match('/^\\/|.:\\/|.:\\\\/', $path)) {	// if absolute path
 					$p = realpath($path);
 				} else {
 					$p = realpath($configPath . DIRECTORY_SEPARATOR . $path);
 				}
-				if ($p === false || !is_dir($p)) {
+				if($p === false || !is_dir($p)) {
 					throw new TConfigurationException('appconfig_aliaspath_invalid', $id, $path);
 				}
-				if (isset($this->_aliases[$id])) {
+				if(isset($this->_aliases[$id])) {
 					throw new TConfigurationException('appconfig_alias_redefined', $id);
 				}
 				$this->_aliases[$id] = $p;
 			}
 		}
 
-		if (isset($pathsNode['using']) && is_array($pathsNode['using'])) {
-			foreach ($pathsNode['using'] as $namespace) {
+		if(isset($pathsNode['using']) && is_array($pathsNode['using'])) {
+			foreach($pathsNode['using'] as $namespace) {
 				$this->_usings[] = $namespace;
 			}
 		}
@@ -196,21 +196,21 @@ 
 	 */
 	protected function loadPathsXml($pathsNode, $configPath)
 	{
-		foreach ($pathsNode->getElements() as $element) {
-			switch ($element->getTagName()) {
+		foreach($pathsNode->getElements() as $element) {
+			switch($element->getTagName()) {
 				case 'alias':
 				{
-					if (($id = $element->getAttribute('id')) !== null && ($path = $element->getAttribute('path')) !== null) {
+					if(($id = $element->getAttribute('id')) !== null && ($path = $element->getAttribute('path')) !== null) {
 						$path = str_replace('\\', '/', $path);
-						if (preg_match('/^\\/|.:\\/|.:\\\\/', $path)) {	// if absolute path
+						if(preg_match('/^\\/|.:\\/|.:\\\\/', $path)) {	// if absolute path
 							$p = realpath($path);
 						} else {
 							$p = realpath($configPath . DIRECTORY_SEPARATOR . $path);
 						}
-						if ($p === false || !is_dir($p)) {
+						if($p === false || !is_dir($p)) {
 							throw new TConfigurationException('appconfig_aliaspath_invalid', $id, $path);
 						}
-						if (isset($this->_aliases[$id])) {
+						if(isset($this->_aliases[$id])) {
 							throw new TConfigurationException('appconfig_alias_redefined', $id);
 						}
 						$this->_aliases[$id] = $p;
@@ -222,7 +222,7 @@ 
 				}
 				case 'using':
 				{
-					if (($namespace = $element->getAttribute('namespace')) !== null) {
+					if(($namespace = $element->getAttribute('namespace')) !== null) {
 						$this->_usings[] = $namespace;
 					} else {
 						throw new TConfigurationException('appconfig_using_invalid');
@@ -243,19 +243,19 @@ 
 	 */
 	protected function loadModulesPhp($modulesNode, $configPath)
 	{
-		foreach ($modulesNode as $id => $module) {
-			if (!isset($module['class'])) {
+		foreach($modulesNode as $id => $module) {
+			if(!isset($module['class'])) {
 				throw new TConfigurationException('appconfig_moduletype_required', $id);
 			}
 			$type = $module['class'];
 			unset($module['class']);
 			$properties = [];
-			if (isset($module['properties'])) {
+			if(isset($module['properties'])) {
 				$properties = $module['properties'];
 				unset($module['properties']);
 			}
 			$properties['id'] = $id;
-			$this->_modules[$id] = [$type,$properties,$module];
+			$this->_modules[$id] = [$type, $properties, $module];
 			$this->_empty = false;
 		}
 	}
@@ -267,19 +267,19 @@ 
 	 */
 	protected function loadModulesXml($modulesNode, $configPath)
 	{
-		foreach ($modulesNode->getElements() as $element) {
-			if ($element->getTagName() === 'module') {
+		foreach($modulesNode->getElements() as $element) {
+			if($element->getTagName() === 'module') {
 				$properties = $element->getAttributes();
 				$id = $properties->itemAt('id');
 				$type = $properties->remove('class');
-				if ($type === null) {
+				if($type === null) {
 					throw new TConfigurationException('appconfig_moduletype_required', $id);
 				}
 				$element->setParent(null);
-				if ($id === null) {
-					$this->_modules[] = [$type,$properties->toArray(),$element];
+				if($id === null) {
+					$this->_modules[] = [$type, $properties->toArray(), $element];
 				} else {
-					$this->_modules[$id] = [$type,$properties->toArray(),$element];
+					$this->_modules[$id] = [$type, $properties->toArray(), $element];
 				}
 				$this->_empty = false;
 			} else {
@@ -295,15 +295,15 @@ 
 	 */
 	protected function loadServicesPhp($servicesNode, $configPath)
 	{
-		foreach ($servicesNode as $id => $service) {
-			if (!isset($service['class'])) {
+		foreach($servicesNode as $id => $service) {
+			if(!isset($service['class'])) {
 				throw new TConfigurationException('appconfig_servicetype_required');
 			}
 			$type = $service['class'];
 			$properties = isset($service['properties']) ? $service['properties'] : [];
 			unset($service['properties']);
 			$properties['id'] = $id;
-			$this->_services[$id] = [$type,$properties,$service];
+			$this->_services[$id] = [$type, $properties, $service];
 			$this->_empty = false;
 		}
 	}
@@ -315,17 +315,17 @@ 
 	 */
 	protected function loadServicesXml($servicesNode, $configPath)
 	{
-		foreach ($servicesNode->getElements() as $element) {
-			if ($element->getTagName() === 'service') {
+		foreach($servicesNode->getElements() as $element) {
+			if($element->getTagName() === 'service') {
 				$properties = $element->getAttributes();
-				if (($id = $properties->itemAt('id')) === null) {
+				if(($id = $properties->itemAt('id')) === null) {
 					throw new TConfigurationException('appconfig_serviceid_required');
 				}
-				if (($type = $properties->remove('class')) === null) {
+				if(($type = $properties->remove('class')) === null) {
 					throw new TConfigurationException('appconfig_servicetype_required', $id);
 				}
 				$element->setParent(null);
-				$this->_services[$id] = [$type,$properties->toArray(),$element];
+				$this->_services[$id] = [$type, $properties->toArray(), $element];
 				$this->_empty = false;
 			} else {
 				throw new TConfigurationException('appconfig_services_invalid', $element->getTagName());
@@ -340,14 +340,14 @@ 
 	 */
 	protected function loadParametersPhp($parametersNode, $configPath)
 	{
-		foreach ($parametersNode as $id => $parameter) {
-			if (is_array($parameter)) {
-				if (isset($parameter['class'])) {
+		foreach($parametersNode as $id => $parameter) {
+			if(is_array($parameter)) {
+				if(isset($parameter['class'])) {
 					$type = $parameter['class'];
 					unset($parameter['class']);
 					$properties = isset($service['properties']) ? $service['properties'] : [];
 					$properties['id'] = $id;
-					$this->_parameters[$id] = [$type,$properties];
+					$this->_parameters[$id] = [$type, $properties];
 				}
 			} else {
 				$this->_parameters[$id] = $parameter;
@@ -362,20 +362,20 @@ 
 	 */
 	protected function loadParametersXml($parametersNode, $configPath)
 	{
-		foreach ($parametersNode->getElements() as $element) {
-			if ($element->getTagName() === 'parameter') {
+		foreach($parametersNode->getElements() as $element) {
+			if($element->getTagName() === 'parameter') {
 				$properties = $element->getAttributes();
-				if (($id = $properties->remove('id')) === null) {
+				if(($id = $properties->remove('id')) === null) {
 					throw new TConfigurationException('appconfig_parameterid_required');
 				}
-				if (($type = $properties->remove('class')) === null) {
-					if (($value = $properties->remove('value')) === null) {
+				if(($type = $properties->remove('class')) === null) {
+					if(($value = $properties->remove('value')) === null) {
 						$this->_parameters[$id] = $element;
 					} else {
 						$this->_parameters[$id] = $value;
 					}
 				} else {
-					$this->_parameters[$id] = [$type,$properties->toArray()];
+					$this->_parameters[$id] = [$type, $properties->toArray()];
 				}
 				$this->_empty = false;
 			} else {
@@ -391,13 +391,13 @@ 
 	 */
 	protected function loadExternalPhp($includeNode, $configPath)
 	{
-		foreach ($includeNode as $include) {
+		foreach($includeNode as $include) {
 			$when = isset($include['when']) ? true : false;
-			if (!isset($include['file'])) {
+			if(!isset($include['file'])) {
 				throw new TConfigurationException('appconfig_includefile_required');
 			}
 			$filePath = $include['file'];
-			if (isset($this->_includes[$filePath])) {
+			if(isset($this->_includes[$filePath])) {
 				$this->_includes[$filePath] = '(' . $this->_includes[$filePath] . ') || (' . $when . ')';
 			} else {
 				$$this->_includes[$filePath] = $when;
@@ -413,13 +413,13 @@ 
 	 */
 	protected function loadExternalXml($includeNode, $configPath)
 	{
-		if (($when = $includeNode->getAttribute('when')) === null) {
+		if(($when = $includeNode->getAttribute('when')) === null) {
 			$when = true;
 		}
-		if (($filePath = $includeNode->getAttribute('file')) === null) {
+		if(($filePath = $includeNode->getAttribute('file')) === null) {
 			throw new TConfigurationException('appconfig_includefile_required');
 		}
-		if (isset($this->_includes[$filePath])) {
+		if(isset($this->_includes[$filePath])) {
 			$this->_includes[$filePath] = '(' . $this->_includes[$filePath] . ') || (' . $when . ')';
 		} else {
 			$this->_includes[$filePath] = $when;

framework/Data/Common/TDbTableColumn.php

Spacing +2 added lines, -2 removed lines

@@ -68,7 +68,7 @@ 
 	 */
 	public function getPdoType()
 	{
-		switch ($this->getPHPType()) {
+		switch($this->getPHPType()) {
 			case 'boolean': return PDO::PARAM_BOOL;
 			case 'integer': return PDO::PARAM_INT;
 			case 'string': return PDO::PARAM_STR;
@@ -150,7 +150,7 @@ 
 
 	public function getMaxiumNumericConstraint()
 	{
-		if (($precision = $this->getNumericPrecision()) !== null) {
+		if(($precision = $this->getNumericPrecision()) !== null) {
 			$scale = $this->getNumericScale();
 			return $scale === null ? pow(10, $precision) : pow(10, $precision - $scale);
 		}

framework/Data/Common/TDbCommandBuilder.php

Spacing +51 added lines, -51 removed lines

@@ -76,8 +76,8 @@ 
 	 */
 	public function getLastInsertID()
 	{
-		foreach ($this->getTableInfo()->getColumns() as $column) {
-			if ($column->hasSequence()) {
+		foreach($this->getTableInfo()->getColumns() as $column) {
+			if($column->hasSequence()) {
 				return $this->getDbConnection()->getLastInsertID($column->getSequenceName());
 			}
 		}
@@ -93,8 +93,8 @@ 
 	 */
 	public function applyLimitOffset($sql, $limit = -1, $offset = -1)
 	{
-		$limit = $limit !== null ? (int)$limit : -1;
-		$offset = $offset !== null ? (int)$offset : -1;
+		$limit = $limit !== null ? (int) $limit : -1;
+		$offset = $offset !== null ? (int) $offset : -1;
 		$limitStr = $limit >= 0 ? ' LIMIT ' . $limit : '';
 		$offsetStr = $offset >= 0 ? ' OFFSET ' . $offset : '';
 		return $sql . $limitStr . $offsetStr;
@@ -108,9 +108,9 @@ 
 	public function applyOrdering($sql, $ordering)
 	{
 		$orders = [];
-		foreach ($ordering as $name => $direction) {
+		foreach($ordering as $name => $direction) {
 			$direction = strtolower($direction) == 'desc' ? 'DESC' : 'ASC';
-			if (false !== strpos($name, '(') && false !== strpos($name, ')')) {
+			if(false !== strpos($name, '(') && false !== strpos($name, ')')) {
 				// key is a function (bad practice, but we need to handle it)
 				$key = $name;
 			} else {
@@ -119,7 +119,7 @@ 
 			}
 			$orders[] = $key . ' ' . $direction;
 		}
-		if (count($orders) > 0) {
+		if(count($orders) > 0) {
 			$sql .= ' ORDER BY ' . implode(', ', $orders);
 		}
 		return $sql;
@@ -135,12 +135,12 @@ 
 	 */
 	public function getSearchExpression($fields, $keywords)
 	{
-		if (strlen(trim($keywords)) == 0) {
+		if(strlen(trim($keywords)) == 0) {
 			return '';
 		}
 		$words = preg_split('/\s/u', $keywords);
 		$conditions = [];
-		foreach ($fields as $field) {
+		foreach($fields as $field) {
 			$column = $this->getTableInfo()->getColumn($field)->getColumnName();
 			$conditions[] = $this->getSearchCondition($column, $words);
 		}
@@ -155,7 +155,7 @@ 
 	protected function getSearchCondition($column, $words)
 	{
 		$conditions = [];
-		foreach ($words as $word) {
+		foreach($words as $word) {
 			$conditions[] = $column . ' LIKE ' . $this->getDbConnection()->quoteString('%' . $word . '%');
 		}
 		return '(' . implode(' AND ', $conditions) . ')';
@@ -202,10 +202,10 @@ 
 	 */
 	public function getSelectFieldList($data = '*')
 	{
-		if (is_scalar($data)) {
+		if(is_scalar($data)) {
 			$tmp = explode(',', $data);
 			$result = [];
-			foreach ($tmp as $v) {
+			foreach($tmp as $v) {
 				$result[] = trim($v);
 			}
 			return $result;
@@ -213,94 +213,94 @@ 
 
 		$bHasWildcard = false;
 		$result = [];
-		if (is_array($data) || $data instanceof Traversable) {
+		if(is_array($data) || $data instanceof Traversable) {
 			$columns = $this->getTableInfo()->getColumns();
-			foreach ($data as $key => $value) {
-				if ($key === '*' || $value === '*') {
+			foreach($data as $key => $value) {
+				if($key === '*' || $value === '*') {
 					$bHasWildcard = true;
 					continue;
 				}
 
-				if (strToUpper($key) === 'NULL') {
+				if(strToUpper($key) === 'NULL') {
 					$result[] = 'NULL';
 					continue;
 				}
 
-				if (strpos($key, '(') !== false && strpos($key, ')') !== false) {
+				if(strpos($key, '(') !== false && strpos($key, ')') !== false) {
 					$result[] = $key;
 					continue;
 				}
 
-				if (stripos($key, 'AS') !== false) {
+				if(stripos($key, 'AS') !== false) {
 					$result[] = $key;
 					continue;
 				}
 
-				if (stripos($value, 'AS') !== false) {
+				if(stripos($value, 'AS') !== false) {
 					$result[] = $value;
 					continue;
 				}
 
 				$v = isset($columns[$value]);
 				$k = isset($columns[$key]);
-				if (is_int($key) && $v) {
+				if(is_int($key) && $v) {
 					$key = $value;
 					$k = $v;
 				}
 
-				if (strToUpper($value) === 'NULL') {
-					if ($k) {
+				if(strToUpper($value) === 'NULL') {
+					if($k) {
 						$result[] = 'NULL AS ' . $columns[$key]->getColumnName();
 					} else {
-						$result[] = 'NULL' . (is_string($key) ? (' AS ' . (string)$key) : '');
+						$result[] = 'NULL' . (is_string($key) ? (' AS ' . (string) $key) : '');
 					}
 					continue;
 				}
 
-				if (strpos($value, '(') !== false && strpos($value, ')') !== false) {
-					if ($k) {
+				if(strpos($value, '(') !== false && strpos($value, ')') !== false) {
+					if($k) {
 						$result[] = $value . ' AS ' . $columns[$key]->getColumnName();
 					} else {
-						$result[] = $value . (is_string($key) ? (' AS ' . (string)$key) : '');
+						$result[] = $value . (is_string($key) ? (' AS ' . (string) $key) : '');
 					}
 					continue;
 				}
 
-				if ($v && $key == $value) {
+				if($v && $key == $value) {
 					$result[] = $columns[$value]->getColumnName();
 					continue;
 				}
 
-				if ($k && $value == null) {
+				if($k && $value == null) {
 					$result[] = $columns[$key]->getColumnName();
 					continue;
 				}
 
-				if (is_string($key) && $v) {
+				if(is_string($key) && $v) {
 					$result[] = $columns[$value]->getColumnName() . ' AS ' . $key;
 					continue;
 				}
 
-				if (is_numeric($value) && $k) {
+				if(is_numeric($value) && $k) {
 					$result[] = $value . ' AS ' . $columns[$key]->getColumnName();
 					continue;
 				}
 
-				if (is_string($value) && $k) {
+				if(is_string($value) && $k) {
 					$result[] = $this->getDbConnection()->quoteString($value) . ' AS ' . $columns[$key]->getColumnName();
 					continue;
 				}
 
-				if (!$v && !$k && is_int($key)) {
-					$result[] = is_numeric($value) ? $value : $this->getDbConnection()->quoteString((string)$value);
+				if(!$v && !$k && is_int($key)) {
+					$result[] = is_numeric($value) ? $value : $this->getDbConnection()->quoteString((string) $value);
 					continue;
 				}
 
-				$result[] = (is_numeric($value) ? $value : $this->getDbConnection()->quoteString((string)$value)) . ' AS ' . $key;
+				$result[] = (is_numeric($value) ? $value : $this->getDbConnection()->quoteString((string) $value)) . ' AS ' . $key;
 			}
 		}
 
-		if ($data === null || count($result) == 0 || $bHasWildcard) {
+		if($data === null || count($result) == 0 || $bHasWildcard) {
 			$result = $result = array_merge($this->getTableInfo()->getColumnNames(), $result);
 		}
 
@@ -319,7 +319,7 @@ 
 		$table = $this->getTableInfo()->getTableFullName();
 		$fields = implode(', ', $this -> getSelectFieldList($select));
 		$sql = "SELECT {$fields} FROM {$table}";
-		if (!empty($where)) {
+		if(!empty($where)) {
 			$sql .= " WHERE {$where}";
 		}
 		return $this->applyCriterias($sql, $parameters, $ordering, $limit, $offset);
@@ -327,10 +327,10 @@ 
 
 	public function applyCriterias($sql, $parameters = [], $ordering = [], $limit = -1, $offset = -1)
 	{
-		if (count($ordering) > 0) {
+		if(count($ordering) > 0) {
 			$sql = $this->applyOrdering($sql, $ordering);
 		}
-		if ($limit >= 0 || $offset >= 0) {
+		if($limit >= 0 || $offset >= 0) {
 			$sql = $this->applyLimitOffset($sql, $limit, $offset);
 		}
 		$command = $this->createCommand($sql);
@@ -360,7 +360,7 @@ 
 	public function createDeleteCommand($where, $parameters = [])
 	{
 		$table = $this->getTableInfo()->getTableFullName();
-		if (!empty($where)) {
+		if(!empty($where)) {
 			$where = ' WHERE ' . $where;
 		}
 		$command = $this->createCommand("DELETE FROM {$table}" . $where);
@@ -396,13 +396,13 @@ 
 	public function createUpdateCommand($data, $where, $parameters = [])
 	{
 		$table = $this->getTableInfo()->getTableFullName();
-		if ($this->hasIntegerKey($parameters)) {
+		if($this->hasIntegerKey($parameters)) {
 			$fields = implode(', ', $this->getColumnBindings($data, true));
 		} else {
 			$fields = implode(', ', $this->getColumnBindings($data));
 		}
 
-		if (!empty($where)) {
+		if(!empty($where)) {
 			$where = ' WHERE ' . $where;
 		}
 		$command = $this->createCommand("UPDATE {$table} SET {$fields}" . $where);
@@ -419,7 +419,7 @@ 
 	{
 		$fields = [];
 		$bindings = [];
-		foreach (array_keys($values) as $name) {
+		foreach(array_keys($values) as $name) {
 			$fields[] = $this->getTableInfo()->getColumn($name)->getColumnName();
 			$bindings[] = ':' . $name;
 		}
@@ -435,7 +435,7 @@ 
 	protected function getColumnBindings($values, $position = false)
 	{
 		$bindings = [];
-		foreach (array_keys($values) as $name) {
+		foreach(array_keys($values) as $name) {
 			$column = $this->getTableInfo()->getColumn($name)->getColumnName();
 			$bindings[] = $position ? $column . ' = ?' : $column . ' = :' . $name;
 		}
@@ -459,9 +459,9 @@ 
 	 */
 	public function bindColumnValues($command, $values)
 	{
-		foreach ($values as $name => $value) {
+		foreach($values as $name => $value) {
 			$column = $this->getTableInfo()->getColumn($name);
-			if ($value === null && $column->getAllowNull()) {
+			if($value === null && $column->getAllowNull()) {
 				$command->bindValue(':' . $name, null, PDO::PARAM_NULL);
 			} else {
 				$command->bindValue(':' . $name, $value, $column->getPdoType());
@@ -475,13 +475,13 @@ 
 	 */
 	public function bindArrayValues($command, $values)
 	{
-		if ($this->hasIntegerKey($values)) {
+		if($this->hasIntegerKey($values)) {
 			$values = array_values($values);
-			for ($i = 0, $max = count($values); $i < $max; $i++) {
+			for($i = 0, $max = count($values); $i < $max; $i++) {
 				$command->bindValue($i + 1, $values[$i], $this->getPdoType($values[$i]));
 			}
 		} else {
-			foreach ($values as $name => $value) {
+			foreach($values as $name => $value) {
 				$prop = $name[0] === ':' ? $name : ':' . $name;
 				$command->bindValue($prop, $value, $this->getPdoType($value));
 			}
@@ -494,7 +494,7 @@ 
 	 */
 	public static function getPdoType($value)
 	{
-		switch (gettype($value)) {
+		switch(gettype($value)) {
 			case 'boolean': return PDO::PARAM_BOOL;
 			case 'integer': return PDO::PARAM_INT;
 			case 'string': return PDO::PARAM_STR;
@@ -507,8 +507,8 @@ 
 	 */
 	protected function hasIntegerKey($array)
 	{
-		foreach ($array as $k => $v) {
-			if (gettype($k) === 'integer') {
+		foreach($array as $k => $v) {
+			if(gettype($k) === 'integer') {
 				return true;
 			}
 		}

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

@@ -318,7 +318,7 @@ 
 	{
 		$table = $this->getTableInfo()->getTableFullName();
 		$fields = implode(', ', $this -> getSelectFieldList($select));
-		$sql = "SELECT {$fields} FROM {$table}";
+		$sql = "select {$fields} FROM {$table}";
 		if (!empty($where)) {
 			$sql .= " WHERE {$where}";
 		}
@@ -405,7 +405,7 @@ 
 		if (!empty($where)) {
 			$where = ' WHERE ' . $where;
 		}
-		$command = $this->createCommand("UPDATE {$table} SET {$fields}" . $where);
+		$command = $this->createCommand("update {$table} SET {$fields}" . $where);
 		$this->bindArrayValues($command, array_merge($data, $parameters));
 		return $command;
 	}

framework/Data/Common/TDbTableInfo.php

Spacing +5 added lines, -5 removed lines

@@ -117,7 +117,7 @@ 
 	 */
 	public function getColumn($name)
 	{
-		if (($column = $this->_columns->itemAt($name)) !== null) {
+		if(($column = $this->_columns->itemAt($name)) !== null) {
 			return $column;
 		}
 		throw new TDbException('dbtableinfo_invalid_column_name', $name, $this->getTableFullName());
@@ -129,9 +129,9 @@ 
 	 */
 	public function getColumnNames()
 	{
-		if ($this->_names === null) {
+		if($this->_names === null) {
 			$this->_names = [];
-			foreach ($this->getColumns() as $column) {
+			foreach($this->getColumns() as $column) {
 				$this->_names[] = $column->getColumnName();
 			}
 		}
@@ -159,9 +159,9 @@ 
 	 */
 	public function getLowerCaseColumnNames()
 	{
-		if ($this->_lowercase === null) {
+		if($this->_lowercase === null) {
 			$this->_lowercase = [];
-			foreach ($this->getColumns()->getKeys() as $key) {
+			foreach($this->getColumns()->getKeys() as $key) {
 				$this->_lowercase[strtolower($key)] = $key;
 			}
 		}

framework/Data/Common/Sqlite/TSqliteCommandBuilder.php

Spacing +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
 	{
 		$limit = $limit !== null ? intval($limit) : -1;
 		$offset = $offset !== null ? intval($offset) : -1;
-		if ($limit > 0 || $offset > 0) {
+		if($limit > 0 || $offset > 0) {
 			$limitStr = ' LIMIT ' . $limit;
 			$offsetStr = $offset >= 0 ? ' OFFSET ' . $offset : '';
 			return $sql . $limitStr . $offsetStr;

framework/Data/Common/Sqlite/TSqliteMetaData.php

Spacing +13 added lines, -13 removed lines

@@ -81,19 +81,19 @@ 
 		$index = 0;
 		$columns = [];
 		$primary = [];
-		foreach ($command->query() as $col) {
+		foreach($command->query() as $col) {
 			$col['index'] = $index++;
 			$column = $this->processColumn($col, $foreign);
 			$columns[$col['name']] = $column;
-			if ($column->getIsPrimaryKey()) {
+			if($column->getIsPrimaryKey()) {
 				$primary[] = $col['name'];
 			}
 		}
 		$info['TableName'] = $tableName;
-		if ($this->getIsView($tableName)) {
+		if($this->getIsView($tableName)) {
 			$info['IsView'] = true;
 		}
-		if (count($columns) === 0) {
+		if(count($columns) === 0) {
 			throw new TDbException('dbmetadata_invalid_table_view', $tableName);
 		}
 		$class = $this->getTableInfoClass();
@@ -128,18 +128,18 @@ 
 		$info['ColumnId'] = $columnId;
 		$info['ColumnIndex'] = $col['index'];
 
-		if ($col['notnull'] !== '99') {
+		if($col['notnull'] !== '99') {
 			$info['AllowNull'] = true;
 		}
 
-		if ($col['pk'] === '1') {
+		if($col['pk'] === '1') {
 			$info['IsPrimaryKey'] = true;
 		}
-		if ($this->isForeignKeyColumn($columnId, $foreign)) {
+		if($this->isForeignKeyColumn($columnId, $foreign)) {
 			$info['IsForeignKey'] = true;
 		}
 
-		if ($col['dflt_value'] !== null) {
+		if($col['dflt_value'] !== null) {
 			$info['DefaultValue'] = $col['dflt_value'];
 		}
 
@@ -148,9 +148,9 @@ 
 
 		$info['DbType'] = $type;
 		$match = [];
-		if (is_int($pos = strpos($type, '(')) && preg_match('/\((.*)\)/', $type, $match)) {
+		if(is_int($pos = strpos($type, '(')) && preg_match('/\((.*)\)/', $type, $match)) {
 			$ps = explode(',', $match[1]);
-			if (count($ps) === 2) {
+			if(count($ps) === 2) {
 				$info['NumericPrecision'] = intval($ps[0]);
 				$info['NumericScale'] = intval($ps[1]);
 			} else {
@@ -173,7 +173,7 @@ 
 		$sql = "PRAGMA foreign_key_list({$table})";
 		$command = $this->getDbConnection()->createCommand($sql);
 		$fkeys = [];
-		foreach ($command->query() as $col) {
+		foreach($command->query() as $col) {
 			$fkeys[$col['table']]['keys'][$col['from']] = $col['to'];
 			$fkeys[$col['table']]['table'] = $col['table'];
 		}
@@ -187,8 +187,8 @@ 
 	 */
 	protected function isForeignKeyColumn($columnId, $foreign)
 	{
-		foreach ($foreign as $fk) {
-			if (in_array($columnId, array_keys($fk['keys']))) {
+		foreach($foreign as $fk) {
+			if(in_array($columnId, array_keys($fk['keys']))) {
 				return true;
 			}
 		}