pradosoft / prado

framework/Util/TDbLogRoute.php

Spacing +14 added lines, -14 removed lines

@@ -67,7 +67,7 @@ 
 	 */
 	public function __destruct()
 	{
-		if($this->_db !== null)
+		if ($this->_db !== null)
 			$this->_db->setActive(false);
 	}
 
@@ -83,15 +83,15 @@ 
 		$db = $this->getDbConnection();
 		$db->setActive(true);
 
-		$sql = 'SELECT * FROM ' . $this->_logTable . ' WHERE 0=1';
+		$sql = 'SELECT * FROM '.$this->_logTable.' WHERE 0=1';
 		try
 		{
 			$db->createCommand($sql)->query()->close();
 		}
-		catch(Exception $e)
+		catch (Exception $e)
 		{
 			// DB table not exists
-			if($this->_autoCreate)
+			if ($this->_autoCreate)
 				$this->createDbTable();
 			else
 				throw new TConfigurationException('db_logtable_inexistent', $this->_logTable);
@@ -106,9 +106,9 @@ 
 	 */
 	protected function processLogs($logs)
 	{
-		$sql = 'INSERT INTO ' . $this->_logTable . '(level, category, logtime, message) VALUES (:level, :category, :logtime, :message)';
+		$sql = 'INSERT INTO '.$this->_logTable.'(level, category, logtime, message) VALUES (:level, :category, :logtime, :message)';
 		$command = $this->getDbConnection()->createCommand($sql);
-		foreach($logs as $log)
+		foreach ($logs as $log)
 		{
 			$command->bindValue(':message', $log[0]);
 			$command->bindValue(':level', $log[1]);
@@ -127,11 +127,11 @@ 
 		$db = $this->getDbConnection();
 		$driver = $db->getDriverName();
 		$autoidAttributes = '';
-		if($driver === 'mysql')
+		if ($driver === 'mysql')
 			$autoidAttributes = 'AUTO_INCREMENT';
 
-		$sql = 'CREATE TABLE ' . $this->_logTable . ' (
-			log_id INTEGER NOT NULL PRIMARY KEY ' . $autoidAttributes . ',
+		$sql = 'CREATE TABLE '.$this->_logTable.' (
+			log_id INTEGER NOT NULL PRIMARY KEY ' . $autoidAttributes.',
 			level INTEGER,
 			category VARCHAR(128),
 			logtime VARCHAR(20),
@@ -147,10 +147,10 @@ 
 	 */
 	protected function createDbConnection()
 	{
-		if($this->_connID !== '')
+		if ($this->_connID !== '')
 		{
 			$config = $this->getApplication()->getModule($this->_connID);
-			if($config instanceof TDataSourceConfig)
+			if ($config instanceof TDataSourceConfig)
 				return $config->getDbConnection();
 			else
 				throw new TConfigurationException('dblogroute_connectionid_invalid', $this->_connID);
@@ -159,8 +159,8 @@ 
 		{
 			$db = new TDbConnection;
 			// default to SQLite3 database
-			$dbFile = $this->getApplication()->getRuntimePath() . '/sqlite3.log';
-			$db->setConnectionString('sqlite:' . $dbFile);
+			$dbFile = $this->getApplication()->getRuntimePath().'/sqlite3.log';
+			$db->setConnectionString('sqlite:'.$dbFile);
 			return $db;
 		}
 	}
@@ -170,7 +170,7 @@ 
 	 */
 	public function getDbConnection()
 	{
-		if($this->_db === null)
+		if ($this->_db === null)
 			$this->_db = $this->createDbConnection();
 		return $this->_db;
 	}

Braces +21 added lines, -18 removed lines

@@ -67,8 +67,9 @@ 
 	 */
 	public function __destruct()
 	{
-		if($this->_db !== null)
-			$this->_db->setActive(false);
+		if($this->_db !== null) {
+					$this->_db->setActive(false);
+		}
 	}
 
 	/**
@@ -87,14 +88,14 @@ 
 		try
 		{
 			$db->createCommand($sql)->query()->close();
-		}
-		catch(Exception $e)
+		} catch(Exception $e)
 		{
 			// DB table not exists
-			if($this->_autoCreate)
-				$this->createDbTable();
-			else
-				throw new TConfigurationException('db_logtable_inexistent', $this->_logTable);
+			if($this->_autoCreate) {
+							$this->createDbTable();
+			} else {
+							throw new TConfigurationException('db_logtable_inexistent', $this->_logTable);
+			}
 		}
 
 		parent::init($config);
@@ -127,8 +128,9 @@ 
 		$db = $this->getDbConnection();
 		$driver = $db->getDriverName();
 		$autoidAttributes = '';
-		if($driver === 'mysql')
-			$autoidAttributes = 'AUTO_INCREMENT';
+		if($driver === 'mysql') {
+					$autoidAttributes = 'AUTO_INCREMENT';
+		}
 
 		$sql = 'CREATE TABLE ' . $this->_logTable . ' (
 			log_id INTEGER NOT NULL PRIMARY KEY ' . $autoidAttributes . ',
@@ -150,12 +152,12 @@ 
 		if($this->_connID !== '')
 		{
 			$config = $this->getApplication()->getModule($this->_connID);
-			if($config instanceof TDataSourceConfig)
-				return $config->getDbConnection();
-			else
-				throw new TConfigurationException('dblogroute_connectionid_invalid', $this->_connID);
-		}
-		else
+			if($config instanceof TDataSourceConfig) {
+							return $config->getDbConnection();
+			} else {
+							throw new TConfigurationException('dblogroute_connectionid_invalid', $this->_connID);
+			}
+		} else
 		{
 			$db = new TDbConnection;
 			// default to SQLite3 database
@@ -170,8 +172,9 @@ 
 	 */
 	public function getDbConnection()
 	{
-		if($this->_db === null)
-			$this->_db = $this->createDbConnection();
+		if($this->_db === null) {
+					$this->_db = $this->createDbConnection();
+		}
 		return $this->_db;
 	}
 

framework/IO/TTarFileExtractor.php

Spacing +21 added lines, -21 removed lines

@@ -144,16 +144,16 @@ 
 
 		  // ----- Look if a local copy need to be done
 		  if ($this->_temp_tarname == '') {
-			  $this->_temp_tarname = uniqid('tar') . '.tmp';
+			  $this->_temp_tarname = uniqid('tar').'.tmp';
 			  if (!$v_file_from = @fopen($this->_tarname, 'rb')) {
 				$this->_error('Unable to open in read mode \''
-							  . $this->_tarname . '\'');
+							  . $this->_tarname.'\'');
 				$this->_temp_tarname = '';
 				return false;
 			  }
 			  if (!$v_file_to = @fopen($this->_temp_tarname, 'wb')) {
 				$this->_error('Unable to open in write mode \''
-							  . $this->_temp_tarname . '\'');
+							  . $this->_temp_tarname.'\'');
 				$this->_temp_tarname = '';
 				return false;
 			  }
@@ -173,7 +173,7 @@ 
 		$this->_file = @fopen($v_filename, "rb");
 
 		if ($this->_file == 0) {
-			$this->_error('Unable to open in read mode \'' . $v_filename . '\'');
+			$this->_error('Unable to open in read mode \''.$v_filename.'\'');
 			return false;
 		}
 
@@ -246,7 +246,7 @@ 
 
 		if (strlen($v_binary_data) != 512) {
 			$v_header['filename'] = '';
-			$this->_error('Invalid block size : ' . strlen($v_binary_data));
+			$this->_error('Invalid block size : '.strlen($v_binary_data));
 			return false;
 		}
 
@@ -276,9 +276,9 @@ 
 			if (($v_checksum == 256) && ($v_header['checksum'] == 0))
 				return true;
 
-			$this->_error('Invalid checksum for file "' . $v_data['filename']
-						  . '" : ' . $v_checksum . ' calculated, '
-						  . $v_header['checksum'] . ' expected');
+			$this->_error('Invalid checksum for file "'.$v_data['filename']
+						  . '" : '.$v_checksum.' calculated, '
+						  . $v_header['checksum'].' expected');
 			return false;
 		}
 
@@ -330,7 +330,7 @@ 
 	$p_path = $this->_translateWinPath($p_path, false);
 	if ($p_path == '' || (substr($p_path, 0, 1) != '/'
 		&& substr($p_path, 0, 3) != "../" && !strpos($p_path, ':'))) {
-	  $p_path = "./" . $p_path;
+	  $p_path = "./".$p_path;
 	}
 	$p_remove_path = $this->_translateWinPath($p_remove_path);
 
@@ -353,7 +353,7 @@ 
 		  $v_listing = true;
 	  break;
 	  default :
-		$this->_error('Invalid extract mode (' . $p_mode . ')');
+		$this->_error('Invalid extract mode ('.$p_mode.')');
 		return false;
 	}
 
@@ -416,25 +416,25 @@ 
 			$p_path = substr($p_path, 0, strlen($p_path) - 1);
 
 		  if (substr($v_header['filename'], 0, 1) == '/')
-			  $v_header['filename'] = $p_path . $v_header['filename'];
+			  $v_header['filename'] = $p_path.$v_header['filename'];
 		  else
-			$v_header['filename'] = $p_path . '/' . $v_header['filename'];
+			$v_header['filename'] = $p_path.'/'.$v_header['filename'];
 		}
 		if (file_exists($v_header['filename'])) {
 		  if ((@is_dir($v_header['filename']))
 			  && ($v_header['typeflag'] == '')) {
-			$this->_error('File ' . $v_header['filename']
+			$this->_error('File '.$v_header['filename']
 						  . ' already exists as a directory');
 			return false;
 		  }
 		  if (($this->_isArchive($v_header['filename']))
 			  && ($v_header['typeflag'] == "5")) {
-			$this->_error('Directory ' . $v_header['filename']
+			$this->_error('Directory '.$v_header['filename']
 						  . ' already exists as a file');
 			return false;
 		  }
 		  if (!is_writable($v_header['filename'])) {
-			$this->_error('File ' . $v_header['filename']
+			$this->_error('File '.$v_header['filename']
 						  . ' already exists and is write protected');
 			return false;
 		  }
@@ -446,9 +446,9 @@ 
 		// ----- Check the directory availability and create it if necessary
 		elseif (($v_result
 				 = $this->_dirCheck(($v_header['typeflag'] == "5"
-									?$v_header['filename']
+									? $v_header['filename']
 									:dirname($v_header['filename'])))) != 1) {
-			$this->_error('Unable to create path for ' . $v_header['filename']);
+			$this->_error('Unable to create path for '.$v_header['filename']);
 			return false;
 		}
 
@@ -457,14 +457,14 @@ 
 			if (!@file_exists($v_header['filename'])) {
 				if (!@mkdir($v_header['filename'], PRADO_CHMOD)) {
 					$this->_error('Unable to create directory {'
-								  . $v_header['filename'] . '}');
+								  . $v_header['filename'].'}');
 					return false;
 				}
 				chmod($v_header['filename'], PRADO_CHMOD);
 			}
 		  } else {
 			  if (($v_dest_file = @fopen($v_header['filename'], "wb")) == 0) {
-				  $this->_error('Error while opening {' . $v_header['filename']
+				  $this->_error('Error while opening {'.$v_header['filename']
 								. '} in write binary mode');
 				  return false;
 			  } else {
@@ -489,10 +489,10 @@ 
 		  // ----- Check the file size
 		  clearstatcache();
 		  if (filesize($v_header['filename']) != $v_header['size']) {
-			  $this->_error('Extracted file ' . $v_header['filename']
+			  $this->_error('Extracted file '.$v_header['filename']
 							. ' does not have the correct file size \''
 							. filesize($v_header['filename'])
-							. '\' (' . $v_header['size']
+							. '\' ('.$v_header['size']
 							. ' expected). Archive may be corrupted.');
 			  return false;
 		  }

Braces +59 added lines, -40 removed lines

@@ -69,8 +69,9 @@ 
 	{
 		$this->_close();
 		// ----- Look for a local copy to delete
-		if ($this->_temp_tarname != '')
-			@unlink($this->_temp_tarname);
+		if ($this->_temp_tarname != '') {
+					@unlink($this->_temp_tarname);
+		}
 	}
 
 	public function extract($p_path = '')
@@ -157,8 +158,9 @@ 
 				$this->_temp_tarname = '';
 				return false;
 			  }
-			  while ($v_data = @fread($v_file_from, 1024))
-				  @fwrite($v_file_to, $v_data);
+			  while ($v_data = @fread($v_file_from, 1024)) {
+			  				  @fwrite($v_file_to, $v_data);
+			  }
 			  @fclose($v_file_from);
 			  @fclose($v_file_to);
 		  }
@@ -166,9 +168,10 @@ 
 		  // ----- File to open if the local copy
 		  $v_filename = $this->_temp_tarname;
 
-		} else
-		  // ----- File to open if the normal Tar file
+		} else {
+				  // ----- File to open if the normal Tar file
 		  $v_filename = $this->_tarname;
+		}
 
 		$this->_file = @fopen($v_filename, "rb");
 
@@ -229,8 +232,9 @@ 
 	private function _jumpBlock($p_len = null)
 	{
 	  if (is_resource($this->_file)) {
-		  if ($p_len === null)
-			  $p_len = 1;
+		  if ($p_len === null) {
+		  			  $p_len = 1;
+		  }
 
 			  @fseek($this->_file, @ftell($this->_file) + ($p_len * 512));
 	  }
@@ -253,14 +257,17 @@ 
 		// ----- Calculate the checksum
 		$v_checksum = 0;
 		// ..... First part of the header
-		for ($i = 0; $i < 148; $i++)
-			$v_checksum += ord(substr($v_binary_data, $i, 1));
+		for ($i = 0; $i < 148; $i++) {
+					$v_checksum += ord(substr($v_binary_data, $i, 1));
+		}
 		// ..... Ignore the checksum value and replace it by ' ' (space)
-		for ($i = 148; $i < 156; $i++)
-			$v_checksum += ord(' ');
+		for ($i = 148; $i < 156; $i++) {
+					$v_checksum += ord(' ');
+		}
 		// ..... Last part of the header
-		for ($i = 156; $i < 512; $i++)
-		   $v_checksum += ord(substr($v_binary_data, $i, 1));
+		for ($i = 156; $i < 512; $i++) {
+				   $v_checksum += ord(substr($v_binary_data, $i, 1));
+		}
 
 		$v_data = unpack("a100filename/a8mode/a8uid/a8gid/a12size/a12mtime/"
 						 . "a8checksum/a1typeflag/a100link/a6magic/a2version/"
@@ -273,8 +280,9 @@ 
 			$v_header['filename'] = '';
 
 			// ----- Look for last block (empty block)
-			if (($v_checksum == 256) && ($v_header['checksum'] == 0))
-				return true;
+			if (($v_checksum == 256) && ($v_header['checksum'] == 0)) {
+							return true;
+			}
 
 			$this->_error('Invalid checksum for file "' . $v_data['filename']
 						  . '" : ' . $v_checksum . ' calculated, '
@@ -311,8 +319,9 @@ 
 	  // ----- Read the next header
 	  $v_binary_data = $this->_readBlock();
 
-	  if (!$this->_readHeader($v_binary_data, $v_header))
-		return false;
+	  if (!$this->_readHeader($v_binary_data, $v_header)) {
+	  		return false;
+	  }
 
 	  $v_header['filename'] = $v_filename;
 
@@ -335,8 +344,9 @@ 
 	$p_remove_path = $this->_translateWinPath($p_remove_path);
 
 	// ----- Look for path to remove format (should end by /)
-	if (($p_remove_path != '') && (substr($p_remove_path, -1) != '/'))
-	  $p_remove_path .= '/';
+	if (($p_remove_path != '') && (substr($p_remove_path, -1) != '/')) {
+		  $p_remove_path .= '/';
+	}
 	$p_remove_path_size = strlen($p_remove_path);
 
 	switch ($p_mode) {
@@ -364,8 +374,9 @@ 
 	  $v_extract_file = false;
 	  $v_extraction_stopped = 0;
 
-	  if (!$this->_readHeader($v_binary_data, $v_header))
-		return false;
+	  if (!$this->_readHeader($v_binary_data, $v_header)) {
+	  		return false;
+	  }
 
 	  if ($v_header['filename'] == '') {
 		continue;
@@ -373,8 +384,9 @@ 
 
 	  // ----- Look for long filename
 	  if ($v_header['typeflag'] == 'L') {
-		if (!$this->_readLongHeader($v_header))
-		  return false;
+		if (!$this->_readLongHeader($v_header)) {
+				  return false;
+		}
 	  }
 
 	  if ((!$v_extract_all) && (is_array($p_file_list))) {
@@ -408,17 +420,20 @@ 
 	  {
 		if (($p_remove_path != '')
 			&& (substr($v_header['filename'], 0, $p_remove_path_size)
-				== $p_remove_path))
-		  $v_header['filename'] = substr($v_header['filename'],
+				== $p_remove_path)) {
+				  $v_header['filename'] = substr($v_header['filename'],
 										 $p_remove_path_size);
+		}
 		if (($p_path != './') && ($p_path != '/')) {
-		  while (substr($p_path, -1) == '/')
-			$p_path = substr($p_path, 0, strlen($p_path) - 1);
+		  while (substr($p_path, -1) == '/') {
+		  			$p_path = substr($p_path, 0, strlen($p_path) - 1);
+		  }
 
-		  if (substr($v_header['filename'], 0, 1) == '/')
-			  $v_header['filename'] = $p_path . $v_header['filename'];
-		  else
-			$v_header['filename'] = $p_path . '/' . $v_header['filename'];
+		  if (substr($v_header['filename'], 0, 1) == '/') {
+		  			  $v_header['filename'] = $p_path . $v_header['filename'];
+		  } else {
+		  			$v_header['filename'] = $p_path . '/' . $v_header['filename'];
+		  }
 		}
 		if (file_exists($v_header['filename'])) {
 		  if ((@is_dir($v_header['filename']))
@@ -514,10 +529,12 @@ 
 	  if ($v_listing || $v_extract_file || $v_extraction_stopped) {
 		// ----- Log extracted files
 		if (($v_file_dir = dirname($v_header['filename']))
-			== $v_header['filename'])
-		  $v_file_dir = '';
-		if ((substr($v_header['filename'], 0, 1) == '/') && ($v_file_dir == ''))
-		  $v_file_dir = '/';
+			== $v_header['filename']) {
+				  $v_file_dir = '';
+		}
+		if ((substr($v_header['filename'], 0, 1) == '/') && ($v_file_dir == '')) {
+				  $v_file_dir = '/';
+		}
 
 		$p_list_detail[$v_nb++] = $v_header;
 	  }
@@ -536,15 +553,17 @@ 
 	 */
 	protected function _dirCheck($p_dir)
 	{
-		if ((@is_dir($p_dir)) || ($p_dir == ''))
-			return true;
+		if ((@is_dir($p_dir)) || ($p_dir == '')) {
+					return true;
+		}
 
 		$p_parent_dir = dirname($p_dir);
 
 		if (($p_parent_dir != $p_dir) &&
 			($p_parent_dir != '') &&
-			(!$this->_dirCheck($p_parent_dir)))
-			 return false;
+			(!$this->_dirCheck($p_parent_dir))) {
+					 return false;
+		}
 
 		if (!@mkdir($p_dir, PRADO_CHMOD)) {
 			$this->_error("Unable to create directory '$p_dir'");

framework/TComponent.php

Spacing +179 added lines, -179 removed lines

@@ -344,12 +344,12 @@ 
 	 * through each parent to the top most class, TComponent.
 	 */
 	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]);
 		}
 	}
@@ -380,7 +380,7 @@ 
 	 * called must be explicitly called.
 	 */
 	public function __destruct() {
-		if($this->_listeningenabled)
+		if ($this->_listeningenabled)
 			$this->unlisten();
 	}
 
@@ -404,8 +404,8 @@ 
 	{
 		$class = get_class($this);
 		$classes = [$class];
-		while($class = get_parent_class($class)){array_unshift($classes, $class);}
-		if($lowercase)
+		while ($class = get_parent_class($class)) {array_unshift($classes, $class); }
+		if ($lowercase)
 			return array_map('strtolower', $classes);
 		return $classes;
 	}
@@ -426,16 +426,16 @@ 
 	 * @return numeric the number of global events that were registered to the global event registry
 	 */
 	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);
 		}
 
@@ -460,16 +460,16 @@ 
 	 * @return numeric the number of global events that were unregistered from the global event registry
 	 */
 	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);
 		}
 
@@ -516,60 +516,60 @@ 
 	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))
+			$jsmethod = $getset.'js'.$propname;
+			if (method_exists($this, $jsmethod))
 			{
-				if(count($args) > 0)
-					if($args[0] && !($args[0] instanceof TJavaScriptString))
+				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 ($this->_m !== null && $this->_behaviorsenabled)
 		{
-			if(strncasecmp($method, 'dy', 2) === 0)
+			if (strncasecmp($method, 'dy', 2) === 0)
 			{
 				$callchain = new TCallChain($method);
-				foreach($this->_m->toArray() as $behavior)
+				foreach ($this->_m->toArray() as $behavior)
 				{
-					if((!($behavior instanceof IBehavior) || $behavior->getEnabled()) && (method_exists($behavior, $method) || ($behavior instanceof IDynamicMethods)))
+					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)
+				foreach ($this->_m->toArray() as $behavior)
 				{
-					if((!($behavior instanceof IBehavior) || $behavior->getEnabled()) && method_exists($behavior, $method))
+					if ((!($behavior instanceof IBehavior) || $behavior->getEnabled()) && method_exists($behavior, $method))
 					{
-						if($behavior instanceof IClassBehavior)
+						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 (strncasecmp($method, 'dy', 2) === 0 || strncasecmp($method, 'fx', 2) === 0)
 		{
-			if($this instanceof IDynamicMethods)
+			if ($this instanceof IDynamicMethods)
 				return $this->__dycall($method, $args);
-			return isset($args[0])?$args[0]:null;
+			return isset($args[0]) ? $args[0] : null;
 		}
 
 		// don't thrown an exception for __magicMethods() or any other weird methods natively implemented by php
@@ -604,42 +604,42 @@ 
 	 */
 	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();
+			return (string) $this->$jsgetter();
 		}
-		elseif(strncasecmp($name, 'on', 2) === 0 && method_exists($this, $name))
+		elseif (strncasecmp($name, 'on', 2) === 0 && method_exists($this, $name))
 		{
 			// getting an event (handler list)
 			$name = strtolower($name);
-			if(!isset($this->_e[$name]))
+			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)
+			elseif ($this->_m !== null)
 			{
-				foreach($this->_m->toArray() as $behavior)
+				foreach ($this->_m->toArray() as $behavior)
 				{
-					if((!($behavior instanceof IBehavior) || $behavior->getEnabled()) &&
+					if ((!($behavior instanceof IBehavior) || $behavior->getEnabled()) &&
 						(property_exists($behavior, $name) || $behavior->canGetProperty($name) || $behavior->hasEvent($name)))
 						return $behavior->$name;
 				}
@@ -665,38 +665,38 @@ 
 	 */
 	public function __set($name, $value)
 	{
-		if(method_exists($this, $setter = 'set' . $name))
+		if (method_exists($this, $setter = 'set'.$name))
 		{
-			if(strncasecmp($name, 'js', 2) === 0 && $value && !($value instanceof TJavaScriptLiteral))
+			if (strncasecmp($name, 'js', 2) === 0 && $value && !($value instanceof TJavaScriptLiteral))
 				$value = new TJavaScriptLiteral($value);
 			return $this->$setter($value);
 		}
-		elseif(method_exists($this, $jssetter = 'setjs' . $name))
+		elseif (method_exists($this, $jssetter = 'setjs'.$name))
 		{
-			if($value && !($value instanceof TJavaScriptString))
+			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)
+			foreach ($this->_m->toArray() as $behavior)
 			{
-				if((!($behavior instanceof IBehavior) || $behavior->getEnabled()) &&
+				if ((!($behavior instanceof IBehavior) || $behavior->getEnabled()) &&
 					(property_exists($behavior, $name) || $behavior->canSetProperty($name) || $behavior->hasEvent($name))) {
 					$behavior->$name = $value;
 					$sets++;
 				}
 			}
-			if($sets)return $value;
+			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);
 		}
@@ -720,27 +720,27 @@ 
 	 */
 	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)
+		elseif ($this->_m !== null && $this->_m->getCount() > 0 && $this->_behaviorsenabled)
 		{
-			if(isset($this->_m[$name]))
+			if (isset($this->_m[$name]))
 				return true;
-			foreach($this->_m->toArray() as $behavior)
+			foreach ($this->_m->toArray() as $behavior)
 			{
-				if((!($behavior instanceof IBehavior) || $behavior->getEnabled()))
+				if ((!($behavior instanceof IBehavior) || $behavior->getEnabled()))
 					return isset($behavior->$name);
 			}
 
@@ -761,31 +761,31 @@ 
 	 */
 	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)
+		elseif ($this->_m !== null && $this->_m->getCount() > 0 && $this->_behaviorsenabled)
 		{
-			if(isset($this->_m[$name]))
+			if (isset($this->_m[$name]))
 				$this->detachBehavior($name);
 			else {
 				$unset = 0;
-				foreach($this->_m->toArray() as $behavior)
+				foreach ($this->_m->toArray() as $behavior)
 				{
-					if((!($behavior instanceof IBehavior) || $behavior->getEnabled())) {
+					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);
 	}
 
@@ -812,13 +812,13 @@ 
 	 */
 	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)
+		elseif ($this->_m !== null && $this->_behaviorsenabled)
 		{
-			foreach($this->_m->toArray() as $behavior)
+			foreach ($this->_m->toArray() as $behavior)
 			{
-				if((!($behavior instanceof IBehavior) || $behavior->getEnabled()) && $behavior->canGetProperty($name))
+				if ((!($behavior instanceof IBehavior) || $behavior->getEnabled()) && $behavior->canGetProperty($name))
 					return true;
 			}
 		}
@@ -836,13 +836,13 @@ 
 	 */
 	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)
+		elseif ($this->_m !== null && $this->_behaviorsenabled)
 		{
-			foreach($this->_m->toArray() as $behavior)
+			foreach ($this->_m->toArray() as $behavior)
 			{
-				if((!($behavior instanceof IBehavior) || $behavior->getEnabled()) && $behavior->canSetProperty($name))
+				if ((!($behavior instanceof IBehavior) || $behavior->getEnabled()) && $behavior->canSetProperty($name))
 					return true;
 			}
 		}
@@ -862,7 +862,7 @@ 
 	public function getSubProperty($path)
 	{
 		$object = $this;
-		foreach(explode('.', $path) as $property)
+		foreach (explode('.', $path) as $property)
 			$object = $object->$property;
 		return $object;
 	}
@@ -880,7 +880,7 @@ 
 	public function setSubProperty($path, $value)
 	{
 		$object = $this;
-		if(($pos = strrpos($path, '.')) === false)
+		if (($pos = strrpos($path, '.')) === false)
 			$property = $path;
 		else
 		{
@@ -904,14 +904,14 @@ 
 	 */
 	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)
+		elseif ($this->_m !== null && $this->_behaviorsenabled)
 		{
-			foreach($this->_m->toArray() as $behavior)
+			foreach ($this->_m->toArray() as $behavior)
 			{
-				if((!($behavior instanceof IBehavior) || $behavior->getEnabled()) && $behavior->hasEvent($name))
+				if ((!($behavior instanceof IBehavior) || $behavior->getEnabled()) && $behavior->hasEvent($name))
 					return true;
 			}
 		}
@@ -928,16 +928,16 @@ 
 	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)
+			elseif ($this->_m !== null && $this->_behaviorsenabled) {
+				foreach ($this->_m->toArray() as $behavior)
 				{
-					if((!($behavior instanceof IBehavior) || $behavior->getEnabled()) && $behavior->hasEventHandler($name))
+					if ((!($behavior instanceof IBehavior) || $behavior->getEnabled()) && $behavior->hasEventHandler($name))
 						return true;
 				}
 			}
@@ -953,25 +953,25 @@ 
 	 */
 	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)
+		elseif ($this->_m !== null && $this->_behaviorsenabled)
 		{
-			foreach($this->_m->toArray() as $behavior)
+			foreach ($this->_m->toArray() as $behavior)
 			{
-				if((!($behavior instanceof IBehavior) || $behavior->getEnabled()) && $behavior->hasEvent($name))
+				if ((!($behavior instanceof IBehavior) || $behavior->getEnabled()) && $behavior->hasEvent($name))
 					return $behavior->getEventHandlers($name);
 			}
 		}
@@ -1040,14 +1040,14 @@ 
 	 */
 	public function detachEventHandler($name, $handler, $priority = false)
 	{
-		if($this->hasEventHandler($name))
+		if ($this->hasEventHandler($name))
 		{
 			try
 			{
 				$this->getEventHandlers($name)->remove($handler, $priority);
 				return true;
 			}
-			catch(\Exception $e)
+			catch (\Exception $e)
 			{
 			}
 		}
@@ -1129,13 +1129,13 @@ 
 	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;
 
 		$name = strtolower($name);
@@ -1143,31 +1143,31 @@ 
 
 		$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)
+			foreach ($handlerArray as $handler)
 			{
-				if($this->dyIntraRaiseEventTestHandler($handler, $sender, $param, $name) === false)
+				if ($this->dyIntraRaiseEventTestHandler($handler, $sender, $param, $name) === false)
 					continue;
 
-				if(is_string($handler))
+				if (is_string($handler))
 				{
-					if(($pos = strrpos($handler, '.')) !== false)
+					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_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 == '__dycall')
+								$response = $object->__dycall($name, [$sender, $param, $name]);
 							else
 								$response = $object->$method($sender, $param, $name);
 						}
@@ -1177,22 +1177,22 @@ 
 					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_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 == '__dycall')
+								$response = $object->__dycall($name, [$sender, $param, $name]);
 							else
 								$response = $object->$method($sender, $param, $name);
 						}
@@ -1205,23 +1205,23 @@ 
 
 				$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);
 
 		$responses = $this->dyPostRaiseEvent($responses, $name, $sender, $param, $responsetype, $postfunction);
@@ -1251,11 +1251,11 @@ 
 		$expression = $this->dyEvaluateExpressionFilter($expression);
 		try
 		{
-			if(eval("\$result=$expression;") === false)
+			if (eval("\$result=$expression;") === false)
 				throw new \Exception('');
 			return $result;
 		}
-		catch(\Exception $e)
+		catch (\Exception $e)
 		{
 			throw new TInvalidOperationException('component_expression_invalid', get_class($this), $expression, $e->getMessage());
 		}
@@ -1284,13 +1284,13 @@ 
 		try
 		{
 			ob_start();
-			if(eval($statements) === false)
+			if (eval($statements) === false)
 				throw new \Exception('');
 			$content = ob_get_contents();
 			ob_end_clean();
 			return $content;
 		}
-		catch(\Exception $e)
+		catch (\Exception $e)
 		{
 			throw new TInvalidOperationException('component_statements_invalid', get_class($this), $statements, $e->getMessage());
 		}
@@ -1353,7 +1353,7 @@ 
 	 * @since 3.2.3
 	 */
 	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());
 	}
 
@@ -1367,7 +1367,7 @@ 
 	 * @since 3.2.3
 	 */
 	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());
 	}
 
@@ -1391,23 +1391,23 @@ 
 	 * @since 3.2.3
 	 */
 	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);
 		self::$_um[$class] = [$name => $param] + self::$_um[$class];
-		$behaviorObject = is_string($behavior)?new $behavior:$behavior;
+		$behaviorObject = is_string($behavior) ? new $behavior : $behavior;
 		return $behaviorObject->raiseEvent('fxAttachClassBehavior', null, $param);
 	}
 
@@ -1425,20 +1425,20 @@ 
 	 * @since 3.2.3
 	 */
 	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];
 		$behavior = $param->getBehavior();
 		unset(self::$_um[$class][$name]);
-		$behaviorObject = is_string($behavior)?new $behavior:$behavior;
+		$behaviorObject = is_string($behavior) ? new $behavior : $behavior;
 		return $behaviorObject->raiseEvent('fxDetachClassBehavior', null, $param);
 	}
 
@@ -1451,7 +1451,7 @@ 
 	 */
 	public function asa($behaviorname)
 	{
-		return isset($this->_m[$behaviorname])?$this->_m[$behaviorname]:null;
+		return isset($this->_m[$behaviorname]) ? $this->_m[$behaviorname] : null;
 	}
 
 	/**
@@ -1475,17 +1475,17 @@ 
 	 */
 	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;
 			}
 		return false;
@@ -1501,8 +1501,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);
@@ -1518,13 +1518,13 @@ 
 	 */
 	public function detachBehaviors($behaviors)
 	{
-		if($this->_m !== null)
+		if ($this->_m !== null)
 		{
-			foreach($behaviors as $name => $behavior)
-				if($behavior instanceof TClassBehaviorEventParameter)
+			foreach ($behaviors as $name => $behavior)
+				if ($behavior instanceof TClassBehaviorEventParameter)
 					$this->detachBehavior($behavior->getName(), $behavior->getPriority());
 				else
-					$this->detachBehavior(is_string($behavior)?$behavior:$name);
+					$this->detachBehavior(is_string($behavior) ? $behavior : $name);
 		}
 	}
 
@@ -1534,9 +1534,9 @@ 
 	 */
 	public function clearBehaviors()
 	{
-		if($this->_m !== null)
+		if ($this->_m !== null)
 		{
-			foreach($this->_m->toArray() as $name => $behavior)
+			foreach ($this->_m->toArray() as $name => $behavior)
 				$this->detachBehavior($name);
 			$this->_m = null;
 		}
@@ -1564,13 +1564,13 @@ 
 	 */
 	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);
 		$this->dyAttachBehavior($name, $behavior);
@@ -1597,7 +1597,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);
@@ -1621,7 +1621,7 @@ 
 	 */
 	public function enableBehaviors()
 	{
-		if(!$this->_behaviorsenabled)
+		if (!$this->_behaviorsenabled)
 		{
 			$this->_behaviorsenabled = true;
 			$this->dyEnableBehaviors();
@@ -1642,7 +1642,7 @@ 
 	 */
 	public function disableBehaviors()
 	{
-		if($this->_behaviorsenabled)
+		if ($this->_behaviorsenabled)
 		{
 			$this->dyDisableBehaviors();
 			$this->_behaviorsenabled = false;
@@ -1678,8 +1678,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;
@@ -1706,8 +1706,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;
@@ -1724,7 +1724,7 @@ 
 	 */
 	public function __sleep()
 	{
-		$a = (array)$this;
+		$a = (array) $this;
 		$a = array_keys($a);
 		$exprops = [];
 		$this->_getZappableSleepProps($exprops);
@@ -1739,9 +1739,9 @@ 
 	 */
 	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 === [])
 			$exprops[] = "\0Prado\TComponent\0_e";

Braces +289 added lines, -235 removed lines

@@ -344,13 +344,15 @@ 
 	 * through each parent to the top most class, TComponent.
 	 */
 	public function __construct() {
-		if($this->getAutoGlobalListen())
-			$this->listen();
+		if($this->getAutoGlobalListen()) {
+					$this->listen();
+		}
 
 		$classes = array_reverse($this->getClassHierarchy(true));
 		foreach($classes as $class) {
-			if(isset(self::$_um[$class]))
-				$this->attachBehaviors(self::$_um[$class]);
+			if(isset(self::$_um[$class])) {
+							$this->attachBehaviors(self::$_um[$class]);
+			}
 		}
 	}
 
@@ -380,8 +382,9 @@ 
 	 * called must be explicitly called.
 	 */
 	public function __destruct() {
-		if($this->_listeningenabled)
-			$this->unlisten();
+		if($this->_listeningenabled) {
+					$this->unlisten();
+		}
 	}
 
 
@@ -405,8 +408,9 @@ 
 		$class = get_class($this);
 		$classes = [$class];
 		while($class = get_parent_class($class)){array_unshift($classes, $class);}
-		if($lowercase)
-			return array_map('strtolower', $classes);
+		if($lowercase) {
+					return array_map('strtolower', $classes);
+		}
 		return $classes;
 	}
 
@@ -426,13 +430,15 @@ 
 	 * @return numeric the number of global events that were registered to the global event registry
 	 */
 	public function listen() {
-		if($this->_listeningenabled)
-			return;
+		if($this->_listeningenabled) {
+					return;
+		}
 
 		$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']);
@@ -460,13 +466,15 @@ 
 	 * @return numeric the number of global events that were unregistered from the global event registry
 	 */
 	public function unlisten() {
-		if(!$this->_listeningenabled)
-			return;
+		if(!$this->_listeningenabled) {
+					return;
+		}
 
 		$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']);
@@ -522,14 +530,16 @@ 
 			$jsmethod = $getset . 'js' . $propname;
 			if(method_exists($this, $jsmethod))
 			{
-				if(count($args) > 0)
-					if($args[0] && !($args[0] instanceof TJavaScriptString))
+				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);
 			}
 
-			if (($getset == 'set') && method_exists($this, 'getjs' . $propname))
-				throw new TInvalidOperationException('component_property_readonly', get_class($this), $method);
+			if (($getset == 'set') && method_exists($this, 'getjs' . $propname)) {
+							throw new TInvalidOperationException('component_property_readonly', get_class($this), $method);
+			}
 		}
 
 		if($this->_m !== null && $this->_behaviorsenabled)
@@ -542,23 +552,25 @@ 
 					if((!($behavior instanceof IBehavior) || $behavior->getEnabled()) && (method_exists($behavior, $method) || ($behavior instanceof IDynamicMethods)))
 					{
 						$behavior_args = $args;
-						if($behavior instanceof IClassBehavior)
-							array_unshift($behavior_args, $this);
+						if($behavior instanceof IClassBehavior) {
+													array_unshift($behavior_args, $this);
+						}
 						$callchain->addCall([$behavior,$method], $behavior_args);
 					}
 
 				}
-				if($callchain->getCount() > 0)
-					return call_user_func_array([$callchain,'call'], $args);
-			}
-			else
+				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)
-							array_unshift($args, $this);
+						if($behavior instanceof IClassBehavior) {
+													array_unshift($args, $this);
+						}
 						return call_user_func_array([$behavior,$method], $args);
 					}
 				}
@@ -567,8 +579,9 @@ 
 
 		if(strncasecmp($method, 'dy', 2) === 0 || strncasecmp($method, 'fx', 2) === 0)
 		{
-			if($this instanceof IDynamicMethods)
-				return $this->__dycall($method, $args);
+			if($this instanceof IDynamicMethods) {
+							return $this->__dycall($method, $args);
+			}
 			return isset($args[0])?$args[0]:null;
 		}
 
@@ -608,40 +621,39 @@ 
 		{
 			// getting a property
 			return $this->$getter();
-		}
-		elseif(method_exists($this, $jsgetter = 'getjs' . $name))
+		} elseif(method_exists($this, $jsgetter = 'getjs' . $name))
 		{
 			// getting a javascript property
 			return (string)$this->$jsgetter();
-		}
-		elseif(strncasecmp($name, 'on', 2) === 0 && method_exists($this, $name))
+		} elseif(strncasecmp($name, 'on', 2) === 0 && method_exists($this, $name))
 		{
 			// getting an event (handler list)
 			$name = strtolower($name);
-			if(!isset($this->_e[$name]))
-				$this->_e[$name] = new TPriorityList;
+			if(!isset($this->_e[$name])) {
+							$this->_e[$name] = new TPriorityList;
+			}
 			return $this->_e[$name];
-		}
-		elseif(strncasecmp($name, 'fx', 2) === 0)
+		} elseif(strncasecmp($name, 'fx', 2) === 0)
 		{
 			// getting a global event (handler list)
 			$name = strtolower($name);
-			if(!isset(self::$_ue[$name]))
-				self::$_ue[$name] = new TPriorityList;
+			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]))
-				return $this->_m[$name];
-			elseif($this->_m !== null)
+			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()) &&
-						(property_exists($behavior, $name) || $behavior->canGetProperty($name) || $behavior->hasEvent($name)))
-						return $behavior->$name;
+						(property_exists($behavior, $name) || $behavior->canGetProperty($name) || $behavior->hasEvent($name))) {
+											return $behavior->$name;
+					}
 				}
 			}
 		}
@@ -667,21 +679,20 @@ 
 	{
 		if(method_exists($this, $setter = 'set' . $name))
 		{
-			if(strncasecmp($name, 'js', 2) === 0 && $value && !($value instanceof TJavaScriptLiteral))
-				$value = new TJavaScriptLiteral($value);
+			if(strncasecmp($name, 'js', 2) === 0 && $value && !($value instanceof TJavaScriptLiteral)) {
+							$value = new TJavaScriptLiteral($value);
+			}
 			return $this->$setter($value);
-		}
-		elseif(method_exists($this, $jssetter = 'setjs' . $name))
+		} elseif(method_exists($this, $jssetter = 'setjs' . $name))
 		{
-			if($value && !($value instanceof TJavaScriptString))
-				$value = new TJavaScriptString($value);
+			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)
@@ -692,15 +703,16 @@ 
 					$sets++;
 				}
 			}
-			if($sets)return $value;
+			if($sets) {
+				return $value;
+			}
 
 		}
 
 		if(method_exists($this, 'get' . $name) || method_exists($this, 'getjs' . $name))
 		{
 			throw new TInvalidOperationException('component_property_readonly', get_class($this), $name);
-		}
-		else
+		} else
 		{
 			throw new TInvalidOperationException('component_property_undefined', get_class($this), $name);
 		}
@@ -720,33 +732,33 @@ 
 	 */
 	public function __isset($name)
 	{
-		if(method_exists($this, $getter = 'get' . $name))
-			return $this->$getter() !== null;
-		elseif(method_exists($this, $jsgetter = 'getjs' . $name))
-			return $this->$jsgetter() !== null;
-		elseif(strncasecmp($name, 'on', 2) === 0 && method_exists($this, $name))
+		if(method_exists($this, $getter = 'get' . $name)) {
+					return $this->$getter() !== null;
+		} elseif(method_exists($this, $jsgetter = 'getjs' . $name)) {
+					return $this->$jsgetter() !== null;
+		} 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)
+		} elseif($this->_m !== null && $this->_m->getCount() > 0 && $this->_behaviorsenabled)
 		{
-			if(isset($this->_m[$name]))
-				return true;
+			if(isset($this->_m[$name])) {
+							return true;
+			}
 			foreach($this->_m->toArray() as $behavior)
 			{
-				if((!($behavior instanceof IBehavior) || $behavior->getEnabled()))
-					return isset($behavior->$name);
+				if((!($behavior instanceof IBehavior) || $behavior->getEnabled())) {
+									return isset($behavior->$name);
+				}
 			}
 
+		} else {
+					return false;
 		}
-		else
-			return false;
 	}
 
 	/**
@@ -761,19 +773,19 @@ 
 	 */
 	public function __unset($name)
 	{
-		if(method_exists($this, $setter = 'set' . $name))
-			$this->$setter(null);
-		elseif(method_exists($this, $jssetter = 'setjs' . $name))
-			$this->$jssetter(null);
-		elseif(strncasecmp($name, 'on', 2) === 0 && method_exists($this, $name))
-			$this->_e[strtolower($name)]->clear();
-		elseif(strncasecmp($name, 'fx', 2) === 0)
-			$this->getEventHandlers($name)->remove([$this, $name]);
-		elseif($this->_m !== null && $this->_m->getCount() > 0 && $this->_behaviorsenabled)
+		if(method_exists($this, $setter = 'set' . $name)) {
+					$this->$setter(null);
+		} elseif(method_exists($this, $jssetter = 'setjs' . $name)) {
+					$this->$jssetter(null);
+		} elseif(strncasecmp($name, 'on', 2) === 0 && method_exists($this, $name)) {
+					$this->_e[strtolower($name)]->clear();
+		} 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]))
-				$this->detachBehavior($name);
-			else {
+			if(isset($this->_m[$name])) {
+							$this->detachBehavior($name);
+			} else {
 				$unset = 0;
 				foreach($this->_m->toArray() as $behavior)
 				{
@@ -782,11 +794,13 @@ 
 						$unset++;
 					}
 				}
-				if(!$unset && method_exists($this, 'get' . $name))
-					throw new TInvalidOperationException('component_property_readonly', get_class($this), $name);
+				if(!$unset && method_exists($this, 'get' . $name)) {
+									throw new TInvalidOperationException('component_property_readonly', get_class($this), $name);
+				}
 			}
-		} elseif(method_exists($this, 'get' . $name))
-			throw new TInvalidOperationException('component_property_readonly', get_class($this), $name);
+		} elseif(method_exists($this, 'get' . $name)) {
+					throw new TInvalidOperationException('component_property_readonly', get_class($this), $name);
+		}
 	}
 
 	/**
@@ -812,14 +826,15 @@ 
 	 */
 	public function canGetProperty($name)
 	{
-		if(method_exists($this, 'get' . $name) || method_exists($this, 'getjs' . $name))
-			return true;
-		elseif($this->_m !== null && $this->_behaviorsenabled)
+		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))
-					return true;
+				if((!($behavior instanceof IBehavior) || $behavior->getEnabled()) && $behavior->canGetProperty($name)) {
+									return true;
+				}
 			}
 		}
 		return false;
@@ -836,14 +851,15 @@ 
 	 */
 	public function canSetProperty($name)
 	{
-		if(method_exists($this, 'set' . $name) || method_exists($this, 'setjs' . $name))
-			return true;
-		elseif($this->_m !== null && $this->_behaviorsenabled)
+		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))
-					return true;
+				if((!($behavior instanceof IBehavior) || $behavior->getEnabled()) && $behavior->canSetProperty($name)) {
+									return true;
+				}
 			}
 		}
 		return false;
@@ -862,8 +878,9 @@ 
 	public function getSubProperty($path)
 	{
 		$object = $this;
-		foreach(explode('.', $path) as $property)
-			$object = $object->$property;
+		foreach(explode('.', $path) as $property) {
+					$object = $object->$property;
+		}
 		return $object;
 	}
 
@@ -880,9 +897,9 @@ 
 	public function setSubProperty($path, $value)
 	{
 		$object = $this;
-		if(($pos = strrpos($path, '.')) === false)
-			$property = $path;
-		else
+		if(($pos = strrpos($path, '.')) === false) {
+					$property = $path;
+		} else
 		{
 			$object = $this->getSubProperty(substr($path, 0, $pos));
 			$property = substr($path, $pos + 1);
@@ -904,15 +921,15 @@ 
 	 */
 	public function hasEvent($name)
 	{
-		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)
+		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))
-					return true;
+				if((!($behavior instanceof IBehavior) || $behavior->getEnabled()) && $behavior->hasEvent($name)) {
+									return true;
+				}
 			}
 		}
 		return false;
@@ -928,17 +945,18 @@ 
 	public function hasEventHandler($name)
 	{
 		$name = strtolower($name);
-		if(strncasecmp($name, 'fx', 2) === 0)
-			return isset(self::$_ue[$name]) && self::$_ue[$name]->getCount() > 0;
-		else
+		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)
-				return true;
-			elseif($this->_m !== null && $this->_behaviorsenabled) {
+			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))
-						return true;
+					if((!($behavior instanceof IBehavior) || $behavior->getEnabled()) && $behavior->hasEventHandler($name)) {
+											return true;
+					}
 				}
 			}
 		}
@@ -956,23 +974,24 @@ 
 		if(strncasecmp($name, 'on', 2) === 0 && method_exists($this, $name))
 		{
 			$name = strtolower($name);
-			if(!isset($this->_e[$name]))
-				$this->_e[$name] = new TPriorityList;
+			if(!isset($this->_e[$name])) {
+							$this->_e[$name] = new TPriorityList;
+			}
 			return $this->_e[$name];
-		}
-		elseif(strncasecmp($name, 'fx', 2) === 0)
+		} elseif(strncasecmp($name, 'fx', 2) === 0)
 		{
 			$name = strtolower($name);
-			if(!isset(self::$_ue[$name]))
-				self::$_ue[$name] = new TPriorityList;
+			if(!isset(self::$_ue[$name])) {
+							self::$_ue[$name] = new TPriorityList;
+			}
 			return self::$_ue[$name];
-		}
-		elseif($this->_m !== null && $this->_behaviorsenabled)
+		} elseif($this->_m !== null && $this->_behaviorsenabled)
 		{
 			foreach($this->_m->toArray() as $behavior)
 			{
-				if((!($behavior instanceof IBehavior) || $behavior->getEnabled()) && $behavior->hasEvent($name))
-					return $behavior->getEventHandlers($name);
+				if((!($behavior instanceof IBehavior) || $behavior->getEnabled()) && $behavior->hasEvent($name)) {
+									return $behavior->getEventHandlers($name);
+				}
 			}
 		}
 		throw new TInvalidOperationException('component_event_undefined', get_class($this), $name);
@@ -1046,8 +1065,7 @@ 
 			{
 				$this->getEventHandlers($name)->remove($handler, $priority);
 				return true;
-			}
-			catch(\Exception $e)
+			} catch(\Exception $e)
 			{
 			}
 		}
@@ -1135,8 +1153,9 @@ 
 			$responsetype = null;
 		}
 
-		if($responsetype === null)
-			$responsetype = TEventResults::EVENT_RESULT_FILTER;
+		if($responsetype === null) {
+					$responsetype = TEventResults::EVENT_RESULT_FILTER;
+		}
 
 		$name = strtolower($name);
 		$responses = [];
@@ -1155,8 +1174,9 @@ 
 			$response = null;
 			foreach($handlerArray as $handler)
 			{
-				if($this->dyIntraRaiseEventTestHandler($handler, $sender, $param, $name) === false)
-					continue;
+				if($this->dyIntraRaiseEventTestHandler($handler, $sender, $param, $name) === false) {
+									continue;
+				}
 
 				if(is_string($handler))
 				{
@@ -1166,23 +1186,23 @@ 
 						$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]);
-							else
-								$response = $object->$method($sender, $param, $name);
+							if($method == '__dycall') {
+															$response = $object->__dycall($name, [$sender,$param,$name]);
+							} else {
+															$response = $object->$method($sender, $param, $name);
+							}
+						} else {
+													throw new TInvalidDataValueException('component_eventhandler_invalid', get_class($this), $name, $handler);
 						}
-						else
-							throw new TInvalidDataValueException('component_eventhandler_invalid', get_class($this), $name, $handler);
+					} else {
+											$response = call_user_func($handler, $sender, $param, $name);
 					}
-					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))
-						$response = call_user_func($handler, $sender, $param, $name);
-					else
+					if(is_string($object)) {
+											$response = call_user_func($handler, $sender, $param, $name);
+					} else
 					{
 						if(($pos = strrpos($method, '.')) !== false)
 						{
@@ -1191,38 +1211,43 @@ 
 						}
 						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);
+							if($method == '__dycall') {
+															$response = $object->__dycall($name, [$sender,$param,$name]);
+							} else {
+															$response = $object->$method($sender, $param, $name);
+							}
+						} else {
+													throw new TInvalidDataValueException('component_eventhandler_invalid', get_class($this), $name, $handler[1]);
 						}
-						else
-							throw new TInvalidDataValueException('component_eventhandler_invalid', get_class($this), $name, $handler[1]);
 					}
+				} else {
+									throw new TInvalidDataValueException('component_eventhandler_invalid', get_class($this), $name, gettype($handler));
 				}
-				else
-					throw new TInvalidDataValueException('component_eventhandler_invalid', get_class($this), $name, gettype($handler));
 
 				$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];
-				else
-					$responses[] = $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))
-					$param = $response;
+				if($response !== null && ($responsetype & TEventResults::EVENT_RESULT_FEED_FORWARD)) {
+									$param = $response;
+				}
 
 			}
+		} elseif(strncasecmp($name, 'on', 2) === 0 && !$this->hasEvent($name)) {
+					throw new TInvalidOperationException('component_event_undefined', get_class($this), $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)
-			$responses = array_filter($responses);
+		if($responsetype & TEventResults::EVENT_RESULT_FILTER) {
+					$responses = array_filter($responses);
+		}
 
 		$responses = $this->dyPostRaiseEvent($responses, $name, $sender, $param, $responsetype, $postfunction);
 
@@ -1251,11 +1276,11 @@ 
 		$expression = $this->dyEvaluateExpressionFilter($expression);
 		try
 		{
-			if(eval("\$result=$expression;") === false)
-				throw new \Exception('');
+			if(eval("\$result=$expression;") === false) {
+							throw new \Exception('');
+			}
 			return $result;
-		}
-		catch(\Exception $e)
+		} catch(\Exception $e)
 		{
 			throw new TInvalidOperationException('component_expression_invalid', get_class($this), $expression, $e->getMessage());
 		}
@@ -1284,13 +1309,13 @@ 
 		try
 		{
 			ob_start();
-			if(eval($statements) === false)
-				throw new \Exception('');
+			if(eval($statements) === false) {
+							throw new \Exception('');
+			}
 			$content = ob_get_contents();
 			ob_end_clean();
 			return $content;
-		}
-		catch(\Exception $e)
+		} catch(\Exception $e)
 		{
 			throw new TInvalidOperationException('component_statements_invalid', get_class($this), $statements, $e->getMessage());
 		}
@@ -1353,8 +1378,9 @@ 
 	 * @since 3.2.3
 	 */
 	public function fxAttachClassBehavior($sender, $param) {
-		if(in_array($param->getClass(), $this->getClassHierarchy(true)))
-			return $this->attachBehavior($param->getName(), $param->getBehavior(), $param->getPriority());
+		if(in_array($param->getClass(), $this->getClassHierarchy(true))) {
+					return $this->attachBehavior($param->getName(), $param->getBehavior(), $param->getPriority());
+		}
 	}
 
 
@@ -1367,8 +1393,9 @@ 
 	 * @since 3.2.3
 	 */
 	public function fxDetachClassBehavior($sender, $param) {
-		if(in_array($param->getClass(), $this->getClassHierarchy(true)))
-			return $this->detachBehavior($param->getName(), $param->getPriority());
+		if(in_array($param->getClass(), $this->getClassHierarchy(true))) {
+					return $this->detachBehavior($param->getName(), $param->getPriority());
+		}
 	}
 
 
@@ -1391,20 +1418,26 @@ 
 	 * @since 3.2.3
 	 */
 	public static function attachClassBehavior($name, $behavior, $class = null, $priority = null) {
-		if(!$class && function_exists('get_called_class'))
-			$class = get_called_class();
-		if(!$class)
-			throw new TInvalidOperationException('component_no_class_provided_nor_late_binding');
+		if(!$class && function_exists('get_called_class')) {
+					$class = get_called_class();
+		}
+		if(!$class) {
+					throw new TInvalidOperationException('component_no_class_provided_nor_late_binding');
+		}
 
-		if(!is_string($name))
-			$name = get_class($name);
+		if(!is_string($name)) {
+					$name = get_class($name);
+		}
 		$class = strtolower($class);
-		if($class === 'tcomponent')
-			throw new TInvalidOperationException('component_no_tcomponent_class_behaviors');
-		if(empty(self::$_um[$class]))
-			self::$_um[$class] = [];
-		if(isset(self::$_um[$class][$name]))
-			throw new TInvalidOperationException('component_class_behavior_defined', $class, $name);
+		if($class === 'tcomponent') {
+					throw new TInvalidOperationException('component_no_tcomponent_class_behaviors');
+		}
+		if(empty(self::$_um[$class])) {
+					self::$_um[$class] = [];
+		}
+		if(isset(self::$_um[$class][$name])) {
+					throw new TInvalidOperationException('component_class_behavior_defined', $class, $name);
+		}
 		$param = new TClassBehaviorEventParameter($class, $name, $behavior, $priority);
 		self::$_um[$class] = [$name => $param] + self::$_um[$class];
 		$behaviorObject = is_string($behavior)?new $behavior:$behavior;
@@ -1425,16 +1458,20 @@ 
 	 * @since 3.2.3
 	 */
 	public static function detachClassBehavior($name, $class = null, $priority = false) {
-		if(!$class && function_exists('get_called_class'))
-			$class = get_called_class();
-		if(!$class)
-			throw new TInvalidOperationException('component_no_class_provided_nor_late_binding');
+		if(!$class && function_exists('get_called_class')) {
+					$class = get_called_class();
+		}
+		if(!$class) {
+					throw new TInvalidOperationException('component_no_class_provided_nor_late_binding');
+		}
 
 		$class = strtolower($class);
-		if(!is_string($name))
-			$name = get_class($name);
-		if(empty(self::$_um[$class]) || !isset(self::$_um[$class][$name]))
-			return false;
+		if(!is_string($name)) {
+					$name = get_class($name);
+		}
+		if(empty(self::$_um[$class]) || !isset(self::$_um[$class][$name])) {
+					return false;
+		}
 		$param = self::$_um[$class][$name];
 		$behavior = $param->getBehavior();
 		unset(self::$_um[$class][$name]);
@@ -1475,18 +1512,22 @@ 
 	 */
 	public function isa($class)
 	{
-		if($this instanceof $class)
-			return true;
-		if($this->_m !== null && $this->_behaviorsenabled)
-			foreach($this->_m->toArray() as $behavior){
+		if($this instanceof $class) {
+					return true;
+		}
+		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))
-					return true;
-				if($check === null && ($behavior->isa($class)))
-					return true;
+				if(($behavior->isa('\Prado\Util\IInstanceCheck')) && $check = $behavior->isinstanceof($class, $this)) {
+									return true;
+				}
+				if($check === null && ($behavior->isa($class))) {
+									return true;
+				}
 			}
 		return false;
 	}
@@ -1501,11 +1542,13 @@ 
 	 */
 	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);
+		}
+			else {
+							$this->attachBehavior($name, $behavior);
+			}
 	}
 
 	/**
@@ -1520,11 +1563,13 @@ 
 	{
 		if($this->_m !== null)
 		{
-			foreach($behaviors as $name => $behavior)
-				if($behavior instanceof TClassBehaviorEventParameter)
+			foreach($behaviors as $name => $behavior) {
+							if($behavior instanceof TClassBehaviorEventParameter)
 					$this->detachBehavior($behavior->getName(), $behavior->getPriority());
-				else
-					$this->detachBehavior(is_string($behavior)?$behavior:$name);
+			}
+				else {
+									$this->detachBehavior(is_string($behavior)?$behavior:$name);
+				}
 		}
 	}
 
@@ -1536,8 +1581,9 @@ 
 	{
 		if($this->_m !== null)
 		{
-			foreach($this->_m->toArray() as $name => $behavior)
-				$this->detachBehavior($name);
+			foreach($this->_m->toArray() as $name => $behavior) {
+							$this->detachBehavior($name);
+			}
 			$this->_m = null;
 		}
 	}
@@ -1564,14 +1610,18 @@ 
 	 */
 	public function attachBehavior($name, $behavior, $priority = null)
 	{
-		if(is_string($behavior))
-			$behavior = Prado::createComponent($behavior);
-		if(!($behavior instanceof IBaseBehavior))
-			throw new TInvalidDataTypeException('component_not_a_behavior', get_class($behavior));
-		if($behavior instanceof IBehavior)
-			$behavior->setEnabled(true);
-		if($this->_m === null)
-			$this->_m = new TPriorityMap;
+		if(is_string($behavior)) {
+					$behavior = Prado::createComponent($behavior);
+		}
+		if(!($behavior instanceof IBaseBehavior)) {
+					throw new TInvalidDataTypeException('component_not_a_behavior', get_class($behavior));
+		}
+		if($behavior instanceof IBehavior) {
+					$behavior->setEnabled(true);
+		}
+		if($this->_m === null) {
+					$this->_m = new TPriorityMap;
+		}
 		$behavior->attach($this);
 		$this->dyAttachBehavior($name, $behavior);
 		$this->_m->add($name, $behavior, $priority);
@@ -1739,13 +1789,17 @@ 
 	 */
 	protected function _getZappableSleepProps(&$exprops)
 	{
-		if($this->_listeningenabled === false)
-			$exprops[] = "\0Prado\TComponent\0_listeningenabled";
-		if($this->_behaviorsenabled === true)
-			$exprops[] = "\0Prado\TComponent\0_behaviorsenabled";
-		if ($this->_e === [])
-			$exprops[] = "\0Prado\TComponent\0_e";
-		if ($this->_m === null)
-			$exprops[] = "\0Prado\TComponent\0_m";
+		if($this->_listeningenabled === false) {
+					$exprops[] = "\0Prado\TComponent\0_listeningenabled";
+		}
+		if($this->_behaviorsenabled === true) {
+					$exprops[] = "\0Prado\TComponent\0_behaviorsenabled";
+		}
+		if ($this->_e === []) {
+					$exprops[] = "\0Prado\TComponent\0_e";
+		}
+		if ($this->_m === null) {
+					$exprops[] = "\0Prado\TComponent\0_m";
+		}
 	}
 }
\ No newline at end of file

framework/TPropertyValue.php

Spacing +16 added lines, -16 removed lines

@@ -65,7 +65,7 @@ 
 		if (is_string($value))
 			return strcasecmp($value, 'true') == 0 || $value != 0;
 		else
-			return (boolean)$value;
+			return (boolean) $value;
 	}
 
 	/**
@@ -80,9 +80,9 @@ 
 		if (TJavaScript::isJsLiteral($value))
 			return $value;
 		if (is_bool($value))
-			return $value?'true':'false';
+			return $value ? 'true' : 'false';
 		else
-			return (string)$value;
+			return (string) $value;
 	}
 
 	/**
@@ -92,7 +92,7 @@ 
 	 */
 	public static function ensureInteger($value)
 	{
-		return (integer)$value;
+		return (integer) $value;
 	}
 
 	/**
@@ -102,7 +102,7 @@ 
 	 */
 	public static function ensureFloat($value)
 	{
-		return (float)$value;
+		return (float) $value;
 	}
 
 	/**
@@ -116,20 +116,20 @@ 
 	 */
 	public static function ensureArray($value)
 	{
-		if(is_string($value))
+		if (is_string($value))
 		{
 			$value = trim($value);
 			$len = strlen($value);
 			if ($len >= 2 && $value[0] == '(' && $value[$len - 1] == ')')
 			{
-				eval('$array=array' . $value . ';');
+				eval('$array=array'.$value.';');
 				return $array;
 			}
 			else
-				return $len > 0?[$value]:[];
+				return $len > 0 ? [$value] : [];
 		}
 		else
-			return (array)$value;
+			return (array) $value;
 	}
 
 	/**
@@ -139,7 +139,7 @@ 
 	 */
 	public static function ensureObject($value)
 	{
-		return (object)$value;
+		return (object) $value;
 	}
 
 	/**
@@ -161,23 +161,23 @@ 
 	public static function ensureEnum($value, $enums)
 	{
 		static $types = [];
-		if(func_num_args() === 2 && is_string($enums))
+		if (func_num_args() === 2 && is_string($enums))
 		{
-			if(!isset($types[$enums]))
+			if (!isset($types[$enums]))
 				$types[$enums] = new \ReflectionClass($enums);
-			if($types[$enums]->hasConstant($value))
+			if ($types[$enums]->hasConstant($value))
 				return $value;
 			else
 				throw new TInvalidDataValueException(
 					'propertyvalue_enumvalue_invalid', $value,
 						implode(' | ', $types[$enums]->getConstants()));
 		}
-		elseif(!is_array($enums))
+		elseif (!is_array($enums))
 		{
 			$enums = func_get_args();
 			array_shift($enums);
 		}
-		if(in_array($value, $enums, true))
+		if (in_array($value, $enums, true))
 			return $value;
 		else
 			throw new TInvalidDataValueException('propertyvalue_enumvalue_invalid', $value, implode(' | ', $enums));
@@ -190,6 +190,6 @@ 
 	 */
 	public static function ensureNullIfEmpty($value)
 	{
-		return empty($value)?null:$value;
+		return empty($value) ?null:$value;
 	}
 }
\ No newline at end of file

Braces +31 added lines, -26 removed lines

@@ -62,10 +62,11 @@ 
 	 */
 	public static function ensureBoolean($value)
 	{
-		if (is_string($value))
-			return strcasecmp($value, 'true') == 0 || $value != 0;
-		else
-			return (boolean)$value;
+		if (is_string($value)) {
+					return strcasecmp($value, 'true') == 0 || $value != 0;
+		} else {
+					return (boolean)$value;
+		}
 	}
 
 	/**
@@ -77,12 +78,14 @@ 
 	 */
 	public static function ensureString($value)
 	{
-		if (TJavaScript::isJsLiteral($value))
-			return $value;
-		if (is_bool($value))
-			return $value?'true':'false';
-		else
-			return (string)$value;
+		if (TJavaScript::isJsLiteral($value)) {
+					return $value;
+		}
+		if (is_bool($value)) {
+					return $value?'true':'false';
+		} else {
+					return (string)$value;
+		}
 	}
 
 	/**
@@ -124,12 +127,12 @@ 
 			{
 				eval('$array=array' . $value . ';');
 				return $array;
+			} else {
+							return $len > 0?[$value]:[];
 			}
-			else
-				return $len > 0?[$value]:[];
+		} else {
+					return (array)$value;
 		}
-		else
-			return (array)$value;
 	}
 
 	/**
@@ -163,24 +166,26 @@ 
 		static $types = [];
 		if(func_num_args() === 2 && is_string($enums))
 		{
-			if(!isset($types[$enums]))
-				$types[$enums] = new \ReflectionClass($enums);
-			if($types[$enums]->hasConstant($value))
-				return $value;
-			else
-				throw new TInvalidDataValueException(
+			if(!isset($types[$enums])) {
+							$types[$enums] = new \ReflectionClass($enums);
+			}
+			if($types[$enums]->hasConstant($value)) {
+							return $value;
+			} else {
+							throw new TInvalidDataValueException(
 					'propertyvalue_enumvalue_invalid', $value,
 						implode(' | ', $types[$enums]->getConstants()));
-		}
-		elseif(!is_array($enums))
+			}
+		} elseif(!is_array($enums))
 		{
 			$enums = func_get_args();
 			array_shift($enums);
 		}
-		if(in_array($value, $enums, true))
-			return $value;
-		else
-			throw new TInvalidDataValueException('propertyvalue_enumvalue_invalid', $value, implode(' | ', $enums));
+		if(in_array($value, $enums, true)) {
+					return $value;
+		} else {
+					throw new TInvalidDataValueException('propertyvalue_enumvalue_invalid', $value, implode(' | ', $enums));
+		}
 	}
 
 	/**

framework/Data/TDbDataReader.php

Spacing +3 added lines, -3 removed lines

@@ -67,7 +67,7 @@ 
 	 */
 	public function bindColumn($column, &$value, $dataType = null)
 	{
-		if($dataType === null)
+		if ($dataType === null)
 			$this->_statement->bindColumn($column, $value);
 		else
 			$this->_statement->bindColumn($column, $value, $dataType);
@@ -79,7 +79,7 @@ 
 	public function setFetchMode($mode)
 	{
 		$params = func_get_args();
-		call_user_func_array([$this->_statement,'setFetchMode'], $params);
+		call_user_func_array([$this->_statement, 'setFetchMode'], $params);
 	}
 
 	/**
@@ -176,7 +176,7 @@ 
 	 */
 	public function rewind()
 	{
-		if($this->_index < 0)
+		if ($this->_index < 0)
 		{
 			$this->_row = $this->_statement->fetch();
 			$this->_index = 0;

Braces +7 added lines, -6 removed lines

@@ -67,10 +67,11 @@ 
 	 */
 	public function bindColumn($column, &$value, $dataType = null)
 	{
-		if($dataType === null)
-			$this->_statement->bindColumn($column, $value);
-		else
-			$this->_statement->bindColumn($column, $value, $dataType);
+		if($dataType === null) {
+					$this->_statement->bindColumn($column, $value);
+		} else {
+					$this->_statement->bindColumn($column, $value, $dataType);
+		}
 	}
 
 	/**
@@ -180,9 +181,9 @@ 
 		{
 			$this->_row = $this->_statement->fetch();
 			$this->_index = 0;
+		} else {
+					throw new TDbException('dbdatareader_rewind_invalid');
 		}
-		else
-			throw new TDbException('dbdatareader_rewind_invalid');
 	}
 
 	/**

framework/Data/TDbConnection.php

Spacing +22 added lines, -22 removed lines

@@ -141,7 +141,7 @@ 
 	public function __sleep()
 	{
 //		$this->close(); - DO NOT CLOSE the current connection as serializing doesn't neccessarily mean we don't this connection anymore in the current session
-		return array_diff(parent::__sleep(), ["\0Prado\Data\TDbConnection\0_pdo","\0Prado\Data\TDbConnection\0_active"]);
+		return array_diff(parent::__sleep(), ["\0Prado\Data\TDbConnection\0_pdo", "\0Prado\Data\TDbConnection\0_active"]);
 	}
 
 	/**
@@ -169,9 +169,9 @@ 
 	public function setActive($value)
 	{
 		$value = TPropertyValue::ensureBoolean($value);
-		if($value !== $this->_active)
+		if ($value !== $this->_active)
 		{
-			if($value)
+			if ($value)
 				$this->open();
 			else
 				$this->close();
@@ -184,11 +184,11 @@ 
 	 */
 	protected function open()
 	{
-		if($this->_pdo === null)
+		if ($this->_pdo === null)
 		{
 			try
 			{
-				$this->_pdo = new PDO($this->getConnectionString(),$this->getUsername(),
+				$this->_pdo = new PDO($this->getConnectionString(), $this->getUsername(),
 									$this->getPassword(), $this->_attributes);
 				// This attribute is only useful for PDO::MySql driver.
 				// Ignore the warning if a driver doesn't understand this.
@@ -197,7 +197,7 @@ 
 				$this->_active = true;
 				$this->setConnectionCharset();
 			}
-			catch(PDOException $e)
+			catch (PDOException $e)
 			{
 				throw new TDbException('dbconnection_open_failed', $e->getMessage());
 			}
@@ -290,7 +290,7 @@ 
 	/**
 	 * @return string the charset used for database connection. Defaults to emtpy string.
 	 */
-	public function getCharset ()
+	public function getCharset()
 	{
 		return $this->_charset;
 	}
@@ -298,7 +298,7 @@ 
 	/**
 	 * @param string the charset used for database connection
 	 */
-	public function setCharset ($value)
+	public function setCharset($value)
 	{
 		$this->_charset = $value;
 		$this->setConnectionCharset();
@@ -320,7 +320,7 @@ 
 	 */
 	public function createCommand($sql)
 	{
-		if($this->getActive())
+		if ($this->getActive())
 			return new TDbCommand($this, $sql);
 		else
 			throw new TDbException('dbconnection_connection_inactive');
@@ -331,9 +331,9 @@ 
 	 */
 	public function getCurrentTransaction()
 	{
-		if($this->_transaction !== null)
+		if ($this->_transaction !== null)
 		{
-			if($this->_transaction->getActive())
+			if ($this->_transaction->getActive())
 				return $this->_transaction;
 		}
 		return null;
@@ -346,7 +346,7 @@ 
 	 */
 	public function beginTransaction()
 	{
-		if($this->getActive())
+		if ($this->getActive())
 		{
 			$this->_pdo->beginTransaction();
 			return $this->_transaction = Prado::createComponent($this->getTransactionClass(), $this);
@@ -371,7 +371,7 @@ 
 	 */
 	public function setTransactionClass($value)
 	{
-		$this->_transactionClass = (string)$value;
+		$this->_transactionClass = (string) $value;
 	}
 
 	/**
@@ -382,7 +382,7 @@ 
 	 */
 	public function getLastInsertID($sequenceName = '')
 	{
-		if($this->getActive())
+		if ($this->getActive())
 			return $this->_pdo->lastInsertId($sequenceName);
 		else
 			throw new TDbException('dbconnection_connection_inactive');
@@ -396,7 +396,7 @@ 
 	 */
 	public function quoteString($str)
 	{
-		if($this->getActive())
+		if ($this->getActive())
 			return $this->_pdo->quote($str);
 		else
 			throw new TDbException('dbconnection_connection_inactive');
@@ -437,7 +437,7 @@ 
 	 */
 	public function getDbMetaData()
 	{
-		if($this->_dbMeta === null)
+		if ($this->_dbMeta === null)
 		{
 			$this->_dbMeta = TDbMetaData::getInstance($this);
 		}
@@ -449,7 +449,7 @@ 
 	 */
 	public function getColumnCase()
 	{
-		switch($this->getAttribute(PDO::ATTR_CASE))
+		switch ($this->getAttribute(PDO::ATTR_CASE))
 		{
 			case PDO::CASE_NATURAL:
 				return TDbColumnCaseMode::Preserved;
@@ -465,7 +465,7 @@ 
 	 */
 	public function setColumnCase($value)
 	{
-		switch(TPropertyValue::ensureEnum($value, 'Prado\\Data\\TDbColumnCaseMode'))
+		switch (TPropertyValue::ensureEnum($value, 'Prado\\Data\\TDbColumnCaseMode'))
 		{
 			case TDbColumnCaseMode::Preserved:
 				$value = PDO::CASE_NATURAL;
@@ -485,7 +485,7 @@ 
 	 */
 	public function getNullConversion()
 	{
-		switch($this->getAttribute(PDO::ATTR_ORACLE_NULLS))
+		switch ($this->getAttribute(PDO::ATTR_ORACLE_NULLS))
 		{
 			case PDO::NULL_NATURAL:
 				return TDbNullConversionMode::Preserved;
@@ -501,7 +501,7 @@ 
 	 */
 	public function setNullConversion($value)
 	{
-		switch(TPropertyValue::ensureEnum($value, 'Prado\\Data\\TDbNullConversionMode'))
+		switch (TPropertyValue::ensureEnum($value, 'Prado\\Data\\TDbNullConversionMode'))
 		{
 			case TDbNullConversionMode::Preserved:
 				$value = PDO::NULL_NATURAL;
@@ -617,7 +617,7 @@ 
 	 */
 	public function getAttribute($name)
 	{
-		if($this->getActive())
+		if ($this->getActive())
 			return $this->_pdo->getAttribute($name);
 		else
 			throw new TDbException('dbconnection_connection_inactive');
@@ -631,7 +631,7 @@ 
 	 */
 	public function setAttribute($name, $value)
 	{
-		if($this->_pdo instanceof PDO)
+		if ($this->_pdo instanceof PDO)
 			$this->_pdo->setAttribute($name, $value);
 		else
 			$this->_attributes[$name] = $value;

Braces +39 added lines, -32 removed lines

@@ -171,10 +171,11 @@ 
 		$value = TPropertyValue::ensureBoolean($value);
 		if($value !== $this->_active)
 		{
-			if($value)
-				$this->open();
-			else
-				$this->close();
+			if($value) {
+							$this->open();
+			} else {
+							$this->close();
+			}
 		}
 	}
 
@@ -196,8 +197,7 @@ 
 				$this->_pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
 				$this->_active = true;
 				$this->setConnectionCharset();
-			}
-			catch(PDOException $e)
+			} catch(PDOException $e)
 			{
 				throw new TDbException('dbconnection_open_failed', $e->getMessage());
 			}
@@ -221,8 +221,9 @@ 
 	 */
 	protected function setConnectionCharset()
 	{
-		if ($this->_charset === '' || $this->_active === false)
-			return;
+		if ($this->_charset === '' || $this->_active === false) {
+					return;
+		}
 		switch ($this->_pdo->getAttribute(PDO::ATTR_DRIVER_NAME))
 		{
 			case 'mysql':
@@ -320,10 +321,11 @@ 
 	 */
 	public function createCommand($sql)
 	{
-		if($this->getActive())
-			return new TDbCommand($this, $sql);
-		else
-			throw new TDbException('dbconnection_connection_inactive');
+		if($this->getActive()) {
+					return new TDbCommand($this, $sql);
+		} else {
+					throw new TDbException('dbconnection_connection_inactive');
+		}
 	}
 
 	/**
@@ -333,8 +335,9 @@ 
 	{
 		if($this->_transaction !== null)
 		{
-			if($this->_transaction->getActive())
-				return $this->_transaction;
+			if($this->_transaction->getActive()) {
+							return $this->_transaction;
+			}
 		}
 		return null;
 	}
@@ -350,9 +353,9 @@ 
 		{
 			$this->_pdo->beginTransaction();
 			return $this->_transaction = Prado::createComponent($this->getTransactionClass(), $this);
+		} else {
+					throw new TDbException('dbconnection_connection_inactive');
 		}
-		else
-			throw new TDbException('dbconnection_connection_inactive');
 	}
 
 	/**
@@ -382,10 +385,11 @@ 
 	 */
 	public function getLastInsertID($sequenceName = '')
 	{
-		if($this->getActive())
-			return $this->_pdo->lastInsertId($sequenceName);
-		else
-			throw new TDbException('dbconnection_connection_inactive');
+		if($this->getActive()) {
+					return $this->_pdo->lastInsertId($sequenceName);
+		} else {
+					throw new TDbException('dbconnection_connection_inactive');
+		}
 	}
 
 	/**
@@ -396,10 +400,11 @@ 
 	 */
 	public function quoteString($str)
 	{
-		if($this->getActive())
-			return $this->_pdo->quote($str);
-		else
-			throw new TDbException('dbconnection_connection_inactive');
+		if($this->getActive()) {
+					return $this->_pdo->quote($str);
+		} else {
+					throw new TDbException('dbconnection_connection_inactive');
+		}
 	}
 
 	/**
@@ -617,10 +622,11 @@ 
 	 */
 	public function getAttribute($name)
 	{
-		if($this->getActive())
-			return $this->_pdo->getAttribute($name);
-		else
-			throw new TDbException('dbconnection_connection_inactive');
+		if($this->getActive()) {
+					return $this->_pdo->getAttribute($name);
+		} else {
+					throw new TDbException('dbconnection_connection_inactive');
+		}
 	}
 
 	/**
@@ -631,9 +637,10 @@ 
 	 */
 	public function setAttribute($name, $value)
 	{
-		if($this->_pdo instanceof PDO)
-			$this->_pdo->setAttribute($name, $value);
-		else
-			$this->_attributes[$name] = $value;
+		if($this->_pdo instanceof PDO) {
+					$this->_pdo->setAttribute($name, $value);
+		} else {
+					$this->_attributes[$name] = $value;
+		}
 	}
 }
\ No newline at end of file

framework/Data/TDbTransaction.php

Spacing +2 added lines, -2 removed lines

@@ -64,7 +64,7 @@ 
 	 */
 	public function commit()
 	{
-		if($this->_active && $this->_connection->getActive())
+		if ($this->_active && $this->_connection->getActive())
 		{
 			$this->_connection->getPdoInstance()->commit();
 			$this->_active = false;
@@ -79,7 +79,7 @@ 
 	 */
 	public function rollback()
 	{
-		if($this->_active && $this->_connection->getActive())
+		if ($this->_active && $this->_connection->getActive())
 		{
 			$this->_connection->getPdoInstance()->rollBack();
 			$this->_active = false;

Braces +4 added lines, -4 removed lines

@@ -68,9 +68,9 @@ 
 		{
 			$this->_connection->getPdoInstance()->commit();
 			$this->_active = false;
+		} else {
+					throw new TDbException('dbtransaction_transaction_inactive');
 		}
-		else
-			throw new TDbException('dbtransaction_transaction_inactive');
 	}
 
 	/**
@@ -83,9 +83,9 @@ 
 		{
 			$this->_connection->getPdoInstance()->rollBack();
 			$this->_active = false;
+		} else {
+					throw new TDbException('dbtransaction_transaction_inactive');
 		}
-		else
-			throw new TDbException('dbtransaction_transaction_inactive');
 	}
 
 	/**

framework/Data/TDbCommand.php

Spacing +15 added lines, -15 removed lines

@@ -112,13 +112,13 @@ 
 	 */
 	public function prepare()
 	{
-		if($this->_statement == null)
+		if ($this->_statement == null)
 		{
 			try
 			{
 				$this->_statement = $this->getConnection()->getPdoInstance()->prepare($this->getText());
 			}
-			catch(Exception $e)
+			catch (Exception $e)
 			{
 				throw new TDbException('dbcommand_prepare_failed', $e->getMessage(), $this->getText());
 			}
@@ -149,9 +149,9 @@ 
 	public function bindParameter($name, &$value, $dataType = null, $length = null)
 	{
 		$this->prepare();
-		if($dataType === null)
+		if ($dataType === null)
 			$this->_statement->bindParam($name, $value);
-		elseif($length === null)
+		elseif ($length === null)
 			$this->_statement->bindParam($name, $value, $dataType);
 		else
 			$this->_statement->bindParam($name, $value, $dataType, $length);
@@ -170,7 +170,7 @@ 
 	public function bindValue($name, $value, $dataType = null)
 	{
 		$this->prepare();
-		if($dataType === null)
+		if ($dataType === null)
 			$this->_statement->bindValue($name, $value);
 		else
 			$this->_statement->bindValue($name, $value, $dataType);
@@ -189,7 +189,7 @@ 
 		{
 			// Do not trace because it will remain even in Performance mode
 			// Prado::trace('Execute Command: '.$this->getDebugStatementText(), 'Prado\Data');
-			if($this->_statement instanceof PDOStatement)
+			if ($this->_statement instanceof PDOStatement)
 			{
 				$this->_statement->execute();
 				return $this->_statement->rowCount();
@@ -197,7 +197,7 @@ 
 			else
 				return $this->getConnection()->getPdoInstance()->exec($this->getText());
 		}
-		catch(Exception $e)
+		catch (Exception $e)
 		{
 			throw new TDbException('dbcommand_execute_failed', $e->getMessage(), $this->getDebugStatementText());
 		}
@@ -225,13 +225,13 @@ 
 		try
 		{
 			// Prado::trace('Query: '.$this->getDebugStatementText(), 'Prado\Data');
-			if($this->_statement instanceof PDOStatement)
+			if ($this->_statement instanceof PDOStatement)
 				$this->_statement->execute();
 			else
 				$this->_statement = $this->getConnection()->getPdoInstance()->query($this->getText());
 			return new TDbDataReader($this);
 		}
-		catch(Exception $e)
+		catch (Exception $e)
 		{
 			throw new TDbException('dbcommand_query_failed', $e->getMessage(), $this->getDebugStatementText());
 		}
@@ -250,7 +250,7 @@ 
 		try
 		{
 			// Prado::trace('Query Row: '.$this->getDebugStatementText(), 'Prado\Data');
-			if($this->_statement instanceof PDOStatement)
+			if ($this->_statement instanceof PDOStatement)
 				$this->_statement->execute();
 			else
 				$this->_statement = $this->getConnection()->getPdoInstance()->query($this->getText());
@@ -258,7 +258,7 @@ 
 			$this->_statement->closeCursor();
 			return $result;
 		}
-		catch(Exception $e)
+		catch (Exception $e)
 		{
 			throw new TDbException('dbcommand_query_failed', $e->getMessage(), $this->getDebugStatementText());
 		}
@@ -276,18 +276,18 @@ 
 		try
 		{
 			// Prado::trace('Query Scalar: '.$this->getDebugStatementText(), 'Prado\Data');
-			if($this->_statement instanceof PDOStatement)
+			if ($this->_statement instanceof PDOStatement)
 				$this->_statement->execute();
 			else
 				$this->_statement = $this->getConnection()->getPdoInstance()->query($this->getText());
 			$result = $this->_statement->fetchColumn();
 			$this->_statement->closeCursor();
-			if(is_resource($result) && get_resource_type($result) === 'stream')
+			if (is_resource($result) && get_resource_type($result) === 'stream')
 				return stream_get_contents($result);
 			else
 				return $result;
 		}
-		catch(Exception $e)
+		catch (Exception $e)
 		{
 			throw new TDbException('dbcommand_query_failed', $e->getMessage(), $this->getDebugStatementText());
 		}
@@ -305,7 +305,7 @@ 
 	{
 		$rows = $this->query()->readAll();
 		$column = [];
-		foreach($rows as $row)
+		foreach ($rows as $row)
 			$column[] = current($row);
 		return $column;
 	}

Braces +42 added lines, -40 removed lines

@@ -117,8 +117,7 @@ 
 			try
 			{
 				$this->_statement = $this->getConnection()->getPdoInstance()->prepare($this->getText());
-			}
-			catch(Exception $e)
+			} catch(Exception $e)
 			{
 				throw new TDbException('dbcommand_prepare_failed', $e->getMessage(), $this->getText());
 			}
@@ -149,12 +148,13 @@ 
 	public function bindParameter($name, &$value, $dataType = null, $length = null)
 	{
 		$this->prepare();
-		if($dataType === null)
-			$this->_statement->bindParam($name, $value);
-		elseif($length === null)
-			$this->_statement->bindParam($name, $value, $dataType);
-		else
-			$this->_statement->bindParam($name, $value, $dataType, $length);
+		if($dataType === null) {
+					$this->_statement->bindParam($name, $value);
+		} elseif($length === null) {
+					$this->_statement->bindParam($name, $value, $dataType);
+		} else {
+					$this->_statement->bindParam($name, $value, $dataType, $length);
+		}
 	}
 
 	/**
@@ -170,10 +170,11 @@ 
 	public function bindValue($name, $value, $dataType = null)
 	{
 		$this->prepare();
-		if($dataType === null)
-			$this->_statement->bindValue($name, $value);
-		else
-			$this->_statement->bindValue($name, $value, $dataType);
+		if($dataType === null) {
+					$this->_statement->bindValue($name, $value);
+		} else {
+					$this->_statement->bindValue($name, $value, $dataType);
+		}
 	}
 
 	/**
@@ -193,11 +194,10 @@ 
 			{
 				$this->_statement->execute();
 				return $this->_statement->rowCount();
+			} else {
+							return $this->getConnection()->getPdoInstance()->exec($this->getText());
 			}
-			else
-				return $this->getConnection()->getPdoInstance()->exec($this->getText());
-		}
-		catch(Exception $e)
+		} catch(Exception $e)
 		{
 			throw new TDbException('dbcommand_execute_failed', $e->getMessage(), $this->getDebugStatementText());
 		}
@@ -225,13 +225,13 @@ 
 		try
 		{
 			// Prado::trace('Query: '.$this->getDebugStatementText(), 'Prado\Data');
-			if($this->_statement instanceof PDOStatement)
-				$this->_statement->execute();
-			else
-				$this->_statement = $this->getConnection()->getPdoInstance()->query($this->getText());
+			if($this->_statement instanceof PDOStatement) {
+							$this->_statement->execute();
+			} else {
+							$this->_statement = $this->getConnection()->getPdoInstance()->query($this->getText());
+			}
 			return new TDbDataReader($this);
-		}
-		catch(Exception $e)
+		} catch(Exception $e)
 		{
 			throw new TDbException('dbcommand_query_failed', $e->getMessage(), $this->getDebugStatementText());
 		}
@@ -250,15 +250,15 @@ 
 		try
 		{
 			// Prado::trace('Query Row: '.$this->getDebugStatementText(), 'Prado\Data');
-			if($this->_statement instanceof PDOStatement)
-				$this->_statement->execute();
-			else
-				$this->_statement = $this->getConnection()->getPdoInstance()->query($this->getText());
+			if($this->_statement instanceof PDOStatement) {
+							$this->_statement->execute();
+			} else {
+							$this->_statement = $this->getConnection()->getPdoInstance()->query($this->getText());
+			}
 			$result = $this->_statement->fetch($fetchAssociative ? PDO::FETCH_ASSOC : PDO::FETCH_NUM);
 			$this->_statement->closeCursor();
 			return $result;
-		}
-		catch(Exception $e)
+		} catch(Exception $e)
 		{
 			throw new TDbException('dbcommand_query_failed', $e->getMessage(), $this->getDebugStatementText());
 		}
@@ -276,18 +276,19 @@ 
 		try
 		{
 			// Prado::trace('Query Scalar: '.$this->getDebugStatementText(), 'Prado\Data');
-			if($this->_statement instanceof PDOStatement)
-				$this->_statement->execute();
-			else
-				$this->_statement = $this->getConnection()->getPdoInstance()->query($this->getText());
+			if($this->_statement instanceof PDOStatement) {
+							$this->_statement->execute();
+			} else {
+							$this->_statement = $this->getConnection()->getPdoInstance()->query($this->getText());
+			}
 			$result = $this->_statement->fetchColumn();
 			$this->_statement->closeCursor();
-			if(is_resource($result) && get_resource_type($result) === 'stream')
-				return stream_get_contents($result);
-			else
-				return $result;
-		}
-		catch(Exception $e)
+			if(is_resource($result) && get_resource_type($result) === 'stream') {
+							return stream_get_contents($result);
+			} else {
+							return $result;
+			}
+		} catch(Exception $e)
 		{
 			throw new TDbException('dbcommand_query_failed', $e->getMessage(), $this->getDebugStatementText());
 		}
@@ -305,8 +306,9 @@ 
 	{
 		$rows = $this->query()->readAll();
 		$column = [];
-		foreach($rows as $row)
-			$column[] = current($row);
+		foreach($rows as $row) {
+					$column[] = current($row);
+		}
 		return $column;
 	}
 }

framework/Data/DataGateway/TSqlCriteria.php

Spacing +31 added lines, -31 removed lines

@@ -53,11 +53,11 @@ 
 	 */
 	public function __construct($condition = null, $parameters = [])
 	{
-		if(!is_array($parameters) && func_num_args() > 1)
+		if (!is_array($parameters) && func_num_args() > 1)
 			$parameters = array_slice(func_get_args(), 1);
 		$this->_parameters = new TAttributeCollection;
 		$this->_parameters->setCaseSensitive(true);
-		$this->_parameters->copyFrom((array)$parameters);
+		$this->_parameters->copyFrom((array) $parameters);
 		$this->_ordersBy = new TAttributeCollection;
 		$this->_ordersBy->setCaseSensitive(true);
 
@@ -132,7 +132,7 @@ 
 	 */
 	public function setCondition($value)
 	{
-		if(empty($value)) {
+		if (empty($value)) {
 			// reset the condition
 			$this->_condition = null;
 			return;
@@ -144,32 +144,32 @@ 
 		//    [LIMIT {[offset,] row_count | row_count OFFSET offset}]
 		// See: http://dev.mysql.com/doc/refman/5.0/en/select.html
 
-		if(preg_match('/ORDER\s+BY\s+(.*?)(?=LIMIT)|ORDER\s+BY\s+(.*?)$/i', $value, $matches) > 0) {
+		if (preg_match('/ORDER\s+BY\s+(.*?)(?=LIMIT)|ORDER\s+BY\s+(.*?)$/i', $value, $matches) > 0) {
 			// condition contains ORDER BY
 			$value = str_replace($matches[0], '', $value);
-			if(strlen($matches[1]) > 0) {
+			if (strlen($matches[1]) > 0) {
 				$this->setOrdersBy($matches[1]);
-			} elseif(strlen($matches[2]) > 0) {
+			} elseif (strlen($matches[2]) > 0) {
 				$this->setOrdersBy($matches[2]);
 			}
 		}
 
-		if(preg_match('/LIMIT\s+([\d\s,]+)/i', $value, $matches) > 0) {
+		if (preg_match('/LIMIT\s+([\d\s,]+)/i', $value, $matches) > 0) {
 			// condition contains limit
 			$value = str_replace($matches[0], '', $value); // remove limit from query
-			if(strpos($matches[1], ',')) { // both offset and limit given
+			if (strpos($matches[1], ',')) { // both offset and limit given
 				list($offset, $limit) = explode(',', $matches[1]);
-				$this->_limit = (int)$limit;
-				$this->_offset = (int)$offset;
+				$this->_limit = (int) $limit;
+				$this->_offset = (int) $offset;
 			} else { // only limit given
-				$this->_limit = (int)$matches[1];
+				$this->_limit = (int) $matches[1];
 			}
 		}
 
-		if(preg_match('/OFFSET\s+(\d+)/i', $value, $matches) > 0) {
+		if (preg_match('/OFFSET\s+(\d+)/i', $value, $matches) > 0) {
 			// condition contains offset
 			$value = str_replace($matches[0], '', $value); // remove offset from query
-			$this->_offset = (int)$matches[1]; // set offset in criteria
+			$this->_offset = (int) $matches[1]; // set offset in criteria
 		}
 
 		$this->_condition = trim($value);
@@ -188,7 +188,7 @@ 
 	 */
 	public function setParameters($value)
 	{
-		if(!(is_array($value) || $value instanceof \ArrayAccess))
+		if (!(is_array($value) || $value instanceof \ArrayAccess))
 			throw new TException('value must be array or \ArrayAccess');
 		$this->_parameters->copyFrom($value);
 	}
@@ -198,7 +198,7 @@ 
 	 */
 	public function getIsNamedParameters()
 	{
-		foreach($this->getParameters() as $k => $v)
+		foreach ($this->getParameters() as $k => $v)
 			return is_string($k);
 	}
 
@@ -215,16 +215,16 @@ 
 	 */
 	public function setOrdersBy($value)
 	{
-		if(is_array($value) || $value instanceof Traversable)
+		if (is_array($value) || $value instanceof Traversable)
 			$this->_ordersBy->copyFrom($value);
 		else
 		{
-			$value = trim(preg_replace('/\s+/', ' ', (string)$value));
+			$value = trim(preg_replace('/\s+/', ' ', (string) $value));
 			$orderBys = [];
-			foreach(explode(',', $value) as $orderBy)
+			foreach (explode(',', $value) as $orderBy)
 			{
 				$vs = explode(' ', trim($orderBy));
-				$orderBys[$vs[0]] = isset($vs[1])?$vs[1]:'asc';
+				$orderBys[$vs[0]] = isset($vs[1]) ? $vs[1] : 'asc';
 			}
 			$this->_ordersBy->copyFrom($orderBys);
 		}
@@ -268,22 +268,22 @@ 
 	public function __toString()
 	{
 		$str = '';
-		if(strlen((string)$this->getCondition()) > 0)
-			$str .= '"' . (string)$this->getCondition() . '"';
+		if (strlen((string) $this->getCondition()) > 0)
+			$str .= '"'.(string) $this->getCondition().'"';
 		$params = [];
-		foreach($this->getParameters() as $k => $v)
+		foreach ($this->getParameters() as $k => $v)
 			$params[] = "{$k} => ${v}";
-		if(count($params) > 0)
-			$str .= ', "' . implode(', ', $params) . '"';
+		if (count($params) > 0)
+			$str .= ', "'.implode(', ', $params).'"';
 		$orders = [];
-		foreach($this->getOrdersBy() as $k => $v)
+		foreach ($this->getOrdersBy() as $k => $v)
 			$orders[] = "{$k} => ${v}";
-		if(count($orders) > 0)
-			$str .= ', "' . implode(', ', $orders) . '"';
-		if($this->_limit !== null)
-			$str .= ', ' . $this->_limit;
-		if($this->_offset !== null)
-			$str .= ', ' . $this->_offset;
+		if (count($orders) > 0)
+			$str .= ', "'.implode(', ', $orders).'"';
+		if ($this->_limit !== null)
+			$str .= ', '.$this->_limit;
+		if ($this->_offset !== null)
+			$str .= ', '.$this->_offset;
 		return $str;
 	}
 }

Braces +33 added lines, -23 removed lines

@@ -53,8 +53,9 @@ 
 	 */
 	public function __construct($condition = null, $parameters = [])
 	{
-		if(!is_array($parameters) && func_num_args() > 1)
-			$parameters = array_slice(func_get_args(), 1);
+		if(!is_array($parameters) && func_num_args() > 1) {
+					$parameters = array_slice(func_get_args(), 1);
+		}
 		$this->_parameters = new TAttributeCollection;
 		$this->_parameters->setCaseSensitive(true);
 		$this->_parameters->copyFrom((array)$parameters);
@@ -188,8 +189,9 @@ 
 	 */
 	public function setParameters($value)
 	{
-		if(!(is_array($value) || $value instanceof \ArrayAccess))
-			throw new TException('value must be array or \ArrayAccess');
+		if(!(is_array($value) || $value instanceof \ArrayAccess)) {
+					throw new TException('value must be array or \ArrayAccess');
+		}
 		$this->_parameters->copyFrom($value);
 	}
 
@@ -198,8 +200,9 @@ 
 	 */
 	public function getIsNamedParameters()
 	{
-		foreach($this->getParameters() as $k => $v)
-			return is_string($k);
+		foreach($this->getParameters() as $k => $v) {
+					return is_string($k);
+		}
 	}
 
 	/**
@@ -215,9 +218,9 @@ 
 	 */
 	public function setOrdersBy($value)
 	{
-		if(is_array($value) || $value instanceof Traversable)
-			$this->_ordersBy->copyFrom($value);
-		else
+		if(is_array($value) || $value instanceof Traversable) {
+					$this->_ordersBy->copyFrom($value);
+		} else
 		{
 			$value = trim(preg_replace('/\s+/', ' ', (string)$value));
 			$orderBys = [];
@@ -268,22 +271,29 @@ 
 	public function __toString()
 	{
 		$str = '';
-		if(strlen((string)$this->getCondition()) > 0)
-			$str .= '"' . (string)$this->getCondition() . '"';
+		if(strlen((string)$this->getCondition()) > 0) {
+					$str .= '"' . (string)$this->getCondition() . '"';
+		}
 		$params = [];
-		foreach($this->getParameters() as $k => $v)
-			$params[] = "{$k} => ${v}";
-		if(count($params) > 0)
-			$str .= ', "' . implode(', ', $params) . '"';
+		foreach($this->getParameters() as $k => $v) {
+					$params[] = "{$k} => ${v}";
+		}
+		if(count($params) > 0) {
+					$str .= ', "' . implode(', ', $params) . '"';
+		}
 		$orders = [];
-		foreach($this->getOrdersBy() as $k => $v)
-			$orders[] = "{$k} => ${v}";
-		if(count($orders) > 0)
-			$str .= ', "' . implode(', ', $orders) . '"';
-		if($this->_limit !== null)
-			$str .= ', ' . $this->_limit;
-		if($this->_offset !== null)
-			$str .= ', ' . $this->_offset;
+		foreach($this->getOrdersBy() as $k => $v) {
+					$orders[] = "{$k} => ${v}";
+		}
+		if(count($orders) > 0) {
+					$str .= ', "' . implode(', ', $orders) . '"';
+		}
+		if($this->_limit !== null) {
+					$str .= ', ' . $this->_limit;
+		}
+		if($this->_offset !== null) {
+					$str .= ', ' . $this->_offset;
+		}
 		return $str;
 	}
 }