xpressengine / xe-core

modules/spamfilter/spamfilter.admin.controller.php

Doc Comments +3 added lines

@@ -98,6 +98,7 @@ 
 	/**
 	 * @brief Delete IP
 	 * Remove the IP address which was previously registered as a spammers
+	 * @param string $ipaddress
 	 */
 	function deleteIP($ipaddress)
 	{
@@ -111,6 +112,7 @@ 
 	/**
 	 * @brief Register the spam word
 	 * The post, which contains the newly registered spam word, should be considered as a spam
+	 * @param string $word_list
 	 */
 	function insertWord($word_list)
 	{
@@ -141,6 +143,7 @@ 
 	/**
 	 * @brief Remove the spam word
 	 * Remove the word which was previously registered as a spam word
+	 * @param string $word
 	 */
 	function deleteWord($word)
 	{

Braces +36 added lines, -12 removed lines

@@ -20,12 +20,18 @@ 
 		$argsConfig = Context::gets('limits','check_trackback');
 		$flag = Context::get('flag');
 		//interval, limit_count
-		if($argsConfig->check_trackback!='Y') $argsConfig->check_trackback = 'N';
-		if($argsConfig->limits!='Y') $argsConfig->limits = 'N';
+		if($argsConfig->check_trackback!='Y') {
+			$argsConfig->check_trackback = 'N';
+		}
+		if($argsConfig->limits!='Y') {
+			$argsConfig->limits = 'N';
+		}
 		// Create and insert the module Controller object
 		$oModuleController = getController('module');
 		$moduleConfigOutput = $oModuleController->insertModuleConfig('spamfilter',$argsConfig);
-		if(!$moduleConfigOutput->toBool()) return $moduleConfigOutput;
+		if(!$moduleConfigOutput->toBool()) {
+			return $moduleConfigOutput;
+		}
 
 		$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispSpamfilterAdminConfigBlock');
 		$this->setRedirectUrl($returnUrl);
@@ -39,9 +45,13 @@ 
 		if($ipaddress_list)
 		{
 			$output = $oSpamfilterController->insertIP($ipaddress_list);
-			if(!$output->toBool() && !$output->get('fail_list')) return $output;
+			if(!$output->toBool() && !$output->get('fail_list')) {
+				return $output;
+			}
 
-			if($output->get('fail_list')) $message_fail = '<em>'.sprintf(Context::getLang('msg_faillist'),$output->get('fail_list')).'</em>';
+			if($output->get('fail_list')) {
+				$message_fail = '<em>'.sprintf(Context::getLang('msg_faillist'),$output->get('fail_list')).'</em>';
+			}
 			$this->setMessage(Context::getLang('success_registed').$message_fail);
 		}
 
@@ -57,9 +67,13 @@ 
 		if($word_list)
 		{
 			$output = $this->insertWord($word_list);
-			if(!$output->toBool() && !$output->get('fail_list')) return $output;
+			if(!$output->toBool() && !$output->get('fail_list')) {
+				return $output;
+			}
 
-			if($output->get('fail_list')) $message_fail = '<em>'.sprintf(Context::getLang('msg_faillist'),$output->get('fail_list')).'</em>';
+			if($output->get('fail_list')) {
+				$message_fail = '<em>'.sprintf(Context::getLang('msg_faillist'),$output->get('fail_list')).'</em>';
+			}
 			$this->setMessage(Context::getLang('success_registed').$message_fail);
 		}
 
@@ -73,7 +87,9 @@ 
 	function procSpamfilterAdminDeleteDeniedIP()
 	{
 		$ipAddressList = Context::get('ipaddress');
-		if($ipAddressList) $this->deleteIP($ipAddressList);
+		if($ipAddressList) {
+			$this->deleteIP($ipAddressList);
+		}
 
 		$this->setMessage(Context::getLang('success_deleted'));
 
@@ -101,7 +117,9 @@ 
 	 */
 	function deleteIP($ipaddress)
 	{
-		if(!$ipaddress) return;
+		if(!$ipaddress) {
+			return;
+		}
 
 		$args = new stdClass;
 		$args->ipaddress = $ipaddress;
@@ -130,9 +148,13 @@ 
 		foreach($word_list as $word)
 		{
 			$args = new stdClass;
-			if(trim($word)) $args->word = $word;
+			if(trim($word)) {
+				$args->word = $word;
+			}
 			$output = executeQuery('spamfilter.insertDeniedWord', $args);
-			if(!$output->toBool()) $fail_word .= $word.'<br />';
+			if(!$output->toBool()) {
+				$fail_word .= $word.'<br />';
+			}
 		}
 		$output->add('fail_list',$fail_word);
 		return $output;
@@ -144,7 +166,9 @@ 
 	 */
 	function deleteWord($word)
 	{
-		if(!$word) return;
+		if(!$word) {
+			return;
+		}
 		$args = new stdClass;
 		$args->word = $word;
 		return executeQuery('spamfilter.deleteDeniedWord', $args);

Spacing +23 added lines, -23 removed lines

@@ -17,15 +17,15 @@ 
 	function procSpamfilterAdminInsertConfig()
 	{
 		// Get the default information
-		$argsConfig = Context::gets('limits','check_trackback');
+		$argsConfig = Context::gets('limits', 'check_trackback');
 		$flag = Context::get('flag');
 		//interval, limit_count
-		if($argsConfig->check_trackback!='Y') $argsConfig->check_trackback = 'N';
-		if($argsConfig->limits!='Y') $argsConfig->limits = 'N';
+		if ($argsConfig->check_trackback != 'Y') $argsConfig->check_trackback = 'N';
+		if ($argsConfig->limits != 'Y') $argsConfig->limits = 'N';
 		// Create and insert the module Controller object
 		$oModuleController = getController('module');
-		$moduleConfigOutput = $oModuleController->insertModuleConfig('spamfilter',$argsConfig);
-		if(!$moduleConfigOutput->toBool()) return $moduleConfigOutput;
+		$moduleConfigOutput = $oModuleController->insertModuleConfig('spamfilter', $argsConfig);
+		if (!$moduleConfigOutput->toBool()) return $moduleConfigOutput;
 
 		$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispSpamfilterAdminConfigBlock');
 		$this->setRedirectUrl($returnUrl);
@@ -36,12 +36,12 @@ 
 		//스팸IP  추가
 		$ipaddress_list = Context::get('ipaddress_list');
 		$oSpamfilterController = getController('spamfilter');
-		if($ipaddress_list)
+		if ($ipaddress_list)
 		{
 			$output = $oSpamfilterController->insertIP($ipaddress_list);
-			if(!$output->toBool() && !$output->get('fail_list')) return $output;
+			if (!$output->toBool() && !$output->get('fail_list')) return $output;
 
-			if($output->get('fail_list')) $message_fail = '<em>'.sprintf(Context::getLang('msg_faillist'),$output->get('fail_list')).'</em>';
+			if ($output->get('fail_list')) $message_fail = '<em>'.sprintf(Context::getLang('msg_faillist'), $output->get('fail_list')).'</em>';
 			$this->setMessage(Context::getLang('success_registed').$message_fail);
 		}
 
@@ -54,12 +54,12 @@ 
 	{
 		//스팸 키워드 추가
 		$word_list = Context::get('word_list');
-		if($word_list)
+		if ($word_list)
 		{
 			$output = $this->insertWord($word_list);
-			if(!$output->toBool() && !$output->get('fail_list')) return $output;
+			if (!$output->toBool() && !$output->get('fail_list')) return $output;
 
-			if($output->get('fail_list')) $message_fail = '<em>'.sprintf(Context::getLang('msg_faillist'),$output->get('fail_list')).'</em>';
+			if ($output->get('fail_list')) $message_fail = '<em>'.sprintf(Context::getLang('msg_faillist'), $output->get('fail_list')).'</em>';
 			$this->setMessage(Context::getLang('success_registed').$message_fail);
 		}
 
@@ -73,7 +73,7 @@ 
 	function procSpamfilterAdminDeleteDeniedIP()
 	{
 		$ipAddressList = Context::get('ipaddress');
-		if($ipAddressList) $this->deleteIP($ipAddressList);
+		if ($ipAddressList) $this->deleteIP($ipAddressList);
 
 		$this->setMessage(Context::getLang('success_deleted'));
 
@@ -91,7 +91,7 @@ 
 
 		$this->setMessage(Context::getLang('success_deleted'));
 
-		$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispSpamfilterAdminDeniedWordList','active','word');
+		$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispSpamfilterAdminDeniedWordList', 'active', 'word');
 		return $this->setRedirectUrl($returnUrl);
 	}
 
@@ -101,7 +101,7 @@ 
 	 */
 	function deleteIP($ipaddress)
 	{
-		if(!$ipaddress) return;
+		if (!$ipaddress) return;
 
 		$args = new stdClass;
 		$args->ipaddress = $ipaddress;
@@ -115,26 +115,26 @@ 
 	function insertWord($word_list)
 	{
 
-		$word_list = str_replace("\r","",$word_list);
-		$word_list = explode("\n",$word_list);
+		$word_list = str_replace("\r", "", $word_list);
+		$word_list = explode("\n", $word_list);
 
-		foreach($word_list as $word)
+		foreach ($word_list as $word)
 		{
-			if(!preg_match("/^(.{2,40}[\r\n]+)*.{2,40}$/", $word))
+			if (!preg_match("/^(.{2,40}[\r\n]+)*.{2,40}$/", $word))
 			{
 				return new BaseObject(-1, 'msg_invalid');
 			}
 		}
 
 		$fail_word = '';
-		foreach($word_list as $word)
+		foreach ($word_list as $word)
 		{
 			$args = new stdClass;
-			if(trim($word)) $args->word = $word;
+			if (trim($word)) $args->word = $word;
 			$output = executeQuery('spamfilter.insertDeniedWord', $args);
-			if(!$output->toBool()) $fail_word .= $word.'<br />';
+			if (!$output->toBool()) $fail_word .= $word.'<br />';
 		}
-		$output->add('fail_list',$fail_word);
+		$output->add('fail_list', $fail_word);
 		return $output;
 	}
 
@@ -144,7 +144,7 @@ 
 	 */
 	function deleteWord($word)
 	{
-		if(!$word) return;
+		if (!$word) return;
 		$args = new stdClass;
 		$args->word = $word;
 		return executeQuery('spamfilter.deleteDeniedWord', $args);

modules/spamfilter/spamfilter.controller.php

Doc Comments +2 added lines

@@ -161,6 +161,8 @@
 	/**
 	 * @brief IP registration
 	 * The registered IP address is considered as a spammer
+	 * @param string $ipaddress_list
+	 * @param string $description
 	 */
 	function insertIP($ipaddress_list, $description = null)
 	{

Spacing +45 added lines, -45 removed lines

@@ -27,39 +27,39 @@ 
 	 */
 	function triggerInsertDocument(&$obj)
 	{
-		if($_SESSION['avoid_log']) return new BaseObject();
+		if ($_SESSION['avoid_log']) return new BaseObject();
 		// Check the login status, login information, and permission
 		$is_logged = Context::get('is_logged');
 		$logged_info = Context::get('logged_info');
 		$grant = Context::get('grant');
 		// In case logged in, check if it is an administrator
-		if($is_logged)
+		if ($is_logged)
 		{
-			if($logged_info->is_admin == 'Y') return new BaseObject();
-			if($grant->manager) return new BaseObject();
+			if ($logged_info->is_admin == 'Y') return new BaseObject();
+			if ($grant->manager) return new BaseObject();
 		}
 
 		$oFilterModel = getModel('spamfilter');
 		// Check if the IP is prohibited
 		$output = $oFilterModel->isDeniedIP();
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 		// Check if there is a ban on the word
 		$text = '';
-		if($is_logged)
+		if ($is_logged)
 		{
-			$text = $obj->title . ' ' . $obj->content . ' ' . $obj->tags;
+			$text = $obj->title.' '.$obj->content.' '.$obj->tags;
 		}
 		else
 		{
-			$text = $obj->title . ' ' . $obj->content . ' ' . $obj->nick_name . ' ' . $obj->homepage . ' ' . $obj->tags;	
+			$text = $obj->title.' '.$obj->content.' '.$obj->nick_name.' '.$obj->homepage.' '.$obj->tags;	
 		}
 		$output = $oFilterModel->isDeniedWord($text);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 		// Check the specified time beside the modificaiton time
-		if($obj->document_srl == 0)
+		if ($obj->document_srl == 0)
 		{
 			$output = $oFilterModel->checkLimited();
-			if(!$output->toBool()) return $output;
+			if (!$output->toBool()) return $output;
 		}
 		// Save a log
 		$this->insertLog();
@@ -72,39 +72,39 @@ 
 	 */
 	function triggerInsertComment(&$obj)
 	{
-		if($_SESSION['avoid_log']) return new BaseObject();
+		if ($_SESSION['avoid_log']) return new BaseObject();
 		// Check the login status, login information, and permission
 		$is_logged = Context::get('is_logged');
 		$logged_info = Context::get('logged_info');
 		$grant = Context::get('grant');
 		// In case logged in, check if it is an administrator
-		if($is_logged)
+		if ($is_logged)
 		{
-			if($logged_info->is_admin == 'Y') return new BaseObject();
-			if($grant->manager) return new BaseObject();
+			if ($logged_info->is_admin == 'Y') return new BaseObject();
+			if ($grant->manager) return new BaseObject();
 		}
 
 		$oFilterModel = getModel('spamfilter');
 		// Check if the IP is prohibited
 		$output = $oFilterModel->isDeniedIP();
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 		// Check if there is a ban on the word
 		$text = '';
-		if($is_logged)
+		if ($is_logged)
 		{
 			$text = $obj->content;
 		}
 		else
 		{
-			$text = $obj->content . ' ' . $obj->nick_name . ' ' . $obj->homepage;	
+			$text = $obj->content.' '.$obj->nick_name.' '.$obj->homepage;	
 		}
 		$output = $oFilterModel->isDeniedWord($text);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 		// If the specified time check is not modified
-		if(!$obj->__isupdate)
+		if (!$obj->__isupdate)
 		{
 			$output = $oFilterModel->checkLimited();
-			if(!$output->toBool()) return $output;
+			if (!$output->toBool()) return $output;
 		}
 		unset($obj->__isupdate);
 		// Save a log
@@ -118,32 +118,32 @@ 
 	 */
 	function triggerInsertTrackback(&$obj)
 	{
-		if($_SESSION['avoid_log']) return new BaseObject();
+		if ($_SESSION['avoid_log']) return new BaseObject();
 
 		$oFilterModel = getModel('spamfilter');
 		// Confirm if the trackbacks have been added more than once to your document
 		$output = $oFilterModel->isInsertedTrackback($obj->document_srl);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		// Check if the IP is prohibited
 		$output = $oFilterModel->isDeniedIP();
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 		// Check if there is a ban on the word
-		$text = $obj->blog_name . ' ' . $obj->title . ' ' . $obj->excerpt . ' ' . $obj->url;
+		$text = $obj->blog_name.' '.$obj->title.' '.$obj->excerpt.' '.$obj->url;
 		$output = $oFilterModel->isDeniedWord($text);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 		// Start Filtering
 		$oTrackbackModel = getModel('trackback');
 		$oTrackbackController = getController('trackback');
 
-		list($ipA,$ipB,$ipC,$ipD) = explode('.',$_SERVER['REMOTE_ADDR']);
+		list($ipA, $ipB, $ipC, $ipD) = explode('.', $_SERVER['REMOTE_ADDR']);
 		$ipaddress = $ipA.'.'.$ipB.'.'.$ipC;
 		// In case the title and the blog name are indentical, investigate the IP address of the last 6 hours, delete and ban it.
-		if($obj->title == $obj->excerpt)
+		if ($obj->title == $obj->excerpt)
 		{
-			$oTrackbackController->deleteTrackbackSender(60*60*6, $ipaddress, $obj->url, $obj->blog_name, $obj->title, $obj->excerpt);
+			$oTrackbackController->deleteTrackbackSender(60 * 60 * 6, $ipaddress, $obj->url, $obj->blog_name, $obj->title, $obj->excerpt);
 			$this->insertIP($ipaddress.'.*', 'AUTO-DENIED : trackback.insertTrackback');
-			return new BaseObject(-1,'msg_alert_trackback_denied');
+			return new BaseObject(-1, 'msg_alert_trackback_denied');
 		}
 		// If trackbacks have been registered by one C-class IP address more than once for the last 30 minutes, ban the IP address and delete all the posts
 		/* 호스팅 환경을 감안하여 일단 이 부분은 동작하지 않도록 주석 처리
@@ -165,24 +165,24 @@ 
 	function insertIP($ipaddress_list, $description = null)
 	{
 		$regExr = "/^((\d{1,3}(?:.(\d{1,3}|\*)){3})\s*(\/\/(.*)\s*)?)*\s*$/";
-		if(!preg_match($regExr,$ipaddress_list)) return new BaseObject(-1, 'msg_invalid');
-		$ipaddress_list = str_replace("\r","",$ipaddress_list);
-		$ipaddress_list = explode("\n",$ipaddress_list);
-		foreach($ipaddress_list as $ipaddressValue)
+		if (!preg_match($regExr, $ipaddress_list)) return new BaseObject(-1, 'msg_invalid');
+		$ipaddress_list = str_replace("\r", "", $ipaddress_list);
+		$ipaddress_list = explode("\n", $ipaddress_list);
+		foreach ($ipaddress_list as $ipaddressValue)
 		{
 			$args = new stdClass();
-			preg_match("/(\d{1,3}(?:.(\d{1,3}|\*)){3})\s*(\/\/(.*)\s*)?/",$ipaddressValue,$matches);
-			if($ipaddress=trim($matches[1]))
+			preg_match("/(\d{1,3}(?:.(\d{1,3}|\*)){3})\s*(\/\/(.*)\s*)?/", $ipaddressValue, $matches);
+			if ($ipaddress = trim($matches[1]))
 			{
 				$args->ipaddress = $ipaddress;
-				if(!$description && $matches[4]) $args->description = $matches[4];
+				if (!$description && $matches[4]) $args->description = $matches[4];
 				else $args->description = $description;
 			}
 			$output = executeQuery('spamfilter.insertDeniedIP', $args);
-			if(!$output->toBool()) $fail_list .= $ipaddress.'<br/>';
+			if (!$output->toBool()) $fail_list .= $ipaddress.'<br/>';
 		}
 
-		$output->add('fail_list',$fail_list);
+		$output->add('fail_list', $fail_list);
 		return $output;
 	}
 
@@ -191,22 +191,22 @@ 
 	 */
 	function triggerSendMessage(&$obj)
 	{
-		if($_SESSION['avoid_log']) return new BaseObject();
+		if ($_SESSION['avoid_log']) return new BaseObject();
 
 		$logged_info = Context::get('logged_info');
-		if($logged_info->is_admin == 'Y') return new BaseObject();
+		if ($logged_info->is_admin == 'Y') return new BaseObject();
 
 		$oFilterModel = getModel('spamfilter');
 		// Check if the IP is prohibited
 		$output = $oFilterModel->isDeniedIP();
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 		// Check if there is a ban on the word
-		$text = $obj->title . ' ' . $obj->content;
+		$text = $obj->title.' '.$obj->content;
 		$output = $oFilterModel->isDeniedWord($text);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 		// Check the specified time
 		$output = $oFilterModel->checkLimited(TRUE);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 		// Save a log
 		$this->insertLog();
 

Braces +76 added lines, -29 removed lines

@@ -27,7 +27,9 @@ 
 	 */
 	function triggerInsertDocument(&$obj)
 	{
-		if($_SESSION['avoid_log']) return new BaseObject();
+		if($_SESSION['avoid_log']) {
+			return new BaseObject();
+		}
 		// Check the login status, login information, and permission
 		$is_logged = Context::get('is_logged');
 		$logged_info = Context::get('logged_info');
@@ -35,31 +37,40 @@ 
 		// In case logged in, check if it is an administrator
 		if($is_logged)
 		{
-			if($logged_info->is_admin == 'Y') return new BaseObject();
-			if($grant->manager) return new BaseObject();
+			if($logged_info->is_admin == 'Y') {
+				return new BaseObject();
+			}
+			if($grant->manager) {
+				return new BaseObject();
+			}
 		}
 
 		$oFilterModel = getModel('spamfilter');
 		// Check if the IP is prohibited
 		$output = $oFilterModel->isDeniedIP();
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 		// Check if there is a ban on the word
 		$text = '';
 		if($is_logged)
 		{
 			$text = $obj->title . ' ' . $obj->content . ' ' . $obj->tags;
-		}
-		else
+		} else
 		{
 			$text = $obj->title . ' ' . $obj->content . ' ' . $obj->nick_name . ' ' . $obj->homepage . ' ' . $obj->tags;	
 		}
 		$output = $oFilterModel->isDeniedWord($text);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 		// Check the specified time beside the modificaiton time
 		if($obj->document_srl == 0)
 		{
 			$output = $oFilterModel->checkLimited();
-			if(!$output->toBool()) return $output;
+			if(!$output->toBool()) {
+				return $output;
+			}
 		}
 		// Save a log
 		$this->insertLog();
@@ -72,7 +83,9 @@ 
 	 */
 	function triggerInsertComment(&$obj)
 	{
-		if($_SESSION['avoid_log']) return new BaseObject();
+		if($_SESSION['avoid_log']) {
+			return new BaseObject();
+		}
 		// Check the login status, login information, and permission
 		$is_logged = Context::get('is_logged');
 		$logged_info = Context::get('logged_info');
@@ -80,31 +93,40 @@ 
 		// In case logged in, check if it is an administrator
 		if($is_logged)
 		{
-			if($logged_info->is_admin == 'Y') return new BaseObject();
-			if($grant->manager) return new BaseObject();
+			if($logged_info->is_admin == 'Y') {
+				return new BaseObject();
+			}
+			if($grant->manager) {
+				return new BaseObject();
+			}
 		}
 
 		$oFilterModel = getModel('spamfilter');
 		// Check if the IP is prohibited
 		$output = $oFilterModel->isDeniedIP();
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 		// Check if there is a ban on the word
 		$text = '';
 		if($is_logged)
 		{
 			$text = $obj->content;
-		}
-		else
+		} else
 		{
 			$text = $obj->content . ' ' . $obj->nick_name . ' ' . $obj->homepage;	
 		}
 		$output = $oFilterModel->isDeniedWord($text);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 		// If the specified time check is not modified
 		if(!$obj->__isupdate)
 		{
 			$output = $oFilterModel->checkLimited();
-			if(!$output->toBool()) return $output;
+			if(!$output->toBool()) {
+				return $output;
+			}
 		}
 		unset($obj->__isupdate);
 		// Save a log
@@ -118,20 +140,28 @@ 
 	 */
 	function triggerInsertTrackback(&$obj)
 	{
-		if($_SESSION['avoid_log']) return new BaseObject();
+		if($_SESSION['avoid_log']) {
+			return new BaseObject();
+		}
 
 		$oFilterModel = getModel('spamfilter');
 		// Confirm if the trackbacks have been added more than once to your document
 		$output = $oFilterModel->isInsertedTrackback($obj->document_srl);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		// Check if the IP is prohibited
 		$output = $oFilterModel->isDeniedIP();
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 		// Check if there is a ban on the word
 		$text = $obj->blog_name . ' ' . $obj->title . ' ' . $obj->excerpt . ' ' . $obj->url;
 		$output = $oFilterModel->isDeniedWord($text);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 		// Start Filtering
 		$oTrackbackModel = getModel('trackback');
 		$oTrackbackController = getController('trackback');
@@ -165,7 +195,9 @@ 
 	function insertIP($ipaddress_list, $description = null)
 	{
 		$regExr = "/^((\d{1,3}(?:.(\d{1,3}|\*)){3})\s*(\/\/(.*)\s*)?)*\s*$/";
-		if(!preg_match($regExr,$ipaddress_list)) return new BaseObject(-1, 'msg_invalid');
+		if(!preg_match($regExr,$ipaddress_list)) {
+			return new BaseObject(-1, 'msg_invalid');
+		}
 		$ipaddress_list = str_replace("\r","",$ipaddress_list);
 		$ipaddress_list = explode("\n",$ipaddress_list);
 		foreach($ipaddress_list as $ipaddressValue)
@@ -175,11 +207,16 @@ 
 			if($ipaddress=trim($matches[1]))
 			{
 				$args->ipaddress = $ipaddress;
-				if(!$description && $matches[4]) $args->description = $matches[4];
-				else $args->description = $description;
+				if(!$description && $matches[4]) {
+					$args->description = $matches[4];
+				} else {
+					$args->description = $description;
+				}
 			}
 			$output = executeQuery('spamfilter.insertDeniedIP', $args);
-			if(!$output->toBool()) $fail_list .= $ipaddress.'<br/>';
+			if(!$output->toBool()) {
+				$fail_list .= $ipaddress.'<br/>';
+			}
 		}
 
 		$output->add('fail_list',$fail_list);
@@ -191,22 +228,32 @@ 
 	 */
 	function triggerSendMessage(&$obj)
 	{
-		if($_SESSION['avoid_log']) return new BaseObject();
+		if($_SESSION['avoid_log']) {
+			return new BaseObject();
+		}
 
 		$logged_info = Context::get('logged_info');
-		if($logged_info->is_admin == 'Y') return new BaseObject();
+		if($logged_info->is_admin == 'Y') {
+			return new BaseObject();
+		}
 
 		$oFilterModel = getModel('spamfilter');
 		// Check if the IP is prohibited
 		$output = $oFilterModel->isDeniedIP();
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 		// Check if there is a ban on the word
 		$text = $obj->title . ' ' . $obj->content;
 		$output = $oFilterModel->isDeniedWord($text);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 		// Check the specified time
 		$output = $oFilterModel->checkLimited(TRUE);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 		// Save a log
 		$this->insertLog();
 

modules/tag/tag.model.php

Doc Comments +2 added lines

@@ -49,6 +49,7 @@ 
 
 	/**
 	 * @brief document_srl the import tag
+	 * @param stdClass $obj
 	 */
 	function getDocumentSrlByTag($obj)
 	{
@@ -70,6 +71,7 @@ 
 
 	/**
 	 * @brief document used in the import tag
+	 * @param stdClass $obj
 	 */
 	function getDocumentsTagList($obj)
 	{

Spacing +9 added lines, -9 removed lines

@@ -20,7 +20,7 @@ 
 	 */
 	function getTagList($obj)
 	{
-		if($obj->mid)
+		if ($obj->mid)
 		{
 			$oModuleModel = getModel('module');
 			$obj->module_srl = $oModuleModel->getModuleSrlByMid($obj->mid);
@@ -29,7 +29,7 @@ 
 
 		// Module_srl passed the array may be a check whether the array
 		$args = new stdClass;
-		if(is_array($obj->module_srl))
+		if (is_array($obj->module_srl))
 		{
 			$args->module_srl = implode(',', $obj->module_srl);
 		}
@@ -42,7 +42,7 @@ 
 		$args->count = $obj->sort_index;
 
 		$output = executeQueryArray('tag.getTagList', $args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		return $output;
 	}
@@ -53,7 +53,7 @@ 
 	function getDocumentSrlByTag($obj)
 	{
 		$args = new stdClass;
-		if(is_array($obj->module_srl))
+		if (is_array($obj->module_srl))
 		{
 			$args->module_srl = implode(',', $obj->module_srl);
 		}
@@ -74,7 +74,7 @@ 
 	function getDocumentsTagList($obj)
 	{
 		$args = new stdClass;
-		if(is_array($obj->document_srl))
+		if (is_array($obj->document_srl))
 		{
 			$args->document_srl = implode(',', $obj->document_srl);
 		}
@@ -84,7 +84,7 @@ 
 		}
 
 		$output = executeQueryArray('tag.getDocumentsTagList', $args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		return $output;
 	}
@@ -95,7 +95,7 @@ 
 	function getTagWithUsedList($obj)
 	{
 		$args = new stdClass;
-		if(is_array($obj->module_srl))
+		if (is_array($obj->module_srl))
 		{
 			$args->module_srl = implode(',', $obj->module_srl);
 		}
@@ -108,9 +108,9 @@ 
 		$output = $this->getDocumentSrlByTag($args);
 		$document_srl = array();
 
-		if($output->data)
+		if ($output->data)
 		{
-			foreach($output->data as $k => $v) $document_srl[] = $v->document_srl;
+			foreach ($output->data as $k => $v) $document_srl[] = $v->document_srl;
 		}
 		unset($args);
 

Braces +13 added lines, -11 removed lines

@@ -32,8 +32,7 @@ 
 		if(is_array($obj->module_srl))
 		{
 			$args->module_srl = implode(',', $obj->module_srl);
-		}
-		else
+		} else
 		{
 			$args->module_srl = $obj->module_srl;
 		}
@@ -42,7 +41,9 @@ 
 		$args->count = $obj->sort_index;
 
 		$output = executeQueryArray('tag.getTagList', $args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		return $output;
 	}
@@ -56,8 +57,7 @@ 
 		if(is_array($obj->module_srl))
 		{
 			$args->module_srl = implode(',', $obj->module_srl);
-		}
-		else
+		} else
 		{
 			$args->module_srl = $obj->module_srl;
 		}
@@ -77,14 +77,15 @@ 
 		if(is_array($obj->document_srl))
 		{
 			$args->document_srl = implode(',', $obj->document_srl);
-		}
-		else
+		} else
 		{
 			$args->document_srl = $obj->document_srl;
 		}
 
 		$output = executeQueryArray('tag.getDocumentsTagList', $args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		return $output;
 	}
@@ -98,8 +99,7 @@ 
 		if(is_array($obj->module_srl))
 		{
 			$args->module_srl = implode(',', $obj->module_srl);
-		}
-		else
+		} else
 		{
 			$args->module_srl = $obj->module_srl;
 		}
@@ -110,7 +110,9 @@ 
 
 		if($output->data)
 		{
-			foreach($output->data as $k => $v) $document_srl[] = $v->document_srl;
+			foreach($output->data as $k => $v) {
+				$document_srl[] = $v->document_srl;
+			}
 		}
 		unset($args);
 

tools/dbxml_validator/tests/xmlQueriesTest.php

Doc Comments +11 added lines

@@ -27,6 +27,11 @@ 
  

     // recursive glob

     // On Windows glob() is case-sensitive.

+
+    /**
+     * @param string $sDir
+     * @param integer $nFlags
+     */
     public function globr($sDir, $sPattern, $nFlags = NULL) 

     { 

 	// Get the list of all matching files currently in the 

@@ -129,6 +134,9 @@ 
 	$this->markTestIncomplete('XML Schema Language files should be fixed first.');

     }

 

+    /**
+     * @param integer $err_code
+     */
     public function invoke_testInvalidXmlFiles($filename, $err_code, $args = '')

     {

 	$cmd = $this->validator_cmd . ' '. $args . ' ' . escapeshellarg($filename);

@@ -166,6 +174,9 @@ 
 	return $this->invoke_testInvalidXmlFiles($filename, self::RETCODE_BUILTIN_CHECKS);

     }

 

+    /**
+     * @param string $dir_name
+     */
     public function getDirFilesList($dir_name)

     {

 	$output = array();

Indentation +101 added lines, -101 removed lines

@@ -2,33 +2,33 @@ 
 /* Copyright (C) NAVER <http://www.navercorp.com> */

 

 if (!defined('__DIR__'))

-    define('__DIR__', realpath(dirname(__FILE__))); 

+	define('__DIR__', realpath(dirname(__FILE__))); 

 

 /** The tests here are meant only for the built-in checks in validator.php, 

     and not for the entire syntax expressed by the .xsd files. */

 class XmlQueriesTest extends PHPUnit_Framework_TestCase

 {

-    // taken from validator.php

+	// taken from validator.php

 

-    const RETCODE_VALIDATOR_INTERNAL = 60;

-    const RETCODE_GENERIC_XML_SYNTAX = 50;

-    const RETCODE_QUERY_ELEMENT = 40;

-    const RETCODE_XSD_VALIDATION = 30;

-    const RETCODE_BUILTIN_CHECKS =    20;

-    const RETCODE_DB_SCHEMA_MATCH =10;	// no schema match is currently implemented.

-    const RETCODE_SUCCESS = 0;

+	const RETCODE_VALIDATOR_INTERNAL = 60;

+	const RETCODE_GENERIC_XML_SYNTAX = 50;

+	const RETCODE_QUERY_ELEMENT = 40;

+	const RETCODE_XSD_VALIDATION = 30;

+	const RETCODE_BUILTIN_CHECKS =    20;

+	const RETCODE_DB_SCHEMA_MATCH =10;	// no schema match is currently implemented.

+	const RETCODE_SUCCESS = 0;

 

-    public $validator_cmd;

+	public $validator_cmd;

 

-    public function setUp()

-    {

+	public function setUp()

+	{

 	 $this->validator_cmd = "php " . escapeshellarg(__DIR__ . '/../validate.php') . " ";

-    }

+	}

  

-    // recursive glob

-    // On Windows glob() is case-sensitive.

-    public function globr($sDir, $sPattern, $nFlags = NULL) 

-    { 

+	// recursive glob

+	// On Windows glob() is case-sensitive.

+	public function globr($sDir, $sPattern, $nFlags = NULL) 

+	{ 

 	// Get the list of all matching files currently in the 

 	// directory. 

 

@@ -41,25 +41,25 @@ 
 

 	foreach ($aDirs as $sSubDir) 

 	{ 

-	    if ($sSubDir != '.' && $sSubDir != '..')

-	    {

+		if ($sSubDir != '.' && $sSubDir != '..')

+		{

 		$aSubFiles = $this->globr($sSubDir, $sPattern, $nFlags); 

 		$aFiles = array_merge($aFiles, $aSubFiles); 

-	    }

+		}

 	} 

 

 	// return merged array with all (recursive) files

 	return $aFiles; 

-    } 

+	} 

 

-    /** Tests all XML Query and Schema Language files (in all modules/addons/widgets) in XE */

-    public function invoke_testReleasedXMLLangFiles

+	/** Tests all XML Query and Schema Language files (in all modules/addons/widgets) in XE */

+	public function invoke_testReleasedXMLLangFiles

 	(

-	    $released_files,

-	    $expected_return_code,

-	    $validator_args = ''

+		$released_files,

+		$expected_return_code,

+		$validator_args = ''

 	)

-    {

+	{

 	// this file is in tools/dbxml_validator/tests

 	$xe_dir = __DIR__ . '/../../..';

 

@@ -70,67 +70,67 @@ 
 	$xml_files = array();

 

 	foreach ($released_files as $released_file_mask)

-	    $xml_files =

+		$xml_files =

 		array_merge

 		(

-		    $xml_files,

-		    $this->globr

+			$xml_files,

+			$this->globr

 			(

-			    $xe_dir,

-			    $released_file_mask,

-			    GLOB_NOSORT | GLOB_NOESCAPE | GLOB_ERR

+				$xe_dir,

+				$released_file_mask,

+				GLOB_NOSORT | GLOB_NOESCAPE | GLOB_ERR

 			)

 		);

 

 	while ($cnt < count($xml_files))

 	{

-	    $cmd = $this->validator_cmd . $validator_args;

+		$cmd = $this->validator_cmd . $validator_args;

 

-	    // Validate 50 files at once

-	    foreach (array_slice($xml_files, $cnt, 50) as $xml_file)

+		// Validate 50 files at once

+		foreach (array_slice($xml_files, $cnt, 50) as $xml_file)

 		$cmd .= " " . escapeshellarg($xml_file);

 

-	    exec($cmd . ' 2>&1', $validator_output, $return_code);

+		exec($cmd . ' 2>&1', $validator_output, $return_code);

 

-	    $output_text = trim(trim(implode("\n", $validator_output)), "\n");

+		$output_text = trim(trim(implode("\n", $validator_output)), "\n");

 

-	    // Validator should not crash/exit-with-an-error.

-	    $this->assertLessThanOrEqual

+		// Validator should not crash/exit-with-an-error.

+		$this->assertLessThanOrEqual

 		(

-		    $expected_return_code,

-		    $return_code,

-		    "{$cmd}\n\n{$output_text}\nValidator returned code {$return_code}."

+			$expected_return_code,

+			$return_code,

+			"{$cmd}\n\n{$output_text}\nValidator returned code {$return_code}."

 		);

 

-	    $cnt += 50;

+		$cnt += 50;

+	}

 	}

-    }

 

-    public function testReleasedXMLQueryLangFiles()

-    {

+	public function testReleasedXMLQueryLangFiles()

+	{

 	$this->invoke_testReleasedXMLLangFiles

-	    (

+		(

 		array('queries/*.xml', 'xml_query/*.xml'),

 		self::RETCODE_QUERY_ELEMENT

-	    );

+		);

 

 	$this->markTestIncomplete('XML Query Language files should be fixed first.');

-    }

+	}

 

-    public function testReleasedXMLSchemaLangFiles()

-    {

+	public function testReleasedXMLSchemaLangFiles()

+	{

 	$this->invoke_testReleasedXMLLangFiles

-	    (

+		(

 		array('schemas/*.xml'),

 		self::RETCODE_BUILTIN_CHECKS,

 		' --schema-language'

-	    );

+		);

 

 	$this->markTestIncomplete('XML Schema Language files should be fixed first.');

-    }

+	}

 

-    public function invoke_testInvalidXmlFiles($filename, $err_code, $args = '')

-    {

+	public function invoke_testInvalidXmlFiles($filename, $err_code, $args = '')

+	{

 	$cmd = $this->validator_cmd . ' '. $args . ' ' . escapeshellarg($filename);

 	$validator_output = array();

 	$return_code = 0;

@@ -141,88 +141,88 @@ 
 

 	// Validator should not crash/exit-with-an-error.

 	$this->assertEquals

-	    (

+		(

 		$err_code,

 		$return_code,

 		"{$cmd}\n{$output_text}\nValidator returned code {$return_code}."

-	    );

+		);

 

 	// Validator should output some error on the test files

 	$basefilename = basename($filename);

 	$this->assertNotEmpty($output_text, "Error reporting failed for {$basefilename} validation.");

 

-    }

+	}

 

-    public function testInvalidQueryId()

-    {

+	public function testInvalidQueryId()

+	{

 	return $this->invoke_testInvalidXmlFiles(__DIR__.'/data/wrongQueryId.xml', self::RETCODE_QUERY_ELEMENT);

-    }

+	}

 

-    /**

-     * @dataProvider getFilesList

-     */

-    public function testInvalidXMLQueryFiles($filename)

-    {

+	/**

+	 * @dataProvider getFilesList

+	 */

+	public function testInvalidXMLQueryFiles($filename)

+	{

 	return $this->invoke_testInvalidXmlFiles($filename, self::RETCODE_BUILTIN_CHECKS);

-    }

+	}

 

-    public function getDirFilesList($dir_name)

-    {

+	public function getDirFilesList($dir_name)

+	{

 	$output = array();

 

 	$dir = opendir(__DIR__ . '/' . $dir_name);

 

 	if ($dir)

 	{

-	    $entry = readdir($dir);

+		$entry = readdir($dir);

 

-	    while ($entry !== FALSE)

-	    {

+		while ($entry !== FALSE)

+		{

 		$fname = __DIR__ . '/' . $dir_name .'/' . $entry;

 

 		if (!is_dir($fname)&& $entry != 'wrongQueryId.xml')

-		    $output[] = array($fname);

+			$output[] = array($fname);

 

 		$entry = readdir($dir);

-	    }

+		}

 

-	    closedir($dir);

+		closedir($dir);

 	}

 	else

-	    $this->assertFalse(TRUE);

+		$this->assertFalse(TRUE);

 

-        return $output;

-    }

+		return $output;

+	}

 

-    public function getFilesList()

-    {

+	public function getFilesList()

+	{

 	return $this->getDirFilesList('data');

-    }

+	}

 

-    public function getSchemaFilesList()

-    {

+	public function getSchemaFilesList()

+	{

 	return $this->getDirFilesList('data/schema');

-    }

+	}

 

-    public function getSchemaWarningFilesList()

-    {

+	public function getSchemaWarningFilesList()

+	{

 	return $this->getDirFilesList('data/schema/warnings');

-    }

+	}

 

-    /**

-     * @dataProvider getSchemaFilesList

-     */

-    public function testInvalidXMLSchemaFiles($filename)

-    {

+	/**

+	 * @dataProvider getSchemaFilesList

+	 */

+	public function testInvalidXMLSchemaFiles($filename)

+	{

 	return $this->invoke_testInvalidXmlFiles($filename, self::RETCODE_BUILTIN_CHECKS, '--schema-language');

-    }

+	}

 

-    /**

-     * @dataProvider getSchemaWarningFilesList

-     */

-    public function testWarningXMLSchemaFiles($filename)

-    {

+	/**

+	 * @dataProvider getSchemaWarningFilesList

+	 */

+	public function testWarningXMLSchemaFiles($filename)

+	{

 	return $this->invoke_testInvalidXmlFiles($filename, self::RETCODE_SUCCESS, '--schema-language');

-    }

+	}

 }

 

Braces +16 added lines, -12 removed lines

@@ -1,8 +1,9 @@ 
 <?php

 /* Copyright (C) NAVER <http://www.navercorp.com> */

 

-if (!defined('__DIR__'))

-    define('__DIR__', realpath(dirname(__FILE__))); 

+if (!defined('__DIR__')) {
+    define('__DIR__', realpath(dirname(__FILE__)));
+}
 

 /** The tests here are meant only for the built-in checks in validator.php, 

     and not for the entire syntax expressed by the .xsd files. */

@@ -69,8 +70,8 @@ 
 	$cmd = $this->validator_cmd;

 	$xml_files = array();

 

-	foreach ($released_files as $released_file_mask)

-	    $xml_files =

+	foreach ($released_files as $released_file_mask) {
+		    $xml_files =

 		array_merge

 		(

 		    $xml_files,

@@ -80,15 +81,17 @@ 
 			    $released_file_mask,

 			    GLOB_NOSORT | GLOB_NOESCAPE | GLOB_ERR

 			)

-		);

+		);
+	}
 

 	while ($cnt < count($xml_files))

 	{

 	    $cmd = $this->validator_cmd . $validator_args;

 

 	    // Validate 50 files at once

-	    foreach (array_slice($xml_files, $cnt, 50) as $xml_file)

-		$cmd .= " " . escapeshellarg($xml_file);

+	    foreach (array_slice($xml_files, $cnt, 50) as $xml_file) {
+	    		$cmd .= " " . escapeshellarg($xml_file);
+	    }
 

 	    exec($cmd . ' 2>&1', $validator_output, $return_code);

 

@@ -180,16 +183,17 @@ 
 	    {

 		$fname = __DIR__ . '/' . $dir_name .'/' . $entry;

 

-		if (!is_dir($fname)&& $entry != 'wrongQueryId.xml')

-		    $output[] = array($fname);

+		if (!is_dir($fname)&& $entry != 'wrongQueryId.xml') {
+				    $output[] = array($fname);
+		}
 

 		$entry = readdir($dir);

 	    }

 

 	    closedir($dir);

-	}

-	else

-	    $this->assertFalse(TRUE);

+	} else {
+		    $this->assertFalse(TRUE);
+	}
 

         return $output;

     }

Spacing +20 added lines, -27 removed lines

@@ -14,15 +14,15 @@ 
     const RETCODE_GENERIC_XML_SYNTAX = 50;

     const RETCODE_QUERY_ELEMENT = 40;

     const RETCODE_XSD_VALIDATION = 30;

-    const RETCODE_BUILTIN_CHECKS =    20;

-    const RETCODE_DB_SCHEMA_MATCH =10;	// no schema match is currently implemented.

+    const RETCODE_BUILTIN_CHECKS = 20;

+    const RETCODE_DB_SCHEMA_MATCH = 10; // no schema match is currently implemented.

     const RETCODE_SUCCESS = 0;

 

     public $validator_cmd;

 

     public function setUp()

     {

-	 $this->validator_cmd = "php " . escapeshellarg(__DIR__ . '/../validate.php') . " ";

+	 $this->validator_cmd = "php ".escapeshellarg(__DIR__.'/../validate.php')." ";

     }

  

     // recursive glob

@@ -53,17 +53,16 @@ 
     } 

 

     /** Tests all XML Query and Schema Language files (in all modules/addons/widgets) in XE */

-    public function invoke_testReleasedXMLLangFiles

-	(

+    public function invoke_testReleasedXMLLangFiles(

 	    $released_files,

 	    $expected_return_code,

 	    $validator_args = ''

 	)

     {

 	// this file is in tools/dbxml_validator/tests

-	$xe_dir = __DIR__ . '/../../..';

+	$xe_dir = __DIR__.'/../../..';

 

-	$this->assertTrue(file_exists($xe_dir . '/index.php'), 'XE directory not found');

+	$this->assertTrue(file_exists($xe_dir.'/index.php'), 'XE directory not found');

 

 	$cnt = 0;

 	$cmd = $this->validator_cmd;

@@ -71,11 +70,9 @@ 
 

 	foreach ($released_files as $released_file_mask)

 	    $xml_files =

-		array_merge

-		(

+		array_merge(

 		    $xml_files,

-		    $this->globr

-			(

+		    $this->globr(

 			    $xe_dir,

 			    $released_file_mask,

 			    GLOB_NOSORT | GLOB_NOESCAPE | GLOB_ERR

@@ -84,19 +81,18 @@ 
 

 	while ($cnt < count($xml_files))

 	{

-	    $cmd = $this->validator_cmd . $validator_args;

+	    $cmd = $this->validator_cmd.$validator_args;

 

 	    // Validate 50 files at once

 	    foreach (array_slice($xml_files, $cnt, 50) as $xml_file)

-		$cmd .= " " . escapeshellarg($xml_file);

+		$cmd .= " ".escapeshellarg($xml_file);

 

-	    exec($cmd . ' 2>&1', $validator_output, $return_code);

+	    exec($cmd.' 2>&1', $validator_output, $return_code);

 

 	    $output_text = trim(trim(implode("\n", $validator_output)), "\n");

 

 	    // Validator should not crash/exit-with-an-error.

-	    $this->assertLessThanOrEqual

-		(

+	    $this->assertLessThanOrEqual(

 		    $expected_return_code,

 		    $return_code,

 		    "{$cmd}\n\n{$output_text}\nValidator returned code {$return_code}."

@@ -108,8 +104,7 @@ 
 

     public function testReleasedXMLQueryLangFiles()

     {

-	$this->invoke_testReleasedXMLLangFiles

-	    (

+	$this->invoke_testReleasedXMLLangFiles(

 		array('queries/*.xml', 'xml_query/*.xml'),

 		self::RETCODE_QUERY_ELEMENT

 	    );

@@ -119,8 +114,7 @@ 
 

     public function testReleasedXMLSchemaLangFiles()

     {

-	$this->invoke_testReleasedXMLLangFiles

-	    (

+	$this->invoke_testReleasedXMLLangFiles(

 		array('schemas/*.xml'),

 		self::RETCODE_BUILTIN_CHECKS,

 		' --schema-language'

@@ -131,17 +125,16 @@ 
 

     public function invoke_testInvalidXmlFiles($filename, $err_code, $args = '')

     {

-	$cmd = $this->validator_cmd . ' '. $args . ' ' . escapeshellarg($filename);

+	$cmd = $this->validator_cmd.' '.$args.' '.escapeshellarg($filename);

 	$validator_output = array();

 	$return_code = 0;

 

-	exec($cmd . '2>&1', $validator_output, $return_code);

+	exec($cmd.'2>&1', $validator_output, $return_code);

 

 	$output_text = trim(trim(implode("\n", $validator_output)), "\n");

 

 	// Validator should not crash/exit-with-an-error.

-	$this->assertEquals

-	    (

+	$this->assertEquals(

 		$err_code,

 		$return_code,

 		"{$cmd}\n{$output_text}\nValidator returned code {$return_code}."

@@ -170,7 +163,7 @@ 
     {

 	$output = array();

 

-	$dir = opendir(__DIR__ . '/' . $dir_name);

+	$dir = opendir(__DIR__.'/'.$dir_name);

 

 	if ($dir)

 	{

@@ -178,9 +171,9 @@ 
 

 	    while ($entry !== FALSE)

 	    {

-		$fname = __DIR__ . '/' . $dir_name .'/' . $entry;

+		$fname = __DIR__.'/'.$dir_name.'/'.$entry;

 

-		if (!is_dir($fname)&& $entry != 'wrongQueryId.xml')

+		if (!is_dir($fname) && $entry != 'wrongQueryId.xml')

 		    $output[] = array($fname);

 

 		$entry = readdir($dir);

tools/dbxml_validator/validate.php

Doc Comments +5 added lines, -5 removed lines

@@ -173,7 +173,7 @@ 
  @return

  @param $xml_file

  @param $node

- @param $child_tag

+ @param string $child_tag

  */

 function checkDuplicateDescendants($xml_file, $node, $child_tag)

 {

@@ -199,13 +199,13 @@ 
 	messages.

  @param $node

 	The XML node with the children to be checked.

- @param $child_tags

+ @param string[] $child_tags

 	Array with tag names for the children elements

- @param $attr_tags

+ @param string[] $attr_tags

 	Array with names of attributes to be checked. If multiple attributes

 	are given, than the first one that is present on a child is included

 	in the check.

- @param $key

+ @param boolean $key

 	True if child elements are required to expose at least one of the 

 	attribute. False if only the child nodes with some of the

 	attributes present are to be checked.

@@ -489,7 +489,7 @@ 
 	@return

 	@param $xml_file

 	@param $container_element

-	@param $child_tag

+	@param string $child_tag

 */

 function checkVarContentsValidation

 	(

Indentation +28 added lines, -29 removed lines

@@ -90,7 +90,7 @@ 
 		@param $line_no

 		@param $message

 		@access

-	*/

+	 */

 	public function __construct($file, $line_no, $message)

 	{

 		parent::__construct("{$file}({$line_no}):\n\t$message");

@@ -112,7 +112,7 @@ 
 	@developer

 	@return

 	@access

-	*/

+	 */

 	public function __destruct()

 	{

 		libxml_clear_errors();

@@ -834,8 +834,7 @@ 
 

 	@brief

 	@developer

-

-	*/

+	 */

 	class RestoreWorkDir

 	{

 		protected $dirname;

@@ -845,7 +844,7 @@ 
 			@developer

 			@return

 			@access

-			*/

+		 */

 		public function __destruct()

 		{

 			try

@@ -868,7 +867,7 @@ 
 			@developer

 			@return

 			@access

-			*/

+		 */

 		public function __construct()

 		{

 			$this->dirname = getcwd();

@@ -1113,7 +1112,7 @@ 
 		@return

 		@access

 		@param $val

-	*/

+	 */

 	public function code($val = -1)

 	{

 		if($val == -1)

@@ -1135,7 +1134,7 @@ 
 		@return

 		@access

 		@param $val

-	*/

+	 */

 	public function push($val)

 	{

 		$this->save = $this->exit_code;

@@ -1147,7 +1146,7 @@ 
 		@developer

 		@access

 		@return

-	*/

+	 */

 	public function pop()

 	{

 		$this->exit_code = $this->save;

@@ -1160,7 +1159,7 @@ 
 		@return

 		@access

 		@param $val

-	*/

+	 */

 	public function __construct($val = 0)

 	{

 		$this->save = self::RETCODE_VALIDATOR_INTERNAL;

@@ -1181,7 +1180,7 @@ 
 		@developer

 		@access

 		@return

-	*/

+	 */

 	public function __destruct()

 	{

 		if($this->file_name)

@@ -1196,7 +1195,7 @@ 
 		@access

 		@return

 		@param $file_name

-	*/

+	 */

 	public function __construct($file_name)

 	{

 		$this->file_name = $file_name;

@@ -1439,7 +1438,7 @@ 
 

 			@brief

 			@developer

-		*/

+		 */

 		class Context

 		{

 			protected static $db_info = NULL;

@@ -1449,7 +1448,7 @@ 
 				@developer

 				@return

 				@access

-			*/

+			 */

 			public static function isInstalled()

 			{

 				return TRUE;

@@ -1460,7 +1459,7 @@ 
 				@developer

 				@return

 				@access

-			*/

+			 */

 			public static function getLangType()

 			{

 				return 'en';

@@ -1471,7 +1470,7 @@ 
 				@developer

 				@return

 				@access

-			*/

+			 */

 			public static function getLang()

 			{

 				return 'en';

@@ -1482,7 +1481,7 @@ 
 				@developer

 				@return

 				@access

-			*/

+			 */

 			public static function getDBType()

 			{

 				if(self::$db_info)

@@ -1501,7 +1500,7 @@ 
 				@return

 				@access

 				@param $db_info

-			*/

+			 */

 			public static function setDBInfo($db_info)

 			{

 				self::$db_info = $db_info;

@@ -1512,7 +1511,7 @@ 
 				@developer

 				@return

 				@access

-			*/

+			 */

 			public static function getDBInfo()

 			{

 				return self::$db_info;

@@ -1524,7 +1523,7 @@ 
 				@return

 				@access

 				@param $str

-			*/

+			 */

 			public static function convertEncodingStr($str)

 			{

 				return $str;

@@ -1535,7 +1534,7 @@ 
 				@developer

 				@return

 				@access

-			*/

+			 */

 			public static function setNoDBInfo()

 			{

 				$db_info = (object)NULL;

@@ -1562,7 +1561,7 @@ 
 				@developer

 				@access

 				@return

-			*/

+			 */

 			public static function setMysqlDBInfo()

 			{

 				$db_info = (object)NULL;

@@ -1604,7 +1603,7 @@ 
 				@developer

 				@return

 				@access

-			*/

+			 */

 			public static function setMysqliDBInfo()

 			{

 				$db_info = (object)NULL;

@@ -1646,7 +1645,7 @@ 
 				@developer

 				@return

 				@access

-			*/

+			 */

 			public static function setCubridDBInfo()

 			{

 				$db_info = (object)NULL;

@@ -1688,7 +1687,7 @@ 
 				@developer

 				@return

 				@access

-			*/

+			 */

 			public static function setMssqlDBInfo()

 			{

 				$db_info = (object)NULL;

@@ -1729,7 +1728,7 @@ 
 		/**

 			@brief

 			@developer

-		*/

+		 */

 		class Any_prop_obj_base

 		{

 			/**

@@ -1738,7 +1737,7 @@ 
 				@return

 				@param $property

 				@access

-			*/

+			 */

 			public function __get($property)

 			{

 				return NULL;

@@ -1748,7 +1747,7 @@ 
 		/**

 			@brief

 			@developer

-			*/

+		 */

 		class LangArgFilterErrorMessage

 		{

 			/**

@@ -1757,7 +1756,7 @@ 
 				@return

 				@param $property

 				@access

-			*/

+			 */

 			public function __get($property)

 			{

 				return 'Argument filter error';

Spacing +267 added lines, -286 removed lines

@@ -95,7 +95,7 @@ 
 	{

 		parent::__construct("{$file}({$line_no}):\n\t$message");

 

-		$this->xml_file	= $file;

+		$this->xml_file = $file;

 		$this->xml_line_no = $line_no;

 		$this->xml_message = $message;

 	}

@@ -133,32 +133,32 @@ 
 

 	$libXmlErrors = libxml_get_errors();

 

-	if(count($libXmlErrors))

+	if (count($libXmlErrors))

 	{

-		if(!$filename)

+		if (!$filename)

 		{

 			$filename = $libXmlErrors[0]->file;

 		}

 

 		$msg = '';

 

-		foreach($libXmlErrors as $libXmlError)

+		foreach ($libXmlErrors as $libXmlError)

 		{

 			$msg .= "{$libXmlError->file}({$libXmlError->line}):\n\t {$libXmlError->message}";

 		}

 

-		if($throw_error)

+		if ($throw_error)

 		{

 			throw new ErrorMessage($msg);

 		}

 		else

 		{

-			fwrite(STDERR, $msg . "\n");

+			fwrite(STDERR, $msg."\n");

 		}

 	}

 	else

 	{

-		if($throw_error)

+		if ($throw_error)

 		{

 			throw new ErrorMessage('Schema validation failed.');

 		}

@@ -179,7 +179,7 @@ 
 {

 	$children = $node->getElementsByTagName($child_tag);

 

-	if($children->length > 1)

+	if ($children->length > 1)

 	{

 		throw 

 			new XmlSchemaError(

@@ -217,21 +217,21 @@ 
 {

 	$key_values = array();

 

-	foreach($node->childNodes as $child_node)

+	foreach ($node->childNodes as $child_node)

 	{

-		if($child_node->nodeType == XML_ELEMENT_NODE

+		if ($child_node->nodeType == XML_ELEMENT_NODE

 					&&

 				in_array($child_node->tagName, $child_tags))

 		{

 			$key_value = NULL;

 

-			foreach($attr_tags as $attr_tag)

+			foreach ($attr_tags as $attr_tag)

 			{

-				if($child_node->hasAttribute($attr_tag))

+				if ($child_node->hasAttribute($attr_tag))

 				{

 					$key_value = $child_node->getAttribute($attr_tag);

 

-					if(array_key_exists($key_value, $key_values))

+					if (array_key_exists($key_value, $key_values))

 					{

 						throw

 							new XmlSchemaError(

@@ -246,7 +246,7 @@ 
 				}

 			}

 

-			if(!$key_value && $key)

+			if (!$key_value && $key)

 			{

 				throw

 					new XmlSchemaError(

@@ -254,7 +254,7 @@ 
 						$child_node->getLineNo(),

 						"<{$child_node->tagName}>: at least one of the following attributes is expected: "

 							.

-						implode(', ', $attr_tags) . '.'

+						implode(', ', $attr_tags).'.'

 					);

 			}

 		}

@@ -282,19 +282,19 @@ 
 	$table_name = NULL;

 	$join_type = NULL;

 

-	if($table_element->hasAttribute('name'))

+	if ($table_element->hasAttribute('name'))

 	{

 		$table_name = $table_element->getAttribute('name');

 	}

 

-	if($table_element->hasAttribute('type'))

+	if ($table_element->hasAttribute('type'))

 	{

 		$join_type = $table_element->getAttribute('type');

 	}

 

-	if($table_element->getAttribute('query') == 'true')

+	if ($table_element->getAttribute('query') == 'true')

 	{

-		if($table_name !== NULL)

+		if ($table_name !== NULL)

 		{

 			throw

 				new XmlSchemaError(

@@ -304,7 +304,7 @@ 
 				);

 		}

 

-		if($join_type !== NULL)

+		if ($join_type !== NULL)

 		{

 			throw

 				new XmlSchemaError(

@@ -322,9 +322,9 @@ 
 		// check contents for a select list or a table-specification

 		$has_query_clauses = FALSE;

 

-		foreach($table_element->childNodes as $query_clause)

+		foreach ($table_element->childNodes as $query_clause)

 		{

-			if($query_clause->nodeType == XML_ELEMENT_NODE

+			if ($query_clause->nodeType == XML_ELEMENT_NODE

 						&&

 					(

 						$query_clause->tagName == 'columns' 

@@ -335,7 +335,7 @@ 
 			}

 		}

 

-		if(!$has_query_clauses)

+		if (!$has_query_clauses)

 		{

 			throw

 				new XmlSchemaError(

@@ -351,17 +351,17 @@ 
 	{

 		// base table or view

 

-		if($join_type !== NULL)

+		if ($join_type !== NULL)

 		{

 			$has_conditions_element = FALSE;

 

-			foreach($table_element->childNodes as $child_node)

+			foreach ($table_element->childNodes as $child_node)

 			{

-				if($child_node->nodeType == XML_ELEMENT_NODE)

+				if ($child_node->nodeType == XML_ELEMENT_NODE)

 				{

-					if($child_node->tagName == 'conditions')

+					if ($child_node->tagName == 'conditions')

 					{

-						if($has_conditions_element)

+						if ($has_conditions_element)

 						{

 							throw

 								new XmlSchemaError(

@@ -387,7 +387,7 @@ 
 				}

 			}

 

-			if(!$has_conditions_element)

+			if (!$has_conditions_element)

 			{

 				throw

 					new XmlSchemaError(

@@ -399,9 +399,9 @@ 
 		}

 		else

 		{

-			foreach($table_element->childNodes as $child_node)

+			foreach ($table_element->childNodes as $child_node)

 			{

-				if($child_node->nodeType == XML_ELEMENT_NODE)

+				if ($child_node->nodeType == XML_ELEMENT_NODE)

 				{

 					throw

 						new XmlSchemaError(

@@ -429,26 +429,25 @@ 
  */

 function checkTablesClause($xml_file, $tables_element)

 {

-	checkUniqueKey

-		(

+	checkUniqueKey(

 			$xml_file,

 			$tables_element,

-			array('table'),				// child elements to be checked

-			array('alias', 'name'),		// attributes to be checked

+			array('table'), // child elements to be checked

+			array('alias', 'name'), // attributes to be checked

 			TRUE						// attributes are required

 		);

 

-	foreach($tables_element->childNodes as $table)

+	foreach ($tables_element->childNodes as $table)

 	{

-		if($table->nodeType == XML_ELEMENT_NODE

+		if ($table->nodeType == XML_ELEMENT_NODE

 					&&

 				$table->tagName == 'table')

 		{

 			checkTableExpression($xml_file, $table);

 

-			if($table->getAttribute('query') == 'true')

+			if ($table->getAttribute('query') == 'true')

 			{

-				validate_select_query($xml_file, $table);		// recursive call

+				validate_select_query($xml_file, $table); // recursive call

 			}

 		}

 	}

@@ -470,12 +469,11 @@ 
  */

 function checkSelectListClause($xml_file, $columns_element)

 {

-	checkUniqueKey

-		(

+	checkUniqueKey(

 			$xml_file,

 			$columns_element,

-			array('column', 'query'),	// child elements

-			array('alias', 'name'),		// attributes

+			array('column', 'query'), // child elements

+			array('alias', 'name'), // attributes

 			FALSE						// ignore if no attributes present

 		);

 }

@@ -491,8 +489,7 @@ 
 	@param $container_element

 	@param $child_tag

 */

-function checkVarContentsValidation

-	(

+function checkVarContentsValidation(

 		$xml_file,

 		$container_element,

 		$child_tag

@@ -503,23 +500,22 @@ 
 

 	static

 		$var_attrs =

-			array

-			(

+			array(

 				'filter', 'notnull', 'minlength',

 				'maxlength'

 			);

 

-	foreach($container_element->childNodes as $child_node)

+	foreach ($container_element->childNodes as $child_node)

 	{

-		if($child_node->nodeType == XML_ELEMENT_NODE

+		if ($child_node->nodeType == XML_ELEMENT_NODE

 					&&

 				$child_node->tagName == $child_tag)

 		{

-			if(!$child_node->hasAttribute($key_attr))

+			if (!$child_node->hasAttribute($key_attr))

 			{

-				foreach($var_attrs as $var_attr)

+				foreach ($var_attrs as $var_attr)

 				{

-					if($child_node->hasAttribute($var_attr))

+					if ($child_node->hasAttribute($var_attr))

 					{

 						throw

 							new XmlSchemaError(

@@ -551,9 +547,9 @@ 
 	$has_var_attribute = $condition->hasAttribute('var') || $condition->hasAttribute('default');

 	$query_line_no = -1;

 

-	foreach($condition->childNodes as $query_node)

+	foreach ($condition->childNodes as $query_node)

 	{

-		if($query_node->nodeType == XML_ELEMENT_NODE

+		if ($query_node->nodeType == XML_ELEMENT_NODE

 					&&

 				$query_node->tagName == 'query')

 		{

@@ -564,7 +560,7 @@ 
 		}

 	}

 

-	if($child_query_node && $has_var_attribute)

+	if ($child_query_node && $has_var_attribute)

 	{

 		throw 

 			new XmlSchemaError(

@@ -574,7 +570,7 @@ 
 			);

 	}

 

-	if(!($child_query_node || $has_var_attribute))

+	if (!($child_query_node || $has_var_attribute))

 	{

 		throw

 			new XmlSchemaError(

@@ -601,18 +597,18 @@ 
 {

 	$first_child = TRUE;

 

-	foreach($conditions->childNodes as $child_node)

+	foreach ($conditions->childNodes as $child_node)

 	{

-		if($child_node->nodeType == XML_ELEMENT_NODE)

+		if ($child_node->nodeType == XML_ELEMENT_NODE)

 		{

 			// check for 'pipe' attribute

-			if($first_child)

+			if ($first_child)

 			{

 				$first_child = FALSE;

 			}

 			else

 			{

-				if(!$child_node->hasAttribute('pipe'))

+				if (!$child_node->hasAttribute('pipe'))

 				{

 					throw

 						new XmlSchemaError(

@@ -626,19 +622,19 @@ 
 			}

 

 			// recurse in condition groups/queries

-			if($child_node->tagName == 'group')

+			if ($child_node->tagName == 'group')

 			{

 				checkConditionsGroup($xml_file, $child_node);

 			}

 			else

 			{

-				if($child_node->tagName == 'query')

+				if ($child_node->tagName == 'query')

 				{

 					validate_select_query($xml_file, $child_node);

 				}

 				else

 				{

-					if($child_node->tagName == 'condition')

+					if ($child_node->tagName == 'condition')

 					{

 						checkConditionElement($xml_file, $child_node);

 					}

@@ -664,12 +660,11 @@ 
  */

 function checkNavigationClauses($xml_file, $navigation_element)

 {

-	foreach(array('list_count', 'page_count', 'page')

+	foreach (array('list_count', 'page_count', 'page')

 				as

 			$navigation_el)

 	{

-		checkDuplicateDescendants

-			(

+		checkDuplicateDescendants(

 				$xml_file,

 				$navigation_element,

 				$navigation_el

@@ -693,11 +688,11 @@ 
  */

 function validate_select_query($xml_file, $query_element)

 {

-	foreach($query_element->childNodes as $select_clause)

+	foreach ($query_element->childNodes as $select_clause)

 	{

-		if($select_clause->nodeType == XML_ELEMENT_NODE)

+		if ($select_clause->nodeType == XML_ELEMENT_NODE)

 		{

-			switch($select_clause->tagName)

+			switch ($select_clause->tagName)

 			{

 				case 'columns':

 					checkSelectListClause($xml_file, $select_clause);

@@ -728,11 +723,11 @@ 
  */

 function validate_update_query($xml_file, $query_element)

 {

-	foreach($query_element->childNodes as $update_clause)

+	foreach ($query_element->childNodes as $update_clause)

 	{

-		if($update_clause->nodeType == XML_ELEMENT_NODE)

+		if ($update_clause->nodeType == XML_ELEMENT_NODE)

 		{

-			switch($update_clause->tagName)

+			switch ($update_clause->tagName)

 			{

 				case 'tables':

 					checkTablesClause($xml_file, $update_clause);

@@ -755,11 +750,11 @@ 
  */

 function validate_delete_query($xml_file, $query_element)

 {

-	foreach($query_element->childNodes as $delete_clause)

+	foreach ($query_element->childNodes as $delete_clause)

 	{

-		if($delete_clause->nodeType == XML_ELEMENT_NODE)

+		if ($delete_clause->nodeType == XML_ELEMENT_NODE)

 		{

-			switch($delete_clause->tagName)

+			switch ($delete_clause->tagName)

 			{

 				case 'conditions':

 					checkConditionsGroup($xml_file, $delete_clause);

@@ -778,11 +773,11 @@ 
  */

 function validate_insert_select_query($xml_file, $query_element)

 {

-	foreach($query_element->childNodes as $statement_clause)

+	foreach ($query_element->childNodes as $statement_clause)

 	{

-		if($statement_clause->nodeType == XML_ELEMENT_NODE)

+		if ($statement_clause->nodeType == XML_ELEMENT_NODE)

 		{

-			switch($statement_clause->tagName)

+			switch ($statement_clause->tagName)

 			{

 				case 'query':

 					validate_select_query($xml_file, $statement_clause);

@@ -793,8 +788,7 @@ 
 }

 

 $validate_query_type = 

-	array

-		(

+	array(

 			// 'insert' =>		

 							// there is currently nothing special to check

 							// for a plain insert, all the needed checks

@@ -818,13 +812,13 @@ 
 

 	$action = $query_element->getAttribute('action');

 

-	if(array_key_exists($action, $validate_query_type))

+	if (array_key_exists($action, $validate_query_type))

 	{

 		$validate_query_type[$action]($xml_file, $query_element);

 	}

 }

 

-if(strpos(PHP_SAPI, 'cli') !== FALSE

+if (strpos(PHP_SAPI, 'cli') !== FALSE

 			|| 

 		strpos(PHP_SAPI, 'cgi') !== FALSE)

 {

@@ -857,7 +851,7 @@ 
 				print "Failed to restore working dir {$this->dirname}.";

 			}

 

-			if(!$success)

+			if (!$success)

 			{

 				print "Failed to restore working dir {$this->dirname}.";

 			}

@@ -873,7 +867,7 @@ 
 		{

 			$this->dirname = getcwd();

 

-			if(!$this->dirname)

+			if (!$this->dirname)

 			{

 				throw new ErrorMessage("Failed to get current directory.");

 			}

@@ -903,7 +897,7 @@ 
 	$lowercase_name = strtolower($xml_path_info['basename']);

 	$uppercase_name = strtoupper($xml_path_info['basename']);

 

-	if(strlen($lowercase_name) != $filename_len

+	if (strlen($lowercase_name) != $filename_len

 				||

 			strlen($uppercase_name) != $filename_len)

 	{

@@ -916,9 +910,9 @@ 
 

 	$varing_case_filename = '';

 

-	for($i = 0; $i < $filename_len; $i++)

+	for ($i = 0; $i < $filename_len; $i++)

 	{

-		if($lowercase_name[$i] != $uppercase_name[$i])

+		if ($lowercase_name[$i] != $uppercase_name[$i])

 		{

 			$varing_case_filename .= "[{$lowercase_name[$i]}{$uppercase_name[$i]}]";

 		}

@@ -932,13 +926,13 @@ 
 

 	$restoreWorkDir = new RestoreWorkDir();

 

-	if($glob_pattern)

+	if ($glob_pattern)

 	{

 		// change current dir to the xml file directory to keep

 		// glob pattern shorter (maximum 260 chars).

 		$success = chdir($glob_pattern);

 

-		if(!$success)

+		if (!$success)

 		{

 			throw new ErrorMessage("Failed to change work dir to {$glob_pattern}.");

 		}

@@ -950,14 +944,14 @@ 
 	// realpath() would have the same effect, but it is not documented as such

 	$matched_files = glob($glob_pattern, GLOB_NOSORT | GLOB_NOESCAPE | GLOB_ERR);

 

-	unset($RestoreWorkDir);		// restore work dir after call to glob()

+	unset($RestoreWorkDir); // restore work dir after call to glob()

 

-	if($matched_files === FALSE || !is_array($matched_files))

+	if ($matched_files === FALSE || !is_array($matched_files))

 	{

 		throw new ErrorMessage("Directory listing for $xml_file failed.");

 	}

 

-	switch(count($matched_files))

+	switch (count($matched_files))

 	{

 		case 0:

 			throw new ErrorMessage("Directory listing for $xml_file failed.");

@@ -968,9 +962,9 @@ 
 		default:

 			// more than one files with the same name and different case

 			// case-sensitive file system

-			foreach($mached_files as $matched_file)

+			foreach ($mached_files as $matched_file)

 			{

-				if(pathinfo($matched_file, PATHINFO_BASENAME) == $xml_path_info['basename'])

+				if (pathinfo($matched_file, PATHINFO_BASENAME) == $xml_path_info['basename'])

 				{

 					return ($xml_path_info['filename'] == $query_id);

 				}

@@ -979,7 +973,7 @@ 
 

 	}

 

-	throw new ErrorMessage("Internal application error.");  // unreachable

+	throw new ErrorMessage("Internal application error."); // unreachable

 }

 

 /**

@@ -1000,9 +994,9 @@ 
 */

 function validate_schema_doc($xml_file, $table_element)

 {

-	foreach($table_element->childNodes as $col_node)

+	foreach ($table_element->childNodes as $col_node)

 	{

-		if($col_node->nodeType == XML_ELEMENT_NODE

+		if ($col_node->nodeType == XML_ELEMENT_NODE

 					&&

 				$col_node->tagName == 'column')

 		{

@@ -1010,12 +1004,11 @@ 
 			$col_size = NULL;

 

 			// check auto-increment column

-			if($col_node->hasAttribute('auto_increment'))

+			if ($col_node->hasAttribute('auto_increment'))

 			{

-				fwrite

-					(

+				fwrite(

 						fopen('php://stdout', 'wt'), 

-						$xml_file . '(' . $col_node->getLineNo() . ")\n\t"

+						$xml_file.'('.$col_node->getLineNo().")\n\t"

 							.

 						"<column>: attribute 'auto_increment' is currently supported only by SQL Server and mysql backends.\n"

 					);

@@ -1023,7 +1016,7 @@ 
 				static

 					$autoinc_types = array('number', 'bignumber');

 

-				if(!in_array($col_type, $autoinc_types))

+				if (!in_array($col_type, $autoinc_types))

 				{

 					throw

 						new XmlSchemaError(

@@ -1031,30 +1024,29 @@ 
 							$col_node->getLineNo(),

 							"<column>: attribute 'auto_increment' only expected for one of the following types: "

 								.

-							implode(', ', $autoinc_types) . '.'

+							implode(', ', $autoinc_types).'.'

 						);

 				}

 			}

 

 			// check tinytext

-			if($col_type == 'tinytext')

+			if ($col_type == 'tinytext')

 			{

-				fwrite

-					(

+				fwrite(

 						fopen('php://stdout', 'wt'), 

-						$xml_file . '(' . $col_node->getLineNo() . ")\n\t"

+						$xml_file.'('.$col_node->getLineNo().")\n\t"

 							.

 						"<column>: type \"tinytext\" is supported only by CUBRID.\n"

 					);

 			}

 

 			// check size attribute

-			if($col_node->hasAttribute('size'))

+			if ($col_node->hasAttribute('size'))

 			{

 				$col_size = $col_node->getAttribute('size');

 			}

 

-			if($col_type == 'varchar' && $col_size === NULL)

+			if ($col_type == 'varchar' && $col_size === NULL)

 			{

 				throw 

 					new XmlSchemaError(

@@ -1068,7 +1060,7 @@ 
 				$varsize_types = array('char', 'varchar', 'float');

 					

 

-			if($col_size !== NULL  && !in_array($col_type, $varsize_types))

+			if ($col_size !== NULL && !in_array($col_type, $varsize_types))

 			{

 				throw 

 					new XmlSchemaError(

@@ -1076,7 +1068,7 @@ 
 							$col_node->getLineNo(),

 							"<column>: 'size' attribute only expected for the following types: "

 								.

-							implode(', ', $varsize_types) . "."

+							implode(', ', $varsize_types)."."

 						);

 			}

 		}

@@ -1102,8 +1094,8 @@ 
 	const RETCODE_GENERIC_XML_SYNTAX = 50;

 	const RETCODE_QUERY_ELEMENT = 40;

 	const RETCODE_XSD_VALIDATION = 30;

-	const RETCODE_BUILTIN_CHECKS =	20;

-	const RETCODE_DB_SCHEMA_MATCH = 10;	// no schema match is currently implemented.

+	const RETCODE_BUILTIN_CHECKS = 20;

+	const RETCODE_DB_SCHEMA_MATCH = 10; // no schema match is currently implemented.

 	const RETCODE_SUCCESS = 0;

 

 

@@ -1116,13 +1108,13 @@ 
 	*/

 	public function code($val = -1)

 	{

-		if($val == -1)

+		if ($val == -1)

 		{

 			return $this->exit_code;

 		}

 		else

 		{

-			if($this->exit_code < $val)

+			if ($this->exit_code < $val)

 			{

 				$this->exit_code = $val;

 			}

@@ -1184,7 +1176,7 @@ 
 	*/

 	public function __destruct()

 	{

-		if($this->file_name)

+		if ($this->file_name)

 		{

 			unlink($this->file_name);

 			$this->file_name = NULL;

@@ -1214,12 +1206,12 @@ 
 	$cmdname = CMD_NAME;

 

 	// php manual says resources should not normally be declared constant

-	if(!defined('STDERR'))

+	if (!defined('STDERR'))

 	{

 		define('STDERR', fopen('php://stderr', 'wt'));

 	}

 

-	if(!defined('__DIR__'))

+	if (!defined('__DIR__'))

 	{

 		define('__DIR__', dirname(__FILE__)); 

 	}

@@ -1234,7 +1226,7 @@ 
 	$query_args = NULL;

 	$query_args_file = NULL;

 

-	while($argc >= 2 && $argv[1][0] == '-')

+	while ($argc >= 2 && $argv[1][0] == '-')

 	{

 		$option = $argv[1];

 

@@ -1242,17 +1234,17 @@ 
 		$argv = array_values($argv);

 		$argc = count($argv);

 

-		switch($option)

+		switch ($option)

 		{

 			case '-s':

 			case '--schema':

 			case '--schema-language':

-				if($query_args !== NULL)

+				if ($query_args !== NULL)

 				{

 					throw new SyntaxError("Both --args-string and --schema-language options given.");

 				}

 

-				if($query_args_file !== NULL)

+				if ($query_args_file !== NULL)

 				{

 					throw new SyntaxError("Both --args-file and --schema-language options given.");

 				}

@@ -1272,7 +1264,7 @@ 
 

 			case '--xe-path':

 			case '--xe':

-				if($argc < 2)

+				if ($argc < 2)

 				{

 					throw

 						new SyntaxError("Option '{$option}' requires an argument., see `{$cmdname} --help`");

@@ -1290,17 +1282,17 @@ 
 			case '--args-string':

 			case '--arguments':

 			case '--args':

-				if($schema_language !== NULL)

+				if ($schema_language !== NULL)

 				{

 					throw new SyntaxError("Both --schema-language and --args-string options given.");

 				}

 

-				if($query_args_file !== NULL)

+				if ($query_args_file !== NULL)

 				{

 					throw new SyntaxError("Both --args-string and --args-file options given.");

 				}

 

-				if($argc < 2)

+				if ($argc < 2)

 				{

 					throw

 						new SyntaxError("Option '{$option}' requires an argument., see `{$cmdname} --help`");

@@ -1316,17 +1308,17 @@ 
 

 			case '--arguments-file':

 			case '--args-file':

-				if($schema_language !== NULL)

+				if ($schema_language !== NULL)

 				{

 					throw new SyntaxError("Both --schema-language and --args-file options given.");

 				}

 

-				if($query_args !== NULL)

+				if ($query_args !== NULL)

 				{

 					throw new SyntaxError("Both --args-string and --args-file options given.");

 				}

 

-				if($argc < 2)

+				if ($argc < 2)

 				{

 					throw

 						new SyntaxError("Option '{$option}' requires an argument., see `{$cmdname} --help`");

@@ -1357,7 +1349,7 @@ 
 		}

 	}

 

-	if($argc < 2 ||

+	if ($argc < 2 ||

 			(

 				$argc == 2

 					&&

@@ -1366,48 +1358,48 @@ 
 	{

 		throw

 			new SyntaxError(

-				"Validates an XML document against a given schema definition (XSD), using the standard php library.\n" .

-				"Syntax:\n" .

-				"	{$cmdname} schema.xsd document.xml...\n" .

-				"	{$cmdname} [ --schema-language ] [--skip-query-id] ... [--] document.xml...\n" .

-				"Where:\n" .

-				"	--schema-language\n" .

-				"	--schema\n" .

-				"	-s\n" .

-				"		If given, the document(s) are validated against XE XML Schema Language,\n" .

-				"		otherwise document(s) are validated against XE XML Query Language.\n" .

-				"\n" .

-				"	--skip-query-id\n" .

-				"		Do not check the query id, which should normally match the file name.\n" .

-				"\n" .

-				"	--xe-path\n" .

-				"	--xe\n" .

-				"		Path to XE installation. Used to load the database-specific parsers to generate\n" .

-				"		SQL from the XML language files.\n" .

-				"\n" .

-				"	--validate-only\n" .

-				"		Only check XML schemas, no SQL generated with the database-specific parsers.\n" .

-				"\n" .

-				"	--args-string   \" 'name' => 'val..', 'name' => 'val...' \"\n" .

-				"	--args-file		args/file/name.php\n" .

-				"		Variables and values for the query, if it has any (only for XML Query Language).\n" .

-				"		Use a comma-separated 'var-name' => 'var_value...' pairs, in php syntax for an\n" .

-				"		array constructor. The validator script will directly eval()/include() this content.\n" .

-				"		The file named with --args-file should include an array() constructor around the\n" .

-				"		name-value list, and should immediately return it, without a named array variable.\n" .

-				"		E.g.:\n" .

-				"			return \n" .

-				"				array\n" .

-				"					(\n" .

-				"						'name' => 'val',\n" .

-				"						'name' => 'val',\n" .

-				"						...\n" .

-				"					);\n" .

-				"\n" .

-				"	schema.xsd		if given, is the file name for the schema definition to validate the\n" .

-				"					document against\n" .

-				"\n" .

-				"	document.xml	is the file name for the XML document to be validated against the schema.\n" .

+				"Validates an XML document against a given schema definition (XSD), using the standard php library.\n".

+				"Syntax:\n".

+				"	{$cmdname} schema.xsd document.xml...\n".

+				"	{$cmdname} [ --schema-language ] [--skip-query-id] ... [--] document.xml...\n".

+				"Where:\n".

+				"	--schema-language\n".

+				"	--schema\n".

+				"	-s\n".

+				"		If given, the document(s) are validated against XE XML Schema Language,\n".

+				"		otherwise document(s) are validated against XE XML Query Language.\n".

+				"\n".

+				"	--skip-query-id\n".

+				"		Do not check the query id, which should normally match the file name.\n".

+				"\n".

+				"	--xe-path\n".

+				"	--xe\n".

+				"		Path to XE installation. Used to load the database-specific parsers to generate\n".

+				"		SQL from the XML language files.\n".

+				"\n".

+				"	--validate-only\n".

+				"		Only check XML schemas, no SQL generated with the database-specific parsers.\n".

+				"\n".

+				"	--args-string   \" 'name' => 'val..', 'name' => 'val...' \"\n".

+				"	--args-file		args/file/name.php\n".

+				"		Variables and values for the query, if it has any (only for XML Query Language).\n".

+				"		Use a comma-separated 'var-name' => 'var_value...' pairs, in php syntax for an\n".

+				"		array constructor. The validator script will directly eval()/include() this content.\n".

+				"		The file named with --args-file should include an array() constructor around the\n".

+				"		name-value list, and should immediately return it, without a named array variable.\n".

+				"		E.g.:\n".

+				"			return \n".

+				"				array\n".

+				"					(\n".

+				"						'name' => 'val',\n".

+				"						'name' => 'val',\n".

+				"						...\n".

+				"					);\n".

+				"\n".

+				"	schema.xsd		if given, is the file name for the schema definition to validate the\n".

+				"					document against\n".

+				"\n".

+				"	document.xml	is the file name for the XML document to be validated against the schema.\n".

 				"					Multiple .xml files can be given.\n"

 			);

 	}

@@ -1415,23 +1407,23 @@ 
 	$query_user_args = array();

 

 	// check $xe_path, $query_args

-	if(!$validate_only)

+	if (!$validate_only)

 	{

-		if($xe_path == NULL)

+		if ($xe_path == NULL)

 		{

 			// assume validator.php is in directory .../xe/tools/dbxml_validator/ in an XE installation

 			$xe_path = dirname(dirname(realpath(__DIR__)));

 		}

 

-		if(!file_exists($xe_path . '/index.php'))

+		if (!file_exists($xe_path.'/index.php'))

 		{

 			throw

 				new ErrorMessage("File index.php not found in {$xe_path}.");

 		}

 

-		if(!defined('_XE_PATH_'))

+		if (!defined('_XE_PATH_'))

 		{

-			define('_XE_PATH_', $xe_path . '/');

+			define('_XE_PATH_', $xe_path.'/');

 		}

 

 		/**

@@ -1485,7 +1477,7 @@ 
 			*/

 			public static function getDBType()

 			{

-				if(self::$db_info)

+				if (self::$db_info)

 				{

 					return self::$db_info->master_db['db_type'];

 				}

@@ -1538,10 +1530,9 @@ 
 			*/

 			public static function setNoDBInfo()

 			{

-				$db_info = (object)NULL;

+				$db_info = (object) NULL;

 				$db_info->master_db =

-					array

-						(

+					array(

 							'db_type' => NULL,

 							'db_hostname' => NULL,

 							'db_port' => NULL,

@@ -1565,10 +1556,9 @@ 
 			*/

 			public static function setMysqlDBInfo()

 			{

-				$db_info = (object)NULL;

+				$db_info = (object) NULL;

 				$db_info->master_db =

-					array

-						(

+					array(

 							'db_type' => 'mysql',

 							'db_hostname' => NULL,

 							'db_port' => NULL,

@@ -1584,7 +1574,7 @@ 
 

 				self::setDBInfo($db_info);

 

-				if(array_key_exists('__DB__', $GLOBALS)

+				if (array_key_exists('__DB__', $GLOBALS)

 							&&

 						array_key_exists($db_info->master_db['db_type'], $GLOBALS['__DB__']))

 				{

@@ -1607,10 +1597,9 @@ 
 			*/

 			public static function setMysqliDBInfo()

 			{

-				$db_info = (object)NULL;

+				$db_info = (object) NULL;

 				$db_info->master_db =

-					array

-						(

+					array(

 							'db_type' => 'mysqli',

 							'db_hostname' => NULL,

 							'db_port' => NULL,

@@ -1626,7 +1615,7 @@ 
 

 				self::setDBInfo($db_info);

 

-				if(array_key_exists('__DB__', $GLOBALS)

+				if (array_key_exists('__DB__', $GLOBALS)

 							&&

 						array_key_exists($db_info->master_db['db_type'], $GLOBALS['__DB__']))

 				{

@@ -1649,10 +1638,9 @@ 
 			*/

 			public static function setCubridDBInfo()

 			{

-				$db_info = (object)NULL;

+				$db_info = (object) NULL;

 				$db_info->master_db =

-					array

-						(

+					array(

 							'db_type' => 'cubrid',

 							'db_hostname' => NULL,

 							'db_port' => NULL,

@@ -1668,7 +1656,7 @@ 
 

 				self::setDBInfo($db_info);

 

-				if(array_key_exists('__DB__', $GLOBALS)

+				if (array_key_exists('__DB__', $GLOBALS)

 							&&

 						array_key_exists($db_info->master_db['db_type'], $GLOBALS['__DB__']))

 				{

@@ -1691,10 +1679,9 @@ 
 			*/

 			public static function setMssqlDBInfo()

 			{

-				$db_info = (object)NULL;

+				$db_info = (object) NULL;

 				$db_info->master_db =

-					array

-						(

+					array(

 							'db_type' => 'mssql',

 							'db_hostname' => NULL,

 							'db_port' => NULL,

@@ -1710,7 +1697,7 @@ 
 

 				self::setDBInfo($db_info);

 

-				if(array_key_exists('__DB__', $GLOBALS)

+				if (array_key_exists('__DB__', $GLOBALS)

 							&&

 						array_key_exists($db_info->master_db['db_type'], $GLOBALS['__DB__']))

 				{

@@ -1765,49 +1752,49 @@ 
 		}

 

 		global $lang;

-		$lang = new Any_prop_obj_base();	// to return NULL on non-existent properties

+		$lang = new Any_prop_obj_base(); // to return NULL on non-existent properties

 		$lang->filter = New LangArgFilterErrorMessage();

 

-		if(!defined('__XE__'))

+		if (!defined('__XE__'))

 		{

 			define('__XE__', TRUE);

 		}

 

-		if(!defined('__ZBXE__'))

+		if (!defined('__ZBXE__'))

 		{

 			define('__ZBXE__', TRUE);

 		}

 

-		if(!defined('__DEBUG__'))

+		if (!defined('__DEBUG__'))

 		{

 			define('__DEBUG__', 0);

 		}

 

-		if(!defined('__DEBUG_QUERY__'))

+		if (!defined('__DEBUG_QUERY__'))

 		{

 			define('__DEBUG_QUERY__', 0);

 		}

 

-		include(_XE_PATH_ . 'classes/object/BaseObject.class.php');

-		include(_XE_PATH_ . 'classes/handler/Handler.class.php');

-		include(_XE_PATH_ . 'classes/file/FileHandler.class.php');

-		include(_XE_PATH_ . 'classes/page/PageHandler.class.php');

+		include(_XE_PATH_.'classes/object/BaseObject.class.php');

+		include(_XE_PATH_.'classes/handler/Handler.class.php');

+		include(_XE_PATH_.'classes/file/FileHandler.class.php');

+		include(_XE_PATH_.'classes/page/PageHandler.class.php');

 

 		Context::setNoDBInfo();

 

-		require_once(_XE_PATH_ . 'classes/db/DB.class.php');

-		require_once(_XE_PATH_ . 'classes/db/DBMysql.class.php');

-		require_once(_XE_PATH_ . 'classes/db/DBMysqli.class.php');

-		require_once(_XE_PATH_ . 'classes/db/DBMysql_innodb.class.php');

-		require_once(_XE_PATH_ . 'classes/db/DBCubrid.class.php');

-		require_once(_XE_PATH_ . 'classes/db/DBMssql.class.php');

-		require_once(_XE_PATH_ . 'classes/xml/XmlParser.class.php');

-		require_once(_XE_PATH_ . 'classes/xml/XmlQueryParser.class.php');

+		require_once(_XE_PATH_.'classes/db/DB.class.php');

+		require_once(_XE_PATH_.'classes/db/DBMysql.class.php');

+		require_once(_XE_PATH_.'classes/db/DBMysqli.class.php');

+		require_once(_XE_PATH_.'classes/db/DBMysql_innodb.class.php');

+		require_once(_XE_PATH_.'classes/db/DBCubrid.class.php');

+		require_once(_XE_PATH_.'classes/db/DBMssql.class.php');

+		require_once(_XE_PATH_.'classes/xml/XmlParser.class.php');

+		require_once(_XE_PATH_.'classes/xml/XmlQueryParser.class.php');

 

-		require_once(__DIR__ . '/connect_wrapper.php');

+		require_once(__DIR__.'/connect_wrapper.php');

 

 		// check $query_args, $query_args_file

-		if($query_args_file)

+		if ($query_args_file)

 		{

 			try

 			{

@@ -1821,11 +1808,11 @@ 
 		}

 		else

 		{

-			if($query_args)

+			if ($query_args)

 			{

 				try

 				{

-					eval('$query_user_args = array(' . $query_args . ');');

+					eval('$query_user_args = array('.$query_args.');');

 				}

 				catch (Exception $exc)

 				{

@@ -1841,26 +1828,25 @@ 
 

 	$schema_file = NULL;

 	$schemas_set =

-		array

-			(

-				'delete' => __DIR__ . '/xml_delete.xsd',

-				'update' => __DIR__ . '/xml_update.xsd',

-				'select' => __DIR__ . '/xml_select.xsd',

-				'insert' => __DIR__ . '/xml_insert.xsd',

-				'insert-select' => __DIR__ . '/xml_insert_select.xsd'

+		array(

+				'delete' => __DIR__.'/xml_delete.xsd',

+				'update' => __DIR__.'/xml_update.xsd',

+				'select' => __DIR__.'/xml_select.xsd',

+				'insert' => __DIR__.'/xml_insert.xsd',

+				'insert-select' => __DIR__.'/xml_insert_select.xsd'

 			);

-	$table_schema = __DIR__ . '/xml_create_table.xsd';

+	$table_schema = __DIR__.'/xml_create_table.xsd';

 

 	$domDocument = new DOMDocument();

 

 	$i = 1;

 

-	if(pathinfo($argv[1], PATHINFO_EXTENSION) == 'xsd')

+	if (pathinfo($argv[1], PATHINFO_EXTENSION) == 'xsd')

 	{

 		$schema_file = $argv[$i++];

 	}

 	

-	for(; $i < count($argv); $i++)

+	for (; $i < count($argv); $i++)

 	{

 		try

 		{

@@ -1869,7 +1855,7 @@ 
 			$use_schema_language = $schema_language;

 

 			$retcode->push(ReturnCode::RETCODE_GENERIC_XML_SYNTAX);

-			if($domDocument->load($argv[$i]))

+			if ($domDocument->load($argv[$i]))

 			{

 				$retcode->pop();

 

@@ -1883,7 +1869,7 @@ 
 					}

 				}

 

-				if(!$schema_file && !$use_schema_language

+				if (!$schema_file && !$use_schema_language

 							&&

 						(

 							$queryElement->tagName != 'query'

@@ -1895,15 +1881,15 @@ 
 

 					throw

 						new ErrorMessage(

-								"{$argv[$i]}:" .

-								"		Root element should be <query> and should have an action attribute of:" .

-								"		insert, insert-select, select, update or delete." .

-								"		Otherwise an explicit schema, to validate the document with, should be" .

+								"{$argv[$i]}:".

+								"		Root element should be <query> and should have an action attribute of:".

+								"		insert, insert-select, select, update or delete.".

+								"		Otherwise an explicit schema, to validate the document with, should be".

 								"		specified as first argument on the command line."

 							);

 				}

 

-				if(!$schema_file && !$use_schema_language && !$skip_query_id

+				if (!$schema_file && !$use_schema_language && !$skip_query_id

 							&&

 						!validate_query_id($argv[$i], $queryElement->getAttribute('id')))

 				{

@@ -1912,28 +1898,28 @@ 
 

 					throw

 						new ErrorMessage(

-							"{$argv[$i]}(" . $queryElement->getLineNo() . "):\n\tQuery 'id' attribute value \"{$query_id}\" should match file name."

+							"{$argv[$i]}(".$queryElement->getLineNo()."):\n\tQuery 'id' attribute value \"{$query_id}\" should match file name."

 						);

 				}

 

-				if($use_schema_language)

+				if ($use_schema_language)

 				{

 					$document_schema = $table_schema;

 				}

 				else

 				{

-					if(!$document_schema)

+					if (!$document_schema)

 					{

 						$document_schema = $schemas_set[$queryElement->getAttribute('action')];

 					}

 				}

 

 				$retcode->push(ReturnCode::RETCODE_XSD_VALIDATION);

-				if($domDocument->schemaValidate($document_schema))

+				if ($domDocument->schemaValidate($document_schema))

 				{

 					$retcode->pop();

 

-					if($use_schema_language)

+					if ($use_schema_language)

 					{

 						validate_schema_doc($argv[$i], $domDocument->documentElement);

 					}

@@ -1944,22 +1930,22 @@ 
 					$success = TRUE;

 				}

 

-				if(!$validate_only)

+				if (!$validate_only)

 				{

 					// Generate SQL with the db provider back-ends

 

-					if(function_exists('sys_get_temp_dir'))

+					if (function_exists('sys_get_temp_dir'))

 					{

 						$tmpdir = sys_get_temp_dir();

 					}

 					else

 					{

 						$tmpdir = getenv('TEMP');

-						if(!$tmpdir)

+						if (!$tmpdir)

 						{

 							$tmpdir = getenv('TMP');

 						}

-						if(!$tmpdir)

+						if (!$tmpdir)

 						{

 							$tmpdir = '/tmp';

 						}

@@ -1968,30 +1954,29 @@ 
 

 					global $_SERVER;

 

-					if(!is_array($_SERVER))

+					if (!is_array($_SERVER))

 					{

 						$_SERVER = array();

 					}

 

-					if(!array_key_exists('REMOTE_ADDR', $_SERVER))

+					if (!array_key_exists('REMOTE_ADDR', $_SERVER))

 					{

 						$_SERVER['REMOTE_ADDR'] = '127.0.0.1';

 					}

 

 					$set_db_info_methods =

-						array

-							(

+						array(

 								'mysql'		=> 'setMysqlDBInfo',

 								'mysqli'	=> 'setMysqliDBInfo',

 								'cubrid'	=> 'setCubridDBInfo',

 								'mssql'		=> 'setMssqlDBInfo'

 							);

 

-					foreach($set_db_info_methods as $db_type => $set_info_method)

+					foreach ($set_db_info_methods as $db_type => $set_info_method)

 					{

 						Context::$set_info_method(); // calls setMysqlDBInfo()/setCubridDBInfo()/...

 

-						if($use_schema_language)

+						if ($use_schema_language)

 						{

 							$GLOBALS['__DB__'][$db_type]->queries = '';

 							$GLOBALS['__DB__'][$db_type]->createTableByXmlFile($argv[$i]);

@@ -2010,39 +1995,38 @@ 
 							// copied from classes/db/DB.class.php

 							$oParser = new XmlQueryParser();

 							$args_array =

-								$oParser->parse_xml_query

-									(

+								$oParser->parse_xml_query(

 										pathinfo($argv[$i], PATHINFO_FILENAME), // query id

-										$argv[$i],								// xml file

+										$argv[$i], // xml file

 										$unlink_tmpfile->file_name				// cache file

 									);

 							$args_array = $args_array->queryTag->getArguments();

 

 							$GLOBALS['__DB__'][$db_type]->queries = '';

 							$k = 1;

-							foreach($args_array as $arg)

+							foreach ($args_array as $arg)

 							{

-								if(// why would there be a query arg without a var name ?

+								if (// why would there be a query arg without a var name ?

 										isset($arg->variable_name)

 											&&

 										!array_key_exists($arg->variable_name, $query_user_args))

 								{

-									if(isset($arg->argument_validator))

+									if (isset($arg->argument_validator))

 									{

-										if(FALSE	// some default values are to be parsed by php, some are not...

+										if (FALSE	// some default values are to be parsed by php, some are not...

 													&&

 												isset($arg->argument_validator->default_value)

 													&&

 												isset($arg->argument_validator->default_value->value))

 										{

 											$query_user_args[$arg->variable_name] =

-												eval('return ' . $arg->argument_validator->default_value->toString() . ';');

+												eval('return '.$arg->argument_validator->default_value->toString().';');

 										}

 										else

 										{

-											if($arg->argument_validator->filter)

+											if ($arg->argument_validator->filter)

 											{

-												switch($arg->argument_validator->filter)

+												switch ($arg->argument_validator->filter)

 												{

 													case 'email':

 													case 'email_address':

@@ -2081,18 +2065,17 @@ 
 										}

 									}

 

-									if(!array_key_exists($arg->variable_name, $query_user_args))

+									if (!array_key_exists($arg->variable_name, $query_user_args))

 									{

 										$query_user_args[$arg->variable_name] = sprintf('%06d', $k);

 									}

 

-									if(isset($arg->argument_validator))

+									if (isset($arg->argument_validator))

 									{

-										if(isset($arg->argument_validator->min_length))

+										if (isset($arg->argument_validator->min_length))

 										{

 											$query_user_args[$arg->variable_name] =

-												str_pad

-													(

+												str_pad(

 														$query_user_args[$arg->variable_name],

 														$arg->argument_validator->min_length,

 														isset($arg->argument_validator->filter) &&

@@ -2105,11 +2088,10 @@ 
 													);

 										}

 

-										if(isset($arg->argument_validator->max_length))

+										if (isset($arg->argument_validator->max_length))

 										{

 											$query_user_args[$arg->variable_name] =

-												substr

-													(

+												substr(

 														$query_user_args[$arg->variable_name],

 														0, 

 														$arg->argument_validator->max_length

@@ -2122,15 +2104,14 @@ 
 							}

 

 							$resultset = 

-								$GLOBALS['__DB__'][$db_type]->_executeQuery

-									(

-										$unlink_tmpfile->file_name,		// cache_file

-										(object)$query_user_args,		// source_args

-										basename($argv[$i]),			// query_id

+								$GLOBALS['__DB__'][$db_type]->_executeQuery(

+										$unlink_tmpfile->file_name, // cache_file

+										(object) $query_user_args, // source_args

+										basename($argv[$i]), // query_id

 										array()							// arg_columns

 									);

 

-							if(is_a($resultset, 'BaseObject') && !$resultset->toBool())

+							if (is_a($resultset, 'BaseObject') && !$resultset->toBool())

 							{

 								throw new XmlSchemaError($argv[$i], -1, 'mysql SQL query generation failed');

 							}

@@ -2147,7 +2128,7 @@ 
 				}

 			}

 

-			if(!$success)

+			if (!$success)

 			{

 				libXmlDisplayError($argv[$i], TRUE);

 			}

@@ -2156,21 +2137,21 @@ 
 		{

 			$retcode->code(ReturnCode::RETCODE_BUILTIN_CHECKS);

 

-			fwrite(STDERR, $exc->getMessage() . "\n");

+			fwrite(STDERR, $exc->getMessage()."\n");

 		}

 		catch (ErrorMessage $exc)

 		{

-			if($retcode->code() == ReturnCode::RETCODE_SUCCESS)

+			if ($retcode->code() == ReturnCode::RETCODE_SUCCESS)

 			{

 				$retcode->code(ReturnCode::RETCODE_VALIDATOR_INTERNAL);

 			}

 

-			fwrite(STDERR, $exc->getMessage() . "\n");

+			fwrite(STDERR, $exc->getMessage()."\n");

 			libXmlDisplayError($argv[$i]);

 		}

 		catch (ErrorException $exc)

 		{

-			if($retcode->code() == ReturnCode::RETCODE_SUCCESS)

+			if ($retcode->code() == ReturnCode::RETCODE_SUCCESS)

 			{

 				$retcode->code(ReturnCode::RETCODE_VALIDATOR_INTERNAL);

 			}

@@ -2183,7 +2164,7 @@ 
 		{

 			$retcode->code(ReturnCode::RETCODE_VALIDATOR_INTERNAL);

 

-			fwrite(STDERR, $exc->getMessage() . "\n");

+			fwrite(STDERR, $exc->getMessage()."\n");

 			fwrite(STDERR, $exc->getTraceAsString());

 			libXmlDisplayError($argv[$i]);

 		}

@@ -2193,22 +2174,22 @@ 
 }

 catch (SyntaxError $syntax)

 {

-	fwrite(STDERR, $syntax->getMessage() . "\n");

-	exit(254);	// wrong command line

+	fwrite(STDERR, $syntax->getMessage()."\n");

+	exit(254); // wrong command line

 				// 255 is reserved by php (for parse errors, etc.)

 }

 catch (ErrorMessage $exc)

 {

-	fwrite(STDERR, $exc->getMessage() . "\n");

+	fwrite(STDERR, $exc->getMessage()."\n");

 	libXmlDisplayError();

-	exit(ReturnCode::RETCODE_VALIDATOR_INTERNAL);		// internal validator error

+	exit(ReturnCode::RETCODE_VALIDATOR_INTERNAL); // internal validator error

 }

 catch (Exception $exc)

 {

-	fwrite(STDERR, $exc->getFile() . '(' . $exc->getLine() . ")\n\t" . $exc->getMessage() . "\n");

+	fwrite(STDERR, $exc->getFile().'('.$exc->getLine().")\n\t".$exc->getMessage()."\n");

 	fwrite(STDERR, $exc->getTraceAsString());

 	libXmlDisplayError();

-	exit(ReturnCode::RETCODE_VALIDATOR_INTERNAL);		// internal validator error

+	exit(ReturnCode::RETCODE_VALIDATOR_INTERNAL); // internal validator error

 }

 

 /* End of file validate.php */

Braces +33 added lines, -66 removed lines

@@ -150,13 +150,11 @@ 
 		if($throw_error)

 		{

 			throw new ErrorMessage($msg);

-		}

-		else

+		} else

 		{

 			fwrite(STDERR, $msg . "\n");

 		}

-	}

-	else

+	} else

 	{

 		if($throw_error)

 		{

@@ -346,8 +344,7 @@ 
 					"\nANSI SQL-99 declares the table specification as required."

 				);

 		}

-	}

-	else

+	} else

 	{

 		// base table or view

 

@@ -369,13 +366,11 @@ 
 									$child_node->getLineNo(),

 									'Duplicate <conditions> elements.'

 								);

-						}

-						else

+						} else

 						{

 							$has_conditions_element = TRUE;

 						}

-					}

-					else

+					} else

 					{

 						throw

 							new XmlSchemaError(

@@ -396,8 +391,7 @@ 
 						'Expected <conditions> element as content.'

 					);

 			}

-		}

-		else

+		} else

 		{

 			foreach($table_element->childNodes as $child_node)

 			{

@@ -609,8 +603,7 @@ 
 			if($first_child)

 			{

 				$first_child = FALSE;

-			}

-			else

+			} else

 			{

 				if(!$child_node->hasAttribute('pipe'))

 				{

@@ -629,14 +622,12 @@ 
 			if($child_node->tagName == 'group')

 			{

 				checkConditionsGroup($xml_file, $child_node);

-			}

-			else

+			} else

 			{

 				if($child_node->tagName == 'query')

 				{

 					validate_select_query($xml_file, $child_node);

-				}

-				else

+				} else

 				{

 					if($child_node->tagName == 'condition')

 					{

@@ -851,8 +842,7 @@ 
 			try

 			{

 				$success = chdir($this->dirname);

-			}

-			catch (Exception $e)

+			} catch (Exception $e)

 			{

 				print "Failed to restore working dir {$this->dirname}.";

 			}

@@ -921,8 +911,7 @@ 
 		if($lowercase_name[$i] != $uppercase_name[$i])

 		{

 			$varing_case_filename .= "[{$lowercase_name[$i]}{$uppercase_name[$i]}]";

-		}

-		else

+		} else

 		{

 			$varing_case_filename .= $lowercase_name[$i];

 		}

@@ -1119,8 +1108,7 @@ 
 		if($val == -1)

 		{

 			return $this->exit_code;

-		}

-		else

+		} else

 		{

 			if($this->exit_code < $val)

 			{

@@ -1488,8 +1476,7 @@ 
 				if(self::$db_info)

 				{

 					return self::$db_info->master_db['db_type'];

-				}

-				else

+				} else

 				{

 					return NULL;

 				}

@@ -1588,8 +1575,7 @@ 
 							&&

 						array_key_exists($db_info->master_db['db_type'], $GLOBALS['__DB__']))

 				{

-				}

-				else

+				} else

 				{

 					$GLOBALS['__DB__'][$db_info->master_db['db_type']] =

 						new DBMysqlConnectWrapper();

@@ -1630,8 +1616,7 @@ 
 							&&

 						array_key_exists($db_info->master_db['db_type'], $GLOBALS['__DB__']))

 				{

-				}

-				else

+				} else

 				{

 					$GLOBALS['__DB__'][$db_info->master_db['db_type']] =

 						new DBMysqliConnectWrapper();

@@ -1672,8 +1657,7 @@ 
 							&&

 						array_key_exists($db_info->master_db['db_type'], $GLOBALS['__DB__']))

 				{

-				}

-				else

+				} else

 				{

 					$GLOBALS['__DB__'][$db_info->master_db['db_type']] =

 						new DBCubridConnectWrapper();

@@ -1714,8 +1698,7 @@ 
 							&&

 						array_key_exists($db_info->master_db['db_type'], $GLOBALS['__DB__']))

 				{

-				}

-				else

+				} else

 				{

 					$GLOBALS['__DB__'][$db_info->master_db['db_type']] =

 						new DBMssqlConnectWrapper();

@@ -1812,22 +1795,19 @@ 
 			try

 			{

 				$query_user_args = require($query_args_file);

-			}

-			catch (Exception $exc)

+			} catch (Exception $exc)

 			{

 				fwrite(STDERR, "Error in arguments file.\n");

 				throw $exc;

 			}

-		}

-		else

+		} else

 		{

 			if($query_args)

 			{

 				try

 				{

 					eval('$query_user_args = array(' . $query_args . ');');

-				}

-				catch (Exception $exc)

+				} catch (Exception $exc)

 				{

 					fwrite(STDERR, "Error in arguments string.\n");

 					throw $exc;

@@ -1919,8 +1899,7 @@ 
 				if($use_schema_language)

 				{

 					$document_schema = $table_schema;

-				}

-				else

+				} else

 				{

 					if(!$document_schema)

 					{

@@ -1936,8 +1915,7 @@ 
 					if($use_schema_language)

 					{

 						validate_schema_doc($argv[$i], $domDocument->documentElement);

-					}

-					else

+					} else

 					{

 						validate_xml_query($argv[$i], $domDocument->documentElement);

 					}

@@ -1951,8 +1929,7 @@ 
 					if(function_exists('sys_get_temp_dir'))

 					{

 						$tmpdir = sys_get_temp_dir();

-					}

-					else

+					} else

 					{

 						$tmpdir = getenv('TEMP');

 						if(!$tmpdir)

@@ -2001,8 +1978,7 @@ 
 							print " {$db_type} query:\n";

 							print $GLOBALS['__DB__'][$db_type]->queries;

 							print "\n";

-						}

-						else

+						} else

 						{

 							$unlink_tmpfile =

 								new UnlinkFile(tempnam($tmpdir, 'xe_'));

@@ -2037,8 +2013,7 @@ 
 										{

 											$query_user_args[$arg->variable_name] =

 												eval('return ' . $arg->argument_validator->default_value->toString() . ';');

-										}

-										else

+										} else

 										{

 											if($arg->argument_validator->filter)

 											{

@@ -2133,8 +2108,7 @@ 
 							if(is_a($resultset, 'BaseObject') && !$resultset->toBool())

 							{

 								throw new XmlSchemaError($argv[$i], -1, 'mysql SQL query generation failed');

-							}

-							else

+							} else

 							{

 								print "\n";

 								print pathinfo($argv[$i], PATHINFO_FILENAME);

@@ -2151,14 +2125,12 @@ 
 			{

 				libXmlDisplayError($argv[$i], TRUE);

 			}

-		}

-		catch (XmlSchemaError $exc)

+		} catch (XmlSchemaError $exc)

 		{

 			$retcode->code(ReturnCode::RETCODE_BUILTIN_CHECKS);

 

 			fwrite(STDERR, $exc->getMessage() . "\n");

-		}

-		catch (ErrorMessage $exc)

+		} catch (ErrorMessage $exc)

 		{

 			if($retcode->code() == ReturnCode::RETCODE_SUCCESS)

 			{

@@ -2167,8 +2139,7 @@ 
 

 			fwrite(STDERR, $exc->getMessage() . "\n");

 			libXmlDisplayError($argv[$i]);

-		}

-		catch (ErrorException $exc)

+		} catch (ErrorException $exc)

 		{

 			if($retcode->code() == ReturnCode::RETCODE_SUCCESS)

 			{

@@ -2178,8 +2149,7 @@ 
 			fwrite(STDERR, "{$exc->getFile()}({$exc->getLine()}):\n\t{$exc->getMessage()}.\n");

 			fwrite(STDERR, $exc->getTraceAsString());

 			libXmlDisplayError($argv[$i]);

-		}

-		catch (Exception $exc)

+		} catch (Exception $exc)

 		{

 			$retcode->code(ReturnCode::RETCODE_VALIDATOR_INTERNAL);

 

@@ -2190,20 +2160,17 @@ 
 	}

 

 	exit($retcode->code());

-}

-catch (SyntaxError $syntax)

+} catch (SyntaxError $syntax)

 {

 	fwrite(STDERR, $syntax->getMessage() . "\n");

 	exit(254);	// wrong command line

 				// 255 is reserved by php (for parse errors, etc.)

-}

-catch (ErrorMessage $exc)

+} catch (ErrorMessage $exc)

 {

 	fwrite(STDERR, $exc->getMessage() . "\n");

 	libXmlDisplayError();

 	exit(ReturnCode::RETCODE_VALIDATOR_INTERNAL);		// internal validator error

-}

-catch (Exception $exc)

+} catch (Exception $exc)

 {

 	fwrite(STDERR, $exc->getFile() . '(' . $exc->getLine() . ")\n\t" . $exc->getMessage() . "\n");

 	fwrite(STDERR, $exc->getTraceAsString());

tools/minify/cssmin/CSSmin.php

Doc Comments +11 added lines, -2 removed lines

@@ -606,6 +606,11 @@ 
  * ---------------------------------------------------------------------------------------------
  */
 
+/**
+ * @param double $v1
+ * @param double $v2
+ * @param integer $vh
+ */
 private function hue_to_rgb($v1, $v2, $vh)
 {
 	$vh = $vh < 0 ? $vh + 1 : ($vh > 1 ? $vh - 1 : $vh);
@@ -620,6 +625,10 @@ 
 	return intval(floor(floatval($n) + 0.5), 10);
 }
 
+/**
+ * @param integer $min
+ * @param integer $max
+ */
 private function clamp_number($n, $min, $max)
 {
 	return min(max($n, $min), $max);
@@ -648,7 +657,7 @@ 
  *
  * @param string   $str
  * @param int      $from index
- * @param int|bool $to index (optional)
+ * @param integer $to index (optional)
  * @return string
  */
 private function substring($str, $from = 0, $to = FALSE)
@@ -680,7 +689,7 @@ 
  *
  * @param string   $str
  * @param int      $start index
- * @param int|bool $end index (optional)
+ * @param integer $end index (optional)
  * @return string
  */
 private function str_slice($str, $start = 0, $end = FALSE)

Braces +9 added lines, -3 removed lines

@@ -609,9 +609,15 @@
 private function hue_to_rgb($v1, $v2, $vh)
 {
 	$vh = $vh < 0 ? $vh + 1 : ($vh > 1 ? $vh - 1 : $vh);
-	if ($vh * 6 < 1) return $v1 + ($v2 - $v1) * 6 * $vh;
-	if ($vh * 2 < 1) return $v2;
-	if ($vh * 3 < 2) return $v1 + ($v2 - $v1) * ((2/3) - $vh) * 6;
+	if ($vh * 6 < 1) {
+		return $v1 + ($v2 - $v1) * 6 * $vh;
+	}
+	if ($vh * 2 < 1) {
+		return $v2;
+	}
+	if ($vh * 3 < 2) {
+		return $v1 + ($v2 - $v1) * ((2/3) - $vh) * 6;
+	}
 	return $v1;
 }
 

Spacing +31 added lines, -31 removed lines

@@ -47,7 +47,7 @@ 
 		$this->memory_limit = 128 * 1048576; // 128MB in bytes
 		$this->max_execution_time = 60; // 1 min
 		$this->pcre_backtrack_limit = 1000 * 1000;
-		$this->pcre_recursion_limit =  500 * 1000;
+		$this->pcre_recursion_limit = 500 * 1000;
 
 		$this->raise_php_limits = (bool) $raise_php_limits;
 	}
@@ -84,8 +84,8 @@ 
 			}
 		$comment_found = $this->str_slice($css, $start_index + 2, $end_index);
 		$this->comments[] = $comment_found;
-		$comment_preserve_string = self::COMMENT . (count($this->comments) - 1) . '___';
-		$css = $this->str_slice($css, 0, $start_index + 2) . $comment_preserve_string . $this->str_slice($css, $end_index);
+		$comment_preserve_string = self::COMMENT.(count($this->comments) - 1).'___';
+		$css = $this->str_slice($css, 0, $start_index + 2).$comment_preserve_string.$this->str_slice($css, $end_index);
 		// Set correct start_index: Fixes issue #2528130
 		$start_index = $end_index + 2 + strlen($comment_preserve_string) - strlen($comment_found);
 	}
@@ -145,7 +145,7 @@ 
 }
 
 // Update the first chunk and push the charset to the top of the file.
-$css_chunks[0] = $charset . $css_chunks[0];
+$css_chunks[0] = $charset.$css_chunks[0];
 
 return implode('', $css_chunks);
 }
@@ -220,17 +220,17 @@ 
 	for ($i = 0, $max = count($this->comments); $i < $max; $i++) {
 
 		$token = $this->comments[$i];
-		$placeholder = '/' . self::COMMENT . $i . '___/';
+		$placeholder = '/'.self::COMMENT.$i.'___/';
 
 		// ! in the first position of the comment means preserve
 		// so push to the preserved tokens keeping the !
 		if (substr($token, 0, 1) === '!') {
 			$this->preserved_tokens[] = $token;
-			$token_tring = self::TOKEN . (count($this->preserved_tokens) - 1) . '___';
+			$token_tring = self::TOKEN.(count($this->preserved_tokens) - 1).'___';
 			$css = preg_replace($placeholder, $token_tring, $css, 1);
 			// Preserve new lines for /*! important comments
-			$css = preg_replace('/\s*[\n\r\f]+\s*(\/\*'. $token_tring .')/S', self::NL.'$1', $css);
-			$css = preg_replace('/('. $token_tring .'\*\/)\s*[\n\r\f]+\s*/S', '$1'.self::NL, $css);
+			$css = preg_replace('/\s*[\n\r\f]+\s*(\/\*'.$token_tring.')/S', self::NL.'$1', $css);
+			$css = preg_replace('/('.$token_tring.'\*\/)\s*[\n\r\f]+\s*/S', '$1'.self::NL, $css);
 			continue;
 		}
 
@@ -238,10 +238,10 @@ 
 		// shorten that to /*\*/ and the next one to /**/
 		if (substr($token, (strlen($token) - 1), 1) === '\\') {
 			$this->preserved_tokens[] = '\\';
-			$css = preg_replace($placeholder,  self::TOKEN . (count($this->preserved_tokens) - 1) . '___', $css, 1);
+			$css = preg_replace($placeholder, self::TOKEN.(count($this->preserved_tokens) - 1).'___', $css, 1);
 			$i = $i + 1; // attn: advancing the loop
 			$this->preserved_tokens[] = '';
-			$css = preg_replace('/' . self::COMMENT . $i . '___/',  self::TOKEN . (count($this->preserved_tokens) - 1) . '___', $css, 1);
+			$css = preg_replace('/'.self::COMMENT.$i.'___/', self::TOKEN.(count($this->preserved_tokens) - 1).'___', $css, 1);
 			continue;
 		}
 
@@ -252,13 +252,13 @@ 
 			if ($start_index > 2) {
 				if (substr($css, $start_index - 3, 1) === '>') {
 					$this->preserved_tokens[] = '';
-					$css = preg_replace($placeholder,  self::TOKEN . (count($this->preserved_tokens) - 1) . '___', $css, 1);
+					$css = preg_replace($placeholder, self::TOKEN.(count($this->preserved_tokens) - 1).'___', $css, 1);
 				}
 			}
 		}
 
 		// in all other cases kill the comment
-		$css = preg_replace('/\/\*' . $this->str_slice($placeholder, 1, -1) . '\*\//', '', $css, 1);
+		$css = preg_replace('/\/\*'.$this->str_slice($placeholder, 1, -1).'\*\//', '', $css, 1);
 	}
 
 
@@ -291,7 +291,7 @@ 
 	// Swap out any pseudo-class colons with the token, and then swap back.
 	$css = preg_replace_callback('/(?:^|\})(?:(?:[^\{\:])+\:)+(?:[^\{]*\{)/', array($this, 'replace_colon'), $css);
 	$css = preg_replace('/\s+([\!\{\}\;\:\>\+\(\)\]\~\=,])/', '$1', $css);
-	$css = preg_replace('/' . self::CLASSCOLON . '/', ':', $css);
+	$css = preg_replace('/'.self::CLASSCOLON.'/', ':', $css);
 
 	// retain space for special IE6 cases
 	$css = preg_replace('/\:first\-(line|letter)(\{|,)/i', ':first-$1 $2', $css);
@@ -355,7 +355,7 @@ 
 					while ($i < strlen($css)) {
 					$i++;
 					if ($css[$i - 1] === '}' && $i - $start_index > $linebreak_pos) {
-					$css = $this->str_slice($css, 0, $i) . "\n" . $this->str_slice($css, $i);
+					$css = $this->str_slice($css, 0, $i)."\n".$this->str_slice($css, $i);
 					$start_index = $i;
 					}
 					}
@@ -366,11 +366,11 @@ 
 					$css = preg_replace('/;;+/', ';', $css);
 
 					// Restore new lines for /*! important comments
-					$css = preg_replace('/'. self::NL .'/', "\n", $css);
+					$css = preg_replace('/'.self::NL.'/', "\n", $css);
 
 					// restore preserved comments and strings
 					for ($i = 0, $max = count($this->preserved_tokens); $i < $max; $i++) {
-						$css = preg_replace('/' . self::TOKEN . $i . '___/', $this->preserved_tokens[$i], $css, 1);
+						$css = preg_replace('/'.self::TOKEN.$i.'___/', $this->preserved_tokens[$i], $css, 1);
 					}
 
 					// Trim the final string (for any leading or trailing white spaces)
@@ -410,7 +410,7 @@ 
 			$terminator = ')';
 		}
 
-		while ($found_terminator === FALSE && $end_index+1 <= $max_index) {
+		while ($found_terminator === FALSE && $end_index + 1 <= $max_index) {
 			$end_index = $this->index_of($css, $terminator, $end_index + 1);
 
 			// endIndex == 0 doesn't really apply here
@@ -430,7 +430,7 @@ 
 			$token = preg_replace('/\s+/', '', $token);
 			$this->preserved_tokens[] = $token;
 
-			$preserver = 'url(' . self::TOKEN . (count($this->preserved_tokens) - 1) . '___)';
+			$preserver = 'url('.self::TOKEN.(count($this->preserved_tokens) - 1).'___)';
 			$sb[] = $preserver;
 
 			$append_index = $end_index + 1;
@@ -491,16 +491,16 @@ 
 
 		if ($is_filter) {
 			// Restore, maintain case, otherwise filter will break
-			$sb[] = $m[1] . '#' . $m[2] . $m[3] . $m[4] . $m[5] . $m[6] . $m[7];
+			$sb[] = $m[1].'#'.$m[2].$m[3].$m[4].$m[5].$m[6].$m[7];
 		} else {
 			if (strtolower($m[2]) == strtolower($m[3]) &&
 					strtolower($m[4]) == strtolower($m[5]) &&
 					strtolower($m[6]) == strtolower($m[7])) {
 				// Compress.
-				$hex = '#' . strtolower($m[3] . $m[5] . $m[7]);
+				$hex = '#'.strtolower($m[3].$m[5].$m[7]);
 			} else {
 				// Non compressible color, restore but lower case.
-				$hex = '#' . strtolower($m[2] . $m[3] . $m[4] . $m[5] . $m[6] . $m[7]);
+				$hex = '#'.strtolower($m[2].$m[3].$m[4].$m[5].$m[6].$m[7]);
 			}
 			// replace Hex colors to short safe color names
 			$sb[] = array_key_exists($hex, $short_safe) ? $short_safe[$hex] : $hex;
@@ -529,7 +529,7 @@ 
 	// one, maybe more? put'em back then
 	if (($pos = $this->index_of($match, self::COMMENT)) >= 0) {
 		for ($i = 0, $max = count($this->comments); $i < $max; $i++) {
-			$match = preg_replace('/' . self::COMMENT . $i . '___/', $this->comments[$i], $match, 1);
+			$match = preg_replace('/'.self::COMMENT.$i.'___/', $this->comments[$i], $match, 1);
 		}
 	}
 
@@ -537,7 +537,7 @@ 
 	$match = preg_replace('/progid\:DXImageTransform\.Microsoft\.Alpha\(Opacity\=/i', 'alpha(opacity=', $match);
 
 			$this->preserved_tokens[] = $match;
-			return $quote . self::TOKEN . (count($this->preserved_tokens) - 1) . '___' . $quote;
+			return $quote.self::TOKEN.(count($this->preserved_tokens) - 1).'___'.$quote;
 			}
 
 			private function replace_colon($matches)
@@ -548,13 +548,13 @@ 
 			private function replace_calc($matches)
 			{
 			$this->preserved_tokens[] = preg_replace('/\s?([\*\/\(\),])\s?/', '$1', $matches[0]);
-			return self::TOKEN . (count($this->preserved_tokens) - 1) . '___';
+			return self::TOKEN.(count($this->preserved_tokens) - 1).'___';
 			}
 
 			private function rgb_to_hex($matches)
 			{
 			// Support for percentage values rgb(100%, 0%, 45%);
-			if ($this->index_of($matches[1], '%') >= 0){
+			if ($this->index_of($matches[1], '%') >= 0) {
 				$rgbcolors = explode(',', str_replace('%', '', $matches[1]));
 				for ($i = 0; $i < count($rgbcolors); $i++) {
 					$rgbcolors[$i] = $this->round_number(floatval($rgbcolors[$i]) * 2.55);
@@ -570,11 +570,11 @@ 
 			}
 
 			// Fix for issue #2528093
-			if (!preg_match('/[\s\,\);\}]/', $matches[2])){
-				$matches[2] = ' ' . $matches[2];
+			if (!preg_match('/[\s\,\);\}]/', $matches[2])) {
+				$matches[2] = ' '.$matches[2];
 			}
 
-			return '#' . implode('', $rgbcolors) . $matches[2];
+			return '#'.implode('', $rgbcolors).$matches[2];
 			}
 
 private function hsl_to_hex($matches)
@@ -594,9 +594,9 @@ 
 	} else {
 		$v2 = $l < 0.5 ? $l * (1 + $s) : ($l + $s) - ($s * $l);
 		$v1 = (2 * $l) - $v2;
-		$r = $this->round_number(255 * $this->hue_to_rgb($v1, $v2, $h + (1/3)));
+		$r = $this->round_number(255 * $this->hue_to_rgb($v1, $v2, $h + (1 / 3)));
 		$g = $this->round_number(255 * $this->hue_to_rgb($v1, $v2, $h));
-		$b = $this->round_number(255 * $this->hue_to_rgb($v1, $v2, $h - (1/3)));
+		$b = $this->round_number(255 * $this->hue_to_rgb($v1, $v2, $h - (1 / 3)));
 	}
 
 	return $this->rgb_to_hex(array('', $r.','.$g.','.$b, $matches[2]));
@@ -611,7 +611,7 @@ 
 	$vh = $vh < 0 ? $vh + 1 : ($vh > 1 ? $vh - 1 : $vh);
 	if ($vh * 6 < 1) return $v1 + ($v2 - $v1) * 6 * $vh;
 	if ($vh * 2 < 1) return $v2;
-	if ($vh * 3 < 2) return $v1 + ($v2 - $v1) * ((2/3) - $vh) * 6;
+	if ($vh * 3 < 2) return $v1 + ($v2 - $v1) * ((2 / 3) - $vh) * 6;
 	return $v1;
 }
 

tools/minify/jsminplus/jsminplus.php

Doc Comments +35 added lines

@@ -114,6 +114,9 @@ 
 		$this->parser = new JSParser();
 	}
 
+	/**
+	 * @return string
+	 */
 	public static function minify($js, $filename='')
 	{
 		static $instance;
@@ -125,6 +128,9 @@ 
 		return $instance->min($js, $filename);
 	}
 
+	/**
+	 * @param string $filename
+	 */
 	private function min($js, $filename)
 	{
 		try
@@ -140,6 +146,9 @@ 
 		return false;
 	}
 
+	/**
+	 * @param JSNode $n
+	 */
 	private function parseTree($n, $noBlockGrouping = false)
 	{
 		$s = '';
@@ -545,6 +554,9 @@ 
 		return $s;
 	}
 
+	/**
+	 * @param string $string
+	 */
 	private function isValidIdentifier($string)
 	{
 		return preg_match('/^[a-zA-Z_][a-zA-Z0-9_]*$/', $string) && !in_array($string, $this->reserved);
@@ -608,6 +620,9 @@ 
 		$this->t = new JSTokenizer();
 	}
 
+	/**
+	 * @param integer $l
+	 */
 	public function parse($s, $f, $l)
 	{
 		// initialize tokenizer
@@ -621,6 +636,9 @@ 
 		return $n;
 	}
 
+	/**
+	 * @param JSCompilerContext $x
+	 */
 	private function Script($x)
 	{
 		$n = $this->Statements($x);
@@ -971,6 +989,10 @@ 
 		return $n;
 	}
 
+	/**
+	 * @param boolean $requireName
+	 * @param integer $functionForm
+	 */
 	private function FunctionDefinition($x, $requireName, $functionForm)
 	{
 		$f = new JSNode($this->t);
@@ -1437,6 +1459,10 @@ 
 	}
 
 	// Statement stack and nested statement handler.
+
+	/**
+	 * @param JSNode $node
+	 */
 	private function nest($x, $node, $end = false)
 	{
 		array_push($x->stmtStack, $node);
@@ -1501,6 +1527,9 @@ 
 	public $funDecls = array();
 	public $varDecls = array();
 
+	/**
+	 * @param boolean $inFunction
+	 */
 	public function __construct($inFunction)
 	{
 		$this->inFunction = $inFunction;
@@ -1519,6 +1548,9 @@ 
 	public $funDecls = array();
 	public $varDecls = array();
 
+	/**
+	 * @param JSTokenizer $t
+	 */
 	public function __construct($t, $type=0)
 	{
 		if ($token = $t->currentToken())
@@ -1673,6 +1705,9 @@ 
 		$this->scanOperand = true;
 	}
 
+	/**
+	 * @param integer|null $chunksize
+	 */
 	public function getInput($chunksize)
 	{
 		if ($chunksize)

Indentation +6 added lines, -6 removed lines

@@ -786,10 +786,10 @@ 
 			return $n;
 
 			case KEYWORD_WHILE:
-			        $n = new JSNode($this->t);
-			        $n->isLoop = true;
-			        $n->condition = $this->ParenExpression($x);
-			        $n->body = $this->nest($x, $n);
+					$n = new JSNode($this->t);
+					$n->isLoop = true;
+					$n->condition = $this->ParenExpression($x);
+					$n->body = $this->nest($x, $n);
 			return $n;
 
 			case KEYWORD_DO:
@@ -909,7 +909,7 @@ 
 
 			case KEYWORD_VAR:
 			case KEYWORD_CONST:
-			        $n = $this->Variables($x);
+					$n = $this->Variables($x);
 			break;
 
 			case TOKEN_CONDCOMMENT_START:
@@ -1693,7 +1693,7 @@ 
 
 	public function mustMatch($tt)
 	{
-	        if (!$this->match($tt))
+			if (!$this->match($tt))
 			throw $this->newSyntaxError('Unexpected token; token ' . $tt . ' expected');
 
 		return $this->currentToken();

Braces +350 added lines, -274 removed lines

@@ -119,8 +119,9 @@ 
 		static $instance;
 
 		// this is a singleton
-		if(!$instance)
-			$instance = new JSMinPlus();
+		if(!$instance) {
+					$instance = new JSMinPlus();
+		}
 
 		return $instance->min($js, $filename);
 	}
@@ -131,8 +132,7 @@ 
 		{
 			$n = $this->parser->parse($js, $filename, 1);
 			return $this->parseTree($n);
-		}
-		catch(Exception $e)
+		} catch(Exception $e)
 		{
 			echo $e->getMessage() . "\n";
 		}
@@ -149,8 +149,9 @@ 
 			case KEYWORD_FUNCTION:
 				$s .= 'function' . ($n->name ? ' ' . $n->name : '') . '(';
 				$params = $n->params;
-				for ($i = 0, $j = count($params); $i < $j; $i++)
-					$s .= ($i ? ',' : '') . $params[$i];
+				for ($i = 0, $j = count($params); $i < $j; $i++) {
+									$s .= ($i ? ',' : '') . $params[$i];
+				}
 				$s .= '){' . $this->parseTree($n->body, true) . '}';
 			break;
 
@@ -176,13 +177,11 @@ 
 							{
 								// put declared functions on a new line
 								$s .= "\n";
-							}
-							elseif ($type == KEYWORD_VAR && $type == $lastType)
+							} elseif ($type == KEYWORD_VAR && $type == $lastType)
 							{
 								// mutiple var-statements can go into one
 								$t = ',' . substr($t, 4);
-							}
-							else
+							} else
 							{
 								// add terminator
 								$s .= ';';
@@ -208,24 +207,26 @@ 
 				$elsePart = $n->elsePart ? $this->parseTree($n->elsePart) : null;
 
 				// empty if-statement
-				if ($thenPart == '')
-					$thenPart = ';';
+				if ($thenPart == '') {
+									$thenPart = ';';
+				}
 
 				if ($elsePart)
 				{
 					// be carefull and always make a block out of the thenPart; could be more optimized but is a lot of trouble
-					if ($thenPart != ';' && $thenPart[0] != '{')
-						$thenPart = '{' . $thenPart . '}';
+					if ($thenPart != ';' && $thenPart[0] != '{') {
+											$thenPart = '{' . $thenPart . '}';
+					}
 
 					$s .= $thenPart . 'else';
 
 					// we could check for more, but that hardly ever applies so go for performance
-					if ($elsePart[0] != '{')
-						$s .= ' ';
+					if ($elsePart[0] != '{') {
+											$s .= ' ';
+					}
 
 					$s .= $elsePart;
-				}
-				else
+				} else
 				{
 					$s .= $thenPart;
 				}
@@ -237,18 +238,20 @@ 
 				for ($i = 0, $j = count($cases); $i < $j; $i++)
 				{
 					$case = $cases[$i];
-					if ($case->type == KEYWORD_CASE)
-						$s .= 'case' . ($case->caseLabel->type != TOKEN_STRING ? ' ' : '') . $this->parseTree($case->caseLabel) . ':';
-					else
-						$s .= 'default:';
+					if ($case->type == KEYWORD_CASE) {
+											$s .= 'case' . ($case->caseLabel->type != TOKEN_STRING ? ' ' : '') . $this->parseTree($case->caseLabel) . ':';
+					} else {
+											$s .= 'default:';
+					}
 
 					$statement = $this->parseTree($case->statements, true);
 					if ($statement)
 					{
 						$s .= $statement;
 						// no terminator for last statement
-						if ($i + 1 < $j)
-							$s .= ';';
+						if ($i + 1 < $j) {
+													$s .= ';';
+						}
 					}
 				}
 				$s .= '}';
@@ -260,8 +263,9 @@ 
 					. ';' . ($n->update ? $this->parseTree($n->update) : '') . ')';
 
 				$body  = $this->parseTree($n->body);
-				if ($body == '')
-					$body = ';';
+				if ($body == '') {
+									$body = ';';
+				}
 
 				$s .= $body;
 			break;
@@ -270,8 +274,9 @@ 
 				$s = 'while(' . $this->parseTree($n->condition) . ')';
 
 				$body  = $this->parseTree($n->body);
-				if ($body == '')
-					$body = ';';
+				if ($body == '') {
+									$body = ';';
+				}
 
 				$s .= $body;
 			break;
@@ -280,8 +285,9 @@ 
 				$s = 'for(' . ($n->varDecl ? $this->parseTree($n->varDecl) : $this->parseTree($n->iterator)) . ' in ' . $this->parseTree($n->object) . ')';
 
 				$body  = $this->parseTree($n->body);
-				if ($body == '')
-					$body = ';';
+				if ($body == '') {
+									$body = ';';
+				}
 
 				$s .= $body;
 			break;
@@ -303,8 +309,9 @@ 
 					$t = $catchClauses[$i];
 					$s .= 'catch(' . $t->varName . ($t->guard ? ' if ' . $this->parseTree($t->guard) : '') . '){' . $this->parseTree($t->block, true) . '}';
 				}
-				if ($n->finallyBlock)
-					$s .= 'finally{' . $this->parseTree($n->finallyBlock, true) . '}';
+				if ($n->finallyBlock) {
+									$s .= 'finally{' . $this->parseTree($n->finallyBlock, true) . '}';
+				}
 			break;
 
 			case KEYWORD_THROW:
@@ -320,8 +327,9 @@ 
 					{
 						if (	$t[0] != '(' && $t[0] != '[' && $t[0] != '{' &&
 							$t[0] != '"' && $t[0] != "'" && $t[0] != '/'
-						)
-							$s .= ' ';
+						) {
+													$s .= ' ';
+						}
 
 						$s .= $t;
 					}
@@ -341,8 +349,9 @@ 
 					$t = $childs[$i];
 					$s .= ($i ? ',' : '') . $t->name;
 					$u = $t->initializer;
-					if ($u)
-						$s .= '=' . $this->parseTree($u);
+					if ($u) {
+											$s .= '=' . $this->parseTree($u);
+					}
 				}
 			break;
 
@@ -354,13 +363,15 @@ 
 			case TOKEN_CONDCOMMENT_END:
 				$s = $n->value . ($n->type == TOKEN_CONDCOMMENT_START ? ' ' : '');
 				$childs = $n->treeNodes;
-				for ($i = 0, $j = count($childs); $i < $j; $i++)
-					$s .= $this->parseTree($childs[$i]);
+				for ($i = 0, $j = count($childs); $i < $j; $i++) {
+									$s .= $this->parseTree($childs[$i]);
+				}
 			break;
 
 			case OP_SEMICOLON:
-				if ($expression = $n->expression)
-					$s = $this->parseTree($expression);
+				if ($expression = $n->expression) {
+									$s = $this->parseTree($expression);
+				}
 			break;
 
 			case JS_LABEL:
@@ -369,8 +380,9 @@ 
 
 			case OP_COMMA:
 				$childs = $n->treeNodes;
-				for ($i = 0, $j = count($childs); $i < $j; $i++)
-					$s .= ($i ? ',' : '') . $this->parseTree($childs[$i]);
+				for ($i = 0, $j = count($childs); $i < $j; $i++) {
+									$s .= ($i ? ',' : '') . $this->parseTree($childs[$i]);
+				}
 			break;
 
 			case OP_ASSIGN:
@@ -449,10 +461,11 @@ 
 
 			case OP_INCREMENT:
 			case OP_DECREMENT:
-				if ($n->postfix)
-					$s = $this->parseTree($n->treeNodes[0]) . $n->value;
-				else
-					$s = $n->value . $this->parseTree($n->treeNodes[0]);
+				if ($n->postfix) {
+									$s = $this->parseTree($n->treeNodes[0]) . $n->value;
+				} else {
+									$s = $n->value . $this->parseTree($n->treeNodes[0]);
+				}
 			break;
 
 			case OP_DOT:
@@ -465,16 +478,18 @@ 
 				if (	$n->treeNodes[0]->type == TOKEN_IDENTIFIER &&
 					$n->treeNodes[1]->type == TOKEN_STRING &&
 					$this->isValidIdentifier(substr($n->treeNodes[1]->value, 1, -1))
-				)
-					$s .= '.' . substr($n->treeNodes[1]->value, 1, -1);
-				else
-					$s .= '[' . $this->parseTree($n->treeNodes[1]) . ']';
+				) {
+									$s .= '.' . substr($n->treeNodes[1]->value, 1, -1);
+				} else {
+									$s .= '[' . $this->parseTree($n->treeNodes[1]) . ']';
+				}
 			break;
 
 			case JS_LIST:
 				$childs = $n->treeNodes;
-				for ($i = 0, $j = count($childs); $i < $j; $i++)
-					$s .= ($i ? ',' : '') . $this->parseTree($childs[$i]);
+				for ($i = 0, $j = count($childs); $i < $j; $i++) {
+									$s .= ($i ? ',' : '') . $this->parseTree($childs[$i]);
+				}
 			break;
 
 			case JS_CALL:
@@ -502,27 +517,29 @@ 
 				for ($i = 0, $j = count($childs); $i < $j; $i++)
 				{
 					$t = $childs[$i];
-					if ($i)
-						$s .= ',';
+					if ($i) {
+											$s .= ',';
+					}
 					if ($t->type == JS_PROPERTY_INIT)
 					{
 						// Ditch the quotes when the index is a valid identifier
 						if (	$t->treeNodes[0]->type == TOKEN_STRING &&
 							$this->isValidIdentifier(substr($t->treeNodes[0]->value, 1, -1))
-						)
-							$s .= substr($t->treeNodes[0]->value, 1, -1);
-						else
-							$s .= $t->treeNodes[0]->value;
+						) {
+													$s .= substr($t->treeNodes[0]->value, 1, -1);
+						} else {
+													$s .= $t->treeNodes[0]->value;
+						}
 
 						$s .= ':' . $this->parseTree($t->treeNodes[1]);
-					}
-					else
+					} else
 					{
 						$s .= $t->type == JS_GETTER ? 'get' : 'set';
 						$s .= ' ' . $t->name . '(';
 						$params = $t->params;
-						for ($i = 0, $j = count($params); $i < $j; $i++)
-							$s .= ($i ? ',' : '') . $params[$i];
+						for ($i = 0, $j = count($params); $i < $j; $i++) {
+													$s .= ($i ? ',' : '') . $params[$i];
+						}
 						$s .= '){' . $this->parseTree($t->body, true) . '}';
 					}
 				}
@@ -615,8 +632,9 @@ 
 
 		$x = new JSCompilerContext(false);
 		$n = $this->Script($x);
-		if (!$this->t->isDone())
-			throw $this->t->newSyntaxError('Syntax error');
+		if (!$this->t->isDone()) {
+					throw $this->t->newSyntaxError('Syntax error');
+		}
 
 		return $n;
 	}
@@ -636,8 +654,9 @@ 
 		$n = new JSNode($this->t, JS_BLOCK);
 		array_push($x->stmtStack, $n);
 
-		while (!$this->t->isDone() && $this->t->peek() != OP_RIGHT_CURLY)
-			$n->addNode($this->Statement($x));
+		while (!$this->t->isDone() && $this->t->peek() != OP_RIGHT_CURLY) {
+					$n->addNode($this->Statement($x));
+		}
 
 		array_pop($x->stmtStack);
 
@@ -701,15 +720,17 @@ 
 					switch ($tt)
 					{
 						case KEYWORD_DEFAULT:
-							if ($n->defaultIndex >= 0)
-								throw $this->t->newSyntaxError('More than one switch default');
+							if ($n->defaultIndex >= 0) {
+															throw $this->t->newSyntaxError('More than one switch default');
+							}
 							// FALL THROUGH
 						case KEYWORD_CASE:
 							$n2 = new JSNode($this->t);
-							if ($tt == KEYWORD_DEFAULT)
-								$n->defaultIndex = count($n->cases);
-							else
-								$n2->caseLabel = $this->Expression($x, OP_COLON);
+							if ($tt == KEYWORD_DEFAULT) {
+															$n->defaultIndex = count($n->cases);
+							} else {
+															$n2->caseLabel = $this->Expression($x, OP_COLON);
+							}
 								break;
 						default:
 							throw $this->t->newSyntaxError('Invalid switch case');
@@ -717,8 +738,9 @@ 
 
 					$this->t->mustMatch(OP_COLON);
 					$n2->statements = new JSNode($this->t, JS_BLOCK);
-					while (($tt = $this->t->peek()) != KEYWORD_CASE && $tt != KEYWORD_DEFAULT && $tt != OP_RIGHT_CURLY)
-						$n2->statements->addNode($this->Statement($x));
+					while (($tt = $this->t->peek()) != KEYWORD_CASE && $tt != KEYWORD_DEFAULT && $tt != OP_RIGHT_CURLY) {
+											$n2->statements->addNode($this->Statement($x));
+					}
 
 					array_push($n->cases, $n2);
 				}
@@ -738,8 +760,7 @@ 
 					{
 						$this->t->get();
 						$n2 = $this->Variables($x);
-					}
-					else
+					} else
 					{
 						$n2 = $this->Expression($x);
 					}
@@ -763,16 +784,14 @@ 
 						// NB: n2[0].type == IDENTIFIER and n2[0].value == n2[0].name.
 						$n->iterator = $n2->treeNodes[0];
 						$n->varDecl = $n2;
-					}
-					else
+					} else
 					{
 						$n->iterator = $n2;
 						$n->varDecl = null;
 					}
 
 					$n->object = $this->Expression($x);
-				}
-				else
+				} else
 				{
 					$n->setup = $n2 ? $n2 : null;
 					$this->t->mustMatch(OP_SEMICOLON);
@@ -824,17 +843,18 @@ 
 				{
 					do
 					{
-						if (--$i < 0)
-							throw $this->t->newSyntaxError('Label not found');
+						if (--$i < 0) {
+													throw $this->t->newSyntaxError('Label not found');
+						}
 					}
 					while ($ss[$i]->label != $label);
-				}
-				else
+				} else
 				{
 					do
 					{
-						if (--$i < 0)
-							throw $this->t->newSyntaxError('Invalid ' . $tt);
+						if (--$i < 0) {
+													throw $this->t->newSyntaxError('Invalid ' . $tt);
+						}
 					}
 					while (!$ss[$i]->isLoop && ($tt != KEYWORD_BREAK || $ss[$i]->type != KEYWORD_SWITCH));
 				}
@@ -855,15 +875,16 @@ 
 
 					if ($this->t->match(KEYWORD_IF))
 					{
-						if ($x->ecmaStrictMode)
-							throw $this->t->newSyntaxError('Illegal catch guard');
+						if ($x->ecmaStrictMode) {
+													throw $this->t->newSyntaxError('Illegal catch guard');
+						}
 
-						if (count($n->catchClauses) && !end($n->catchClauses)->guard)
-							throw $this->t->newSyntaxError('Guarded catch after unguarded');
+						if (count($n->catchClauses) && !end($n->catchClauses)->guard) {
+													throw $this->t->newSyntaxError('Guarded catch after unguarded');
+						}
 
 						$n2->guard = $this->Expression($x);
-					}
-					else
+					} else
 					{
 						$n2->guard = null;
 					}
@@ -873,11 +894,13 @@ 
 					array_push($n->catchClauses, $n2);
 				}
 
-				if ($this->t->match(KEYWORD_FINALLY))
-					$n->finallyBlock = $this->Block($x);
+				if ($this->t->match(KEYWORD_FINALLY)) {
+									$n->finallyBlock = $this->Block($x);
+				}
 
-				if (!count($n->catchClauses) && !$n->finallyBlock)
-					throw $this->t->newSyntaxError('Invalid try statement');
+				if (!count($n->catchClauses) && !$n->finallyBlock) {
+									throw $this->t->newSyntaxError('Invalid try statement');
+				}
 			return $n;
 
 			case KEYWORD_CATCH:
@@ -890,15 +913,17 @@ 
 			break;
 
 			case KEYWORD_RETURN:
-				if (!$x->inFunction)
-					throw $this->t->newSyntaxError('Invalid return');
+				if (!$x->inFunction) {
+									throw $this->t->newSyntaxError('Invalid return');
+				}
 
 				$n = new JSNode($this->t);
 				$tt = $this->t->peekOnSameLine();
-				if ($tt != TOKEN_END && $tt != TOKEN_NEWLINE && $tt != OP_SEMICOLON && $tt != OP_RIGHT_CURLY)
-					$n->value = $this->Expression($x);
-				else
-					$n->value = null;
+				if ($tt != TOKEN_END && $tt != TOKEN_NEWLINE && $tt != OP_SEMICOLON && $tt != OP_RIGHT_CURLY) {
+									$n->value = $this->Expression($x);
+				} else {
+									$n->value = null;
+				}
 			break;
 
 			case KEYWORD_WITH:
@@ -939,8 +964,9 @@ 
 						$ss = $x->stmtStack;
 						for ($i = count($ss) - 1; $i >= 0; --$i)
 						{
-							if ($ss[$i]->label == $label)
-								throw $this->t->newSyntaxError('Duplicate label');
+							if ($ss[$i]->label == $label) {
+															throw $this->t->newSyntaxError('Duplicate label');
+							}
 						}
 
 						$this->t->get();
@@ -962,8 +988,9 @@ 
 		if ($this->t->lineno == $this->t->currentToken()->lineno)
 		{
 			$tt = $this->t->peekOnSameLine();
-			if ($tt != TOKEN_END && $tt != TOKEN_NEWLINE && $tt != OP_SEMICOLON && $tt != OP_RIGHT_CURLY)
-				throw $this->t->newSyntaxError('Missing ; before statement');
+			if ($tt != TOKEN_END && $tt != TOKEN_NEWLINE && $tt != OP_SEMICOLON && $tt != OP_RIGHT_CURLY) {
+							throw $this->t->newSyntaxError('Missing ; before statement');
+			}
 		}
 
 		$this->t->match(OP_SEMICOLON);
@@ -975,26 +1002,30 @@ 
 	{
 		$f = new JSNode($this->t);
 
-		if ($f->type != KEYWORD_FUNCTION)
-			$f->type = ($f->value == 'get') ? JS_GETTER : JS_SETTER;
+		if ($f->type != KEYWORD_FUNCTION) {
+					$f->type = ($f->value == 'get') ? JS_GETTER : JS_SETTER;
+		}
 
-		if ($this->t->match(TOKEN_IDENTIFIER))
-			$f->name = $this->t->currentToken()->value;
-		elseif ($requireName)
-			throw $this->t->newSyntaxError('Missing function identifier');
+		if ($this->t->match(TOKEN_IDENTIFIER)) {
+					$f->name = $this->t->currentToken()->value;
+		} elseif ($requireName) {
+					throw $this->t->newSyntaxError('Missing function identifier');
+		}
 
 		$this->t->mustMatch(OP_LEFT_PAREN);
 			$f->params = array();
 
 		while (($tt = $this->t->get()) != OP_RIGHT_PAREN)
 		{
-			if ($tt != TOKEN_IDENTIFIER)
-				throw $this->t->newSyntaxError('Missing formal parameter');
+			if ($tt != TOKEN_IDENTIFIER) {
+							throw $this->t->newSyntaxError('Missing formal parameter');
+			}
 
 			array_push($f->params, $this->t->currentToken()->value);
 
-			if ($this->t->peek() != OP_RIGHT_PAREN)
-				$this->t->mustMatch(OP_COMMA);
+			if ($this->t->peek() != OP_RIGHT_PAREN) {
+							$this->t->mustMatch(OP_COMMA);
+			}
 		}
 
 		$this->t->mustMatch(OP_LEFT_CURLY);
@@ -1006,8 +1037,9 @@ 
 		$f->end = $this->t->currentToken()->end;
 
 		$f->functionForm = $functionForm;
-		if ($functionForm == DECLARED_FORM)
-			array_push($x->funDecls, $f);
+		if ($functionForm == DECLARED_FORM) {
+					array_push($x->funDecls, $f);
+		}
 
 		return $f;
 	}
@@ -1025,8 +1057,9 @@ 
 
 			if ($this->t->match(OP_ASSIGN))
 			{
-				if ($this->t->currentToken()->assignOp)
-					throw $this->t->newSyntaxError('Invalid variable initialization');
+				if ($this->t->currentToken()->assignOp) {
+									throw $this->t->newSyntaxError('Invalid variable initialization');
+				}
 
 				$n2->initializer = $this->Expression($x, OP_COMMA);
 			}
@@ -1073,13 +1106,15 @@ 
 					break 2;
 
 				case OP_HOOK:
-					if ($this->t->scanOperand)
-						break 2;
+					if ($this->t->scanOperand) {
+											break 2;
+					}
 
 					while (	!empty($operators) &&
 						$this->opPrecedence[end($operators)->type] > $this->opPrecedence[$tt]
-					)
-						$this->reduce($operators, $operands);
+					) {
+											$this->reduce($operators, $operands);
+					}
 
 					array_push($operators, new JSNode($this->t));
 
@@ -1087,29 +1122,33 @@ 
 					$this->t->scanOperand = true;
 					$n = $this->Expression($x);
 
-					if (!$this->t->match(OP_COLON))
-						break 2;
+					if (!$this->t->match(OP_COLON)) {
+											break 2;
+					}
 
 					--$x->hookLevel;
 					array_push($operands, $n);
 				break;
 
 				case OP_COLON:
-					if ($x->hookLevel)
-						break 2;
+					if ($x->hookLevel) {
+											break 2;
+					}
 
 					throw $this->t->newSyntaxError('Invalid label');
 				break;
 
 				case OP_ASSIGN:
-					if ($this->t->scanOperand)
-						break 2;
+					if ($this->t->scanOperand) {
+											break 2;
+					}
 
 					// Use >, not >=, for right-associative ASSIGN
 					while (	!empty($operators) &&
 						$this->opPrecedence[end($operators)->type] > $this->opPrecedence[$tt]
-					)
-						$this->reduce($operators, $operands);
+					) {
+											$this->reduce($operators, $operands);
+					}
 
 					array_push($operators, new JSNode($this->t));
 					end($operands)->assignOp = $this->t->currentToken()->assignOp;
@@ -1123,8 +1162,9 @@ 
 					if ($x->inForLoopInit && !$x->hookLevel &&
 						!$x->bracketLevel && !$x->curlyLevel &&
 						!$x->parenLevel
-					)
-						break 2;
+					) {
+											break 2;
+					}
 				// FALL THROUGH
 				case OP_COMMA:
 					// A comma operator should not be parsed if we're parsing the then part
@@ -1132,8 +1172,9 @@ 
 					if ($tt == OP_COMMA && $x->hookLevel &&
 						!$x->bracketLevel && !$x->curlyLevel &&
 						!$x->parenLevel
-					)
-						break 2;
+					) {
+											break 2;
+					}
 				// Treat comma as left-associative so reduce can fold left-heavy
 				// COMMA trees into a single array.
 				// FALL THROUGH
@@ -1149,20 +1190,21 @@ 
 				case OP_PLUS: case OP_MINUS:
 				case OP_MUL: case OP_DIV: case OP_MOD:
 				case OP_DOT:
-					if ($this->t->scanOperand)
-						break 2;
+					if ($this->t->scanOperand) {
+											break 2;
+					}
 
 					while (	!empty($operators) &&
 						$this->opPrecedence[end($operators)->type] >= $this->opPrecedence[$tt]
-					)
-						$this->reduce($operators, $operands);
+					) {
+											$this->reduce($operators, $operands);
+					}
 
 					if ($tt == OP_DOT)
 					{
 						$this->t->mustMatch(TOKEN_IDENTIFIER);
 						array_push($operands, new JSNode($this->t, OP_DOT, array_pop($operands), new JSNode($this->t)));
-					}
-					else
+					} else
 					{
 						array_push($operators, new JSNode($this->t));
 						$this->t->scanOperand = true;
@@ -1172,8 +1214,9 @@ 
 				case KEYWORD_DELETE: case KEYWORD_VOID: case KEYWORD_TYPEOF:
 				case OP_NOT: case OP_BITWISE_NOT: case OP_UNARY_PLUS: case OP_UNARY_MINUS:
 				case KEYWORD_NEW:
-					if (!$this->t->scanOperand)
-						break 2;
+					if (!$this->t->scanOperand) {
+											break 2;
+					}
 
 					array_push($operators, new JSNode($this->t));
 				break;
@@ -1182,19 +1225,20 @@ 
 					if ($this->t->scanOperand)
 					{
 						array_push($operators, new JSNode($this->t));  // prefix increment or decrement
-					}
-					else
+					} else
 					{
 						// Don't cross a line boundary for postfix {in,de}crement.
 						$t = $this->t->tokens[($this->t->tokenIndex + $this->t->lookahead - 1) & 3];
-						if ($t && $t->lineno != $this->t->lineno)
-							break 2;
+						if ($t && $t->lineno != $this->t->lineno) {
+													break 2;
+						}
 
 						if (!empty($operators))
 						{
 							// Use >, not >=, so postfix has higher precedence than prefix.
-							while ($this->opPrecedence[end($operators)->type] > $this->opPrecedence[$tt])
-								$this->reduce($operators, $operands);
+							while ($this->opPrecedence[end($operators)->type] > $this->opPrecedence[$tt]) {
+															$this->reduce($operators, $operands);
+							}
 						}
 
 						$n = new JSNode($this->t, $tt, array_pop($operands));
@@ -1204,8 +1248,9 @@ 
 				break;
 
 				case KEYWORD_FUNCTION:
-					if (!$this->t->scanOperand)
-						break 2;
+					if (!$this->t->scanOperand) {
+											break 2;
+					}
 
 					array_push($operands, $this->FunctionDefinition($x, false, EXPRESSED_FORM));
 					$this->t->scanOperand = false;
@@ -1213,8 +1258,9 @@ 
 
 				case KEYWORD_NULL: case KEYWORD_THIS: case KEYWORD_TRUE: case KEYWORD_FALSE:
 				case TOKEN_IDENTIFIER: case TOKEN_NUMBER: case TOKEN_STRING: case TOKEN_REGEXP:
-					if (!$this->t->scanOperand)
-						break 2;
+					if (!$this->t->scanOperand) {
+											break 2;
+					}
 
 					array_push($operands, new JSNode($this->t));
 					$this->t->scanOperand = false;
@@ -1222,10 +1268,11 @@ 
 
 				case TOKEN_CONDCOMMENT_START:
 				case TOKEN_CONDCOMMENT_END:
-					if ($this->t->scanOperand)
-						array_push($operators, new JSNode($this->t));
-					else
-						array_push($operands, new JSNode($this->t));
+					if ($this->t->scanOperand) {
+											array_push($operators, new JSNode($this->t));
+					} else {
+											array_push($operands, new JSNode($this->t));
+					}
 				break;
 
 				case OP_LEFT_BRACKET:
@@ -1244,15 +1291,15 @@ 
 							}
 
 							$n->addNode($this->Expression($x, OP_COMMA));
-							if (!$this->t->match(OP_COMMA))
-								break;
+							if (!$this->t->match(OP_COMMA)) {
+															break;
+							}
 						}
 
 						$this->t->mustMatch(OP_RIGHT_BRACKET);
 						array_push($operands, $n);
 						$this->t->scanOperand = false;
-					}
-					else
+					} else
 					{
 						// Property indexing operator.
 						array_push($operators, new JSNode($this->t, JS_INDEX));
@@ -1262,18 +1309,21 @@ 
 				break;
 
 				case OP_RIGHT_BRACKET:
-					if ($this->t->scanOperand || $x->bracketLevel == $bl)
-						break 2;
+					if ($this->t->scanOperand || $x->bracketLevel == $bl) {
+											break 2;
+					}
 
-					while ($this->reduce($operators, $operands)->type != JS_INDEX)
-						continue;
+					while ($this->reduce($operators, $operands)->type != JS_INDEX) {
+											continue;
+					}
 
 					--$x->bracketLevel;
 				break;
 
 				case OP_LEFT_CURLY:
-					if (!$this->t->scanOperand)
-						break 2;
+					if (!$this->t->scanOperand) {
+											break 2;
+					}
 
 					// Object initialiser.  As for array initialisers (see above),
 					// parse using recursive descent.
@@ -1287,12 +1337,12 @@ 
 							$tv = $this->t->currentToken()->value;
 							if (($tv == 'get' || $tv == 'set') && $this->t->peek() == TOKEN_IDENTIFIER)
 							{
-								if ($x->ecmaStrictMode)
-									throw $this->t->newSyntaxError('Illegal property accessor');
+								if ($x->ecmaStrictMode) {
+																	throw $this->t->newSyntaxError('Illegal property accessor');
+								}
 
 								$n->addNode($this->FunctionDefinition($x, true, EXPRESSED_FORM));
-							}
-							else
+							} else
 							{
 								switch ($tt)
 								{
@@ -1303,8 +1353,9 @@ 
 									break;
 
 									case OP_RIGHT_CURLY:
-										if ($x->ecmaStrictMode)
-											throw $this->t->newSyntaxError('Illegal trailing ,');
+										if ($x->ecmaStrictMode) {
+																					throw $this->t->newSyntaxError('Illegal trailing ,');
+										}
 									break 3;
 
 									default:
@@ -1327,21 +1378,22 @@ 
 				break;
 
 				case OP_RIGHT_CURLY:
-					if (!$this->t->scanOperand && $x->curlyLevel != $cl)
-						throw new Exception('PANIC: right curly botch');
+					if (!$this->t->scanOperand && $x->curlyLevel != $cl) {
+											throw new Exception('PANIC: right curly botch');
+					}
 				break 2;
 
 				case OP_LEFT_PAREN:
 					if ($this->t->scanOperand)
 					{
 						array_push($operators, new JSNode($this->t, JS_GROUP));
-					}
-					else
+					} else
 					{
 						while (	!empty($operators) &&
 							$this->opPrecedence[end($operators)->type] > $this->opPrecedence[KEYWORD_NEW]
-						)
-							$this->reduce($operators, $operands);
+						) {
+													$this->reduce($operators, $operands);
+						}
 
 						// Handle () now, to regularize the n-ary case for n > 0.
 						// We must set scanOperand in case there are arguments and
@@ -1354,8 +1406,7 @@ 
 							{
 								array_pop($operators);
 								$n->addNode(array_pop($operands));
-							}
-							else
+							} else
 							{
 								$n = new JSNode($this->t, JS_CALL, array_pop($operands), new JSNode($this->t, JS_LIST));
 							}
@@ -1365,18 +1416,20 @@ 
 							break;
 						}
 
-						if ($n && $n->type == KEYWORD_NEW)
-							$n->type = JS_NEW_WITH_ARGS;
-						else
-							array_push($operators, new JSNode($this->t, JS_CALL));
+						if ($n && $n->type == KEYWORD_NEW) {
+													$n->type = JS_NEW_WITH_ARGS;
+						} else {
+													array_push($operators, new JSNode($this->t, JS_CALL));
+						}
 					}
 
 					++$x->parenLevel;
 				break;
 
 				case OP_RIGHT_PAREN:
-					if ($this->t->scanOperand || $x->parenLevel == $pl)
-						break 2;
+					if ($this->t->scanOperand || $x->parenLevel == $pl) {
+											break 2;
+					}
 
 					while (($tt = $this->reduce($operators, $operands)->type) != JS_GROUP &&
 						$tt != JS_CALL && $tt != JS_NEW_WITH_ARGS
@@ -1388,10 +1441,11 @@ 
 					if ($tt != JS_GROUP)
 					{
 						$n = end($operands);
-						if ($n->treeNodes[1]->type != OP_COMMA)
-							$n->treeNodes[1] = new JSNode($this->t, JS_LIST, $n->treeNodes[1]);
-						else
-							$n->treeNodes[1]->type = JS_LIST;
+						if ($n->treeNodes[1]->type != OP_COMMA) {
+													$n->treeNodes[1] = new JSNode($this->t, JS_LIST, $n->treeNodes[1]);
+						} else {
+													$n->treeNodes[1]->type = JS_LIST;
+						}
 					}
 
 					--$x->parenLevel;
@@ -1405,24 +1459,29 @@ 
 			}
 		}
 
-		if ($x->hookLevel != $hl)
-			throw $this->t->newSyntaxError('Missing : in conditional expression');
+		if ($x->hookLevel != $hl) {
+					throw $this->t->newSyntaxError('Missing : in conditional expression');
+		}
 
-		if ($x->parenLevel != $pl)
-			throw $this->t->newSyntaxError('Missing ) in parenthetical');
+		if ($x->parenLevel != $pl) {
+					throw $this->t->newSyntaxError('Missing ) in parenthetical');
+		}
 
-		if ($x->bracketLevel != $bl)
-			throw $this->t->newSyntaxError('Missing ] in index expression');
+		if ($x->bracketLevel != $bl) {
+					throw $this->t->newSyntaxError('Missing ] in index expression');
+		}
 
-		if ($this->t->scanOperand)
-			throw $this->t->newSyntaxError('Missing operand');
+		if ($this->t->scanOperand) {
+					throw $this->t->newSyntaxError('Missing operand');
+		}
 
 		// Resume default mode, scanning for operands, not operators.
 		$this->t->scanOperand = true;
 		$this->t->unget();
 
-		while (count($operators))
-			$this->reduce($operators, $operands);
+		while (count($operators)) {
+					$this->reduce($operators, $operands);
+		}
 
 		return array_pop($operands);
 	}
@@ -1443,8 +1502,9 @@ 
 		$n = $this->statement($x);
 		array_pop($x->stmtStack);
 
-		if ($end)
-			$this->t->mustMatch($end);
+		if ($end) {
+					$this->t->mustMatch($end);
+		}
 
 		return $n;
 	}
@@ -1473,13 +1533,15 @@ 
 
 		// Always use push to add operands to n, to update start and end
 		$a = array_splice($operands, $c - $arity);
-		for ($i = 0; $i < $arity; $i++)
-			$n->addNode($a[$i]);
+		for ($i = 0; $i < $arity; $i++) {
+					$n->addNode($a[$i]);
+		}
 
 		// Include closing bracket or postfix operator in [start,end]
 		$te = $this->t->currentToken()->end;
-		if ($n->end < $te)
-			$n->end = $te;
+		if ($n->end < $te) {
+					$n->end = $te;
+		}
 
 		array_push($operands, $n);
 
@@ -1528,8 +1590,7 @@ 
 			$this->lineno = $token->lineno;
 			$this->start = $token->start;
 			$this->end = $token->end;
-		}
-		else
+		} else
 		{
 			$this->type = $type;
 			$this->lineno = $t->lineno;
@@ -1538,8 +1599,9 @@ 
 		if (($numargs = func_num_args()) > 2)
 		{
 			$args = func_get_args();;
-			for ($i = 2; $i < $numargs; $i++)
-				$this->addNode($args[$i]);
+			for ($i = 2; $i < $numargs; $i++) {
+							$this->addNode($args[$i]);
+			}
 		}
 	}
 
@@ -1551,8 +1613,9 @@ 
 
 	public function __get($name)
 	{
-		if (isset($this->$name))
-			return $this->$name;
+		if (isset($this->$name)) {
+					return $this->$name;
+		}
 
 		return null;
 	}
@@ -1561,10 +1624,12 @@ 
 	{
 		if ($node !== null)
 		{
-			if ($node->start < $this->start)
-				$this->start = $node->start;
-			if ($this->end < $node->end)
-				$this->end = $node->end;
+			if ($node->start < $this->start) {
+							$this->start = $node->start;
+			}
+			if ($this->end < $node->end) {
+							$this->end = $node->end;
+			}
 		}
 
 		$this->treeNodes[] = $node;
@@ -1649,14 +1714,16 @@ 
 		$this->opRegExp = '#^(' . implode('|', array_map('preg_quote', array_keys($this->opTypeNames))) . ')#';
 
 		// this is quite a hidden yet convenient place to create the defines for operators and keywords
-		foreach ($this->opTypeNames as $operand => $name)
-			define('OP_' . $name, $operand);
+		foreach ($this->opTypeNames as $operand => $name) {
+					define('OP_' . $name, $operand);
+		}
 
 		define('OP_UNARY_PLUS', 'U+');
 		define('OP_UNARY_MINUS', 'U-');
 
-		foreach ($this->keywords as $keyword)
-			define('KEYWORD_' . strtoupper($keyword), $keyword);
+		foreach ($this->keywords as $keyword) {
+					define('KEYWORD_' . strtoupper($keyword), $keyword);
+		}
 	}
 
 	public function init($source, $filename = '', $lineno = 1)
@@ -1675,8 +1742,9 @@ 
 
 	public function getInput($chunksize)
 	{
-		if ($chunksize)
-			return substr($this->source, $this->cursor, $chunksize);
+		if ($chunksize) {
+					return substr($this->source, $this->cursor, $chunksize);
+		}
 
 		return substr($this->source, $this->cursor);
 	}
@@ -1693,8 +1761,9 @@ 
 
 	public function mustMatch($tt)
 	{
-	        if (!$this->match($tt))
-			throw $this->newSyntaxError('Unexpected token; token ' . $tt . ' expected');
+	        if (!$this->match($tt)) {
+	        			throw $this->newSyntaxError('Unexpected token; token ' . $tt . ' expected');
+	        }
 
 		return $this->currentToken();
 	}
@@ -1704,12 +1773,12 @@ 
 		if ($this->lookahead)
 		{
 			$next = $this->tokens[($this->tokenIndex + $this->lookahead) & 3];
-			if ($this->scanNewlines && $next->lineno != $this->lineno)
-				$tt = TOKEN_NEWLINE;
-			else
-				$tt = $next->type;
-		}
-		else
+			if ($this->scanNewlines && $next->lineno != $this->lineno) {
+							$tt = TOKEN_NEWLINE;
+			} else {
+							$tt = $next->type;
+			}
+		} else
 		{
 			$tt = $this->get();
 			$this->unget();
@@ -1729,8 +1798,9 @@ 
 
 	public function currentToken()
 	{
-		if (!empty($this->tokens))
-			return $this->tokens[$this->tokenIndex];
+		if (!empty($this->tokens)) {
+					return $this->tokens[$this->tokenIndex];
+		}
 	}
 
 	public function get($chunksize = 1000)
@@ -1740,8 +1810,9 @@ 
 			$this->lookahead--;
 			$this->tokenIndex = ($this->tokenIndex + 1) & 3;
 			$token = $this->tokens[$this->tokenIndex];
-			if ($token->type != TOKEN_NEWLINE || $this->scanNewlines)
-				return $token->type;
+			if ($token->type != TOKEN_NEWLINE || $this->scanNewlines) {
+							return $token->type;
+			}
 		}
 
 		$conditional_comment = false;
@@ -1758,22 +1829,27 @@ 
 				$spaces = $match[0];
 				$spacelen = strlen($spaces);
 				$this->cursor += $spacelen;
-				if (!$this->scanNewlines)
-					$this->lineno += substr_count($spaces, "\n");
+				if (!$this->scanNewlines) {
+									$this->lineno += substr_count($spaces, "\n");
+				}
 
-				if ($spacelen == $chunksize)
-					continue; // complete chunk contained whitespace
+				if ($spacelen == $chunksize) {
+									continue;
+				}
+				// complete chunk contained whitespace
 
 				$input = $this->getInput($chunksize);
-				if ($input == '' || $input[0] != '/')
-					break;
+				if ($input == '' || $input[0] != '/') {
+									break;
+				}
 			}
 
 			// Comments
 			if (!preg_match('/^\/(?:\*(@(?:cc_on|if|elif|else|end))?.*?\*\/|\/[^\n]*)/s', $input, $match))
 			{
-				if (!$chunksize)
-					break;
+				if (!$chunksize) {
+									break;
+				}
 
 				// retry with a full chunk fetch; this also prevents breakage of long regular expressions (which will never match a comment)
 				$chunksize = null;
@@ -1786,8 +1862,7 @@ 
 				$match[0] = '/*' . $match[1];
 				$conditional_comment = true;
 				break;
-			}
-			else
+			} else
 			{
 				$this->cursor += strlen($match[0]);
 				$this->lineno += substr_count($match[0], "\n");
@@ -1798,12 +1873,10 @@ 
 		{
 			$tt = TOKEN_END;
 			$match = array('');
-		}
-		elseif ($conditional_comment)
+		} elseif ($conditional_comment)
 		{
 			$tt = TOKEN_CONDCOMMENT_START;
-		}
-		else
+		} else
 		{
 			switch ($input[0])
 			{
@@ -1812,8 +1885,7 @@ 
 					if (preg_match('/^\d+\.\d*(?:[eE][-+]?\d+)?|^\d+(?:\.\d*)?[eE][-+]?\d+/', $input, $match))
 					{
 						$tt = TOKEN_NUMBER;
-					}
-					else if (preg_match('/^0[xX][\da-fA-F]+|^0[0-7]*|^\d+/', $input, $match))
+					} else if (preg_match('/^0[xX][\da-fA-F]+|^0[0-7]*|^\d+/', $input, $match))
 					{
 						// this should always match because of \d+
 						$tt = TOKEN_NUMBER;
@@ -1825,11 +1897,12 @@ 
 					if (preg_match('/^"(?:\\\\(?:.|\r?\n)|[^\\\\"\r\n]+)*"|^\'(?:\\\\(?:.|\r?\n)|[^\\\\\'\r\n]+)*\'/', $input, $match))
 					{
 						$tt = TOKEN_STRING;
-					}
-					else
+					} else
 					{
-						if ($chunksize)
-							return $this->get(null); // retry with a full chunk fetch
+						if ($chunksize) {
+													return $this->get(null);
+						}
+						// retry with a full chunk fetch
 
 						throw $this->newSyntaxError('Unterminated string literal');
 					}
@@ -1861,16 +1934,16 @@ 
 					{
 						$tt = OP_ASSIGN;
 						$match[0] .= '=';
-					}
-					else
+					} else
 					{
 						$tt = $op;
 						if ($this->scanOperand)
 						{
-							if ($op == OP_PLUS)
-								$tt = OP_UNARY_PLUS;
-							elseif ($op == OP_MINUS)
-								$tt = OP_UNARY_MINUS;
+							if ($op == OP_PLUS) {
+															$tt = OP_UNARY_PLUS;
+							} elseif ($op == OP_MINUS) {
+															$tt = OP_UNARY_MINUS;
+							}
 						}
 						$op = null;
 					}
@@ -1906,9 +1979,9 @@ 
 					{
 						$match = array('@*/');
 						$tt = TOKEN_CONDCOMMENT_END;
+					} else {
+											throw $this->newSyntaxError('Illegal token');
 					}
-					else
-						throw $this->newSyntaxError('Illegal token');
 				break;
 
 				case "\n":
@@ -1916,9 +1989,9 @@ 
 					{
 						$match = array("\n");
 						$tt = TOKEN_NEWLINE;
+					} else {
+											throw $this->newSyntaxError('Illegal token');
 					}
-					else
-						throw $this->newSyntaxError('Illegal token');
 				break;
 
 				default:
@@ -1926,22 +1999,24 @@ 
 					if (preg_match('/^[$\w]+/', $input, $match))
 					{
 						$tt = in_array($match[0], $this->keywords) ? $match[0] : TOKEN_IDENTIFIER;
+					} else {
+											throw $this->newSyntaxError('Illegal token');
 					}
-					else
-						throw $this->newSyntaxError('Illegal token');
 			}
 		}
 
 		$this->tokenIndex = ($this->tokenIndex + 1) & 3;
 
-		if (!isset($this->tokens[$this->tokenIndex]))
-			$this->tokens[$this->tokenIndex] = new JSToken();
+		if (!isset($this->tokens[$this->tokenIndex])) {
+					$this->tokens[$this->tokenIndex] = new JSToken();
+		}
 
 		$token = $this->tokens[$this->tokenIndex];
 		$token->type = $tt;
 
-		if ($tt == OP_ASSIGN)
-			$token->assignOp = $op;
+		if ($tt == OP_ASSIGN) {
+					$token->assignOp = $op;
+		}
 
 		$token->start = $this->cursor;
 
@@ -1956,8 +2031,9 @@ 
 
 	public function unget()
 	{
-		if (++$this->lookahead == 4)
-			throw $this->newSyntaxError('PANIC: too much lookahead!');
+		if (++$this->lookahead == 4) {
+					throw $this->newSyntaxError('PANIC: too much lookahead!');
+		}
 
 		$this->tokenIndex = ($this->tokenIndex - 1) & 3;
 	}

Spacing +79 added lines, -79 removed lines

@@ -114,12 +114,12 @@ 
 		$this->parser = new JSParser();
 	}
 
-	public static function minify($js, $filename='')
+	public static function minify($js, $filename = '')
 	{
 		static $instance;
 
 		// this is a singleton
-		if(!$instance)
+		if (!$instance)
 			$instance = new JSMinPlus();
 
 		return $instance->min($js, $filename);
@@ -132,9 +132,9 @@ 
 			$n = $this->parser->parse($js, $filename, 1);
 			return $this->parseTree($n);
 		}
-		catch(Exception $e)
+		catch (Exception $e)
 		{
-			echo $e->getMessage() . "\n";
+			echo $e->getMessage()."\n";
 		}
 
 		return false;
@@ -147,11 +147,11 @@ 
 		switch ($n->type)
 		{
 			case KEYWORD_FUNCTION:
-				$s .= 'function' . ($n->name ? ' ' . $n->name : '') . '(';
+				$s .= 'function'.($n->name ? ' '.$n->name : '').'(';
 				$params = $n->params;
 				for ($i = 0, $j = count($params); $i < $j; $i++)
-					$s .= ($i ? ',' : '') . $params[$i];
-				$s .= '){' . $this->parseTree($n->body, true) . '}';
+					$s .= ($i ? ',' : '').$params[$i];
+				$s .= '){'.$this->parseTree($n->body, true).'}';
 			break;
 
 			case JS_SCRIPT:
@@ -180,7 +180,7 @@ 
 							elseif ($type == KEYWORD_VAR && $type == $lastType)
 							{
 								// mutiple var-statements can go into one
-								$t = ',' . substr($t, 4);
+								$t = ','.substr($t, 4);
 							}
 							else
 							{
@@ -198,12 +198,12 @@ 
 
 				if ($c > 1 && !$noBlockGrouping)
 				{
-					$s = '{' . $s . '}';
+					$s = '{'.$s.'}';
 				}
 			break;
 
 			case KEYWORD_IF:
-				$s = 'if(' . $this->parseTree($n->condition) . ')';
+				$s = 'if('.$this->parseTree($n->condition).')';
 				$thenPart = $this->parseTree($n->thenPart);
 				$elsePart = $n->elsePart ? $this->parseTree($n->elsePart) : null;
 
@@ -215,9 +215,9 @@ 
 				{
 					// be carefull and always make a block out of the thenPart; could be more optimized but is a lot of trouble
 					if ($thenPart != ';' && $thenPart[0] != '{')
-						$thenPart = '{' . $thenPart . '}';
+						$thenPart = '{'.$thenPart.'}';
 
-					$s .= $thenPart . 'else';
+					$s .= $thenPart.'else';
 
 					// we could check for more, but that hardly ever applies so go for performance
 					if ($elsePart[0] != '{')
@@ -232,13 +232,13 @@ 
 			break;
 
 			case KEYWORD_SWITCH:
-				$s = 'switch(' . $this->parseTree($n->discriminant) . '){';
+				$s = 'switch('.$this->parseTree($n->discriminant).'){';
 				$cases = $n->cases;
 				for ($i = 0, $j = count($cases); $i < $j; $i++)
 				{
 					$case = $cases[$i];
 					if ($case->type == KEYWORD_CASE)
-						$s .= 'case' . ($case->caseLabel->type != TOKEN_STRING ? ' ' : '') . $this->parseTree($case->caseLabel) . ':';
+						$s .= 'case'.($case->caseLabel->type != TOKEN_STRING ? ' ' : '').$this->parseTree($case->caseLabel).':';
 					else
 						$s .= 'default:';
 
@@ -255,9 +255,9 @@ 
 			break;
 
 			case KEYWORD_FOR:
-				$s = 'for(' . ($n->setup ? $this->parseTree($n->setup) : '')
-					. ';' . ($n->condition ? $this->parseTree($n->condition) : '')
-					. ';' . ($n->update ? $this->parseTree($n->update) : '') . ')';
+				$s = 'for('.($n->setup ? $this->parseTree($n->setup) : '')
+					. ';'.($n->condition ? $this->parseTree($n->condition) : '')
+					. ';'.($n->update ? $this->parseTree($n->update) : '').')';
 
 				$body  = $this->parseTree($n->body);
 				if ($body == '')
@@ -267,7 +267,7 @@ 
 			break;
 
 			case KEYWORD_WHILE:
-				$s = 'while(' . $this->parseTree($n->condition) . ')';
+				$s = 'while('.$this->parseTree($n->condition).')';
 
 				$body  = $this->parseTree($n->body);
 				if ($body == '')
@@ -277,7 +277,7 @@ 
 			break;
 
 			case JS_FOR_IN:
-				$s = 'for(' . ($n->varDecl ? $this->parseTree($n->varDecl) : $this->parseTree($n->iterator)) . ' in ' . $this->parseTree($n->object) . ')';
+				$s = 'for('.($n->varDecl ? $this->parseTree($n->varDecl) : $this->parseTree($n->iterator)).' in '.$this->parseTree($n->object).')';
 
 				$body  = $this->parseTree($n->body);
 				if ($body == '')
@@ -287,28 +287,28 @@ 
 			break;
 
 			case KEYWORD_DO:
-				$s = 'do{' . $this->parseTree($n->body, true) . '}while(' . $this->parseTree($n->condition) . ')';
+				$s = 'do{'.$this->parseTree($n->body, true).'}while('.$this->parseTree($n->condition).')';
 			break;
 
 			case KEYWORD_BREAK:
 			case KEYWORD_CONTINUE:
-				$s = $n->value . ($n->label ? ' ' . $n->label : '');
+				$s = $n->value.($n->label ? ' '.$n->label : '');
 			break;
 
 			case KEYWORD_TRY:
-				$s = 'try{' . $this->parseTree($n->tryBlock, true) . '}';
+				$s = 'try{'.$this->parseTree($n->tryBlock, true).'}';
 				$catchClauses = $n->catchClauses;
 				for ($i = 0, $j = count($catchClauses); $i < $j; $i++)
 				{
 					$t = $catchClauses[$i];
-					$s .= 'catch(' . $t->varName . ($t->guard ? ' if ' . $this->parseTree($t->guard) : '') . '){' . $this->parseTree($t->block, true) . '}';
+					$s .= 'catch('.$t->varName.($t->guard ? ' if '.$this->parseTree($t->guard) : '').'){'.$this->parseTree($t->block, true).'}';
 				}
 				if ($n->finallyBlock)
-					$s .= 'finally{' . $this->parseTree($n->finallyBlock, true) . '}';
+					$s .= 'finally{'.$this->parseTree($n->finallyBlock, true).'}';
 			break;
 
 			case KEYWORD_THROW:
-				$s = 'throw ' . $this->parseTree($n->exception);
+				$s = 'throw '.$this->parseTree($n->exception);
 			break;
 
 			case KEYWORD_RETURN:
@@ -318,7 +318,7 @@ 
 					$t = $this->parseTree($n->value);
 					if (strlen($t))
 					{
-						if (	$t[0] != '(' && $t[0] != '[' && $t[0] != '{' &&
+						if ($t[0] != '(' && $t[0] != '[' && $t[0] != '{' &&
 							$t[0] != '"' && $t[0] != "'" && $t[0] != '/'
 						)
 							$s .= ' ';
@@ -329,20 +329,20 @@ 
 			break;
 
 			case KEYWORD_WITH:
-				$s = 'with(' . $this->parseTree($n->object) . ')' . $this->parseTree($n->body);
+				$s = 'with('.$this->parseTree($n->object).')'.$this->parseTree($n->body);
 			break;
 
 			case KEYWORD_VAR:
 			case KEYWORD_CONST:
-				$s = $n->value . ' ';
+				$s = $n->value.' ';
 				$childs = $n->treeNodes;
 				for ($i = 0, $j = count($childs); $i < $j; $i++)
 				{
 					$t = $childs[$i];
-					$s .= ($i ? ',' : '') . $t->name;
+					$s .= ($i ? ',' : '').$t->name;
 					$u = $t->initializer;
 					if ($u)
-						$s .= '=' . $this->parseTree($u);
+						$s .= '='.$this->parseTree($u);
 				}
 			break;
 
@@ -352,7 +352,7 @@ 
 
 			case TOKEN_CONDCOMMENT_START:
 			case TOKEN_CONDCOMMENT_END:
-				$s = $n->value . ($n->type == TOKEN_CONDCOMMENT_START ? ' ' : '');
+				$s = $n->value.($n->type == TOKEN_CONDCOMMENT_START ? ' ' : '');
 				$childs = $n->treeNodes;
 				for ($i = 0, $j = count($childs); $i < $j; $i++)
 					$s .= $this->parseTree($childs[$i]);
@@ -364,21 +364,21 @@ 
 			break;
 
 			case JS_LABEL:
-				$s = $n->label . ':' . $this->parseTree($n->statement);
+				$s = $n->label.':'.$this->parseTree($n->statement);
 			break;
 
 			case OP_COMMA:
 				$childs = $n->treeNodes;
 				for ($i = 0, $j = count($childs); $i < $j; $i++)
-					$s .= ($i ? ',' : '') . $this->parseTree($childs[$i]);
+					$s .= ($i ? ',' : '').$this->parseTree($childs[$i]);
 			break;
 
 			case OP_ASSIGN:
-				$s = $this->parseTree($n->treeNodes[0]) . $n->value . $this->parseTree($n->treeNodes[1]);
+				$s = $this->parseTree($n->treeNodes[0]).$n->value.$this->parseTree($n->treeNodes[1]);
 			break;
 
 			case OP_HOOK:
-				$s = $this->parseTree($n->treeNodes[0]) . '?' . $this->parseTree($n->treeNodes[1]) . ':' . $this->parseTree($n->treeNodes[2]);
+				$s = $this->parseTree($n->treeNodes[0]).'?'.$this->parseTree($n->treeNodes[1]).':'.$this->parseTree($n->treeNodes[2]);
 			break;
 
 			case OP_OR: case OP_AND:
@@ -387,7 +387,7 @@ 
 			case OP_LT: case OP_LE: case OP_GE: case OP_GT:
 			case OP_LSH: case OP_RSH: case OP_URSH:
 			case OP_MUL: case OP_DIV: case OP_MOD:
-				$s = $this->parseTree($n->treeNodes[0]) . $n->type . $this->parseTree($n->treeNodes[1]);
+				$s = $this->parseTree($n->treeNodes[0]).$n->type.$this->parseTree($n->treeNodes[1]);
 			break;
 
 			case OP_PLUS:
@@ -403,87 +403,87 @@ 
 					case OP_DECREMENT:
 					case OP_UNARY_PLUS:
 					case OP_UNARY_MINUS:
-						$s = $left . $n->type . ' ' . $right;
+						$s = $left.$n->type.' '.$right;
 					break;
 
 					case TOKEN_STRING:
 						//combine concatted strings with same quotestyle
 						if ($n->type == OP_PLUS && substr($left, -1) == $right[0])
 						{
-							$s = substr($left, 0, -1) . substr($right, 1);
+							$s = substr($left, 0, -1).substr($right, 1);
 							break;
 						}
 					// FALL THROUGH
 
 					default:
-						$s = $left . $n->type . $right;
+						$s = $left.$n->type.$right;
 				}
 			break;
 
 			case KEYWORD_IN:
-				$s = $this->parseTree($n->treeNodes[0]) . ' in ' . $this->parseTree($n->treeNodes[1]);
+				$s = $this->parseTree($n->treeNodes[0]).' in '.$this->parseTree($n->treeNodes[1]);
 			break;
 
 			case KEYWORD_INSTANCEOF:
-				$s = $this->parseTree($n->treeNodes[0]) . ' instanceof ' . $this->parseTree($n->treeNodes[1]);
+				$s = $this->parseTree($n->treeNodes[0]).' instanceof '.$this->parseTree($n->treeNodes[1]);
 			break;
 
 			case KEYWORD_DELETE:
-				$s = 'delete ' . $this->parseTree($n->treeNodes[0]);
+				$s = 'delete '.$this->parseTree($n->treeNodes[0]);
 			break;
 
 			case KEYWORD_VOID:
-				$s = 'void(' . $this->parseTree($n->treeNodes[0]) . ')';
+				$s = 'void('.$this->parseTree($n->treeNodes[0]).')';
 			break;
 
 			case KEYWORD_TYPEOF:
-				$s = 'typeof ' . $this->parseTree($n->treeNodes[0]);
+				$s = 'typeof '.$this->parseTree($n->treeNodes[0]);
 			break;
 
 			case OP_NOT:
 			case OP_BITWISE_NOT:
 			case OP_UNARY_PLUS:
 			case OP_UNARY_MINUS:
-				$s = $n->value . $this->parseTree($n->treeNodes[0]);
+				$s = $n->value.$this->parseTree($n->treeNodes[0]);
 			break;
 
 			case OP_INCREMENT:
 			case OP_DECREMENT:
 				if ($n->postfix)
-					$s = $this->parseTree($n->treeNodes[0]) . $n->value;
+					$s = $this->parseTree($n->treeNodes[0]).$n->value;
 				else
-					$s = $n->value . $this->parseTree($n->treeNodes[0]);
+					$s = $n->value.$this->parseTree($n->treeNodes[0]);
 			break;
 
 			case OP_DOT:
-				$s = $this->parseTree($n->treeNodes[0]) . '.' . $this->parseTree($n->treeNodes[1]);
+				$s = $this->parseTree($n->treeNodes[0]).'.'.$this->parseTree($n->treeNodes[1]);
 			break;
 
 			case JS_INDEX:
 				$s = $this->parseTree($n->treeNodes[0]);
 				// See if we can replace named index with a dot saving 3 bytes
-				if (	$n->treeNodes[0]->type == TOKEN_IDENTIFIER &&
+				if ($n->treeNodes[0]->type == TOKEN_IDENTIFIER &&
 					$n->treeNodes[1]->type == TOKEN_STRING &&
 					$this->isValidIdentifier(substr($n->treeNodes[1]->value, 1, -1))
 				)
-					$s .= '.' . substr($n->treeNodes[1]->value, 1, -1);
+					$s .= '.'.substr($n->treeNodes[1]->value, 1, -1);
 				else
-					$s .= '[' . $this->parseTree($n->treeNodes[1]) . ']';
+					$s .= '['.$this->parseTree($n->treeNodes[1]).']';
 			break;
 
 			case JS_LIST:
 				$childs = $n->treeNodes;
 				for ($i = 0, $j = count($childs); $i < $j; $i++)
-					$s .= ($i ? ',' : '') . $this->parseTree($childs[$i]);
+					$s .= ($i ? ',' : '').$this->parseTree($childs[$i]);
 			break;
 
 			case JS_CALL:
-				$s = $this->parseTree($n->treeNodes[0]) . '(' . $this->parseTree($n->treeNodes[1]) . ')';
+				$s = $this->parseTree($n->treeNodes[0]).'('.$this->parseTree($n->treeNodes[1]).')';
 			break;
 
 			case KEYWORD_NEW:
 			case JS_NEW_WITH_ARGS:
-				$s = 'new ' . $this->parseTree($n->treeNodes[0]) . '(' . ($n->type == JS_NEW_WITH_ARGS ? $this->parseTree($n->treeNodes[1]) : '') . ')';
+				$s = 'new '.$this->parseTree($n->treeNodes[0]).'('.($n->type == JS_NEW_WITH_ARGS ? $this->parseTree($n->treeNodes[1]) : '').')';
 			break;
 
 			case JS_ARRAY_INIT:
@@ -491,7 +491,7 @@ 
 				$childs = $n->treeNodes;
 				for ($i = 0, $j = count($childs); $i < $j; $i++)
 				{
-					$s .= ($i ? ',' : '') . $this->parseTree($childs[$i]);
+					$s .= ($i ? ',' : '').$this->parseTree($childs[$i]);
 				}
 				$s .= ']';
 			break;
@@ -507,23 +507,23 @@ 
 					if ($t->type == JS_PROPERTY_INIT)
 					{
 						// Ditch the quotes when the index is a valid identifier
-						if (	$t->treeNodes[0]->type == TOKEN_STRING &&
+						if ($t->treeNodes[0]->type == TOKEN_STRING &&
 							$this->isValidIdentifier(substr($t->treeNodes[0]->value, 1, -1))
 						)
 							$s .= substr($t->treeNodes[0]->value, 1, -1);
 						else
 							$s .= $t->treeNodes[0]->value;
 
-						$s .= ':' . $this->parseTree($t->treeNodes[1]);
+						$s .= ':'.$this->parseTree($t->treeNodes[1]);
 					}
 					else
 					{
 						$s .= $t->type == JS_GETTER ? 'get' : 'set';
-						$s .= ' ' . $t->name . '(';
+						$s .= ' '.$t->name.'(';
 						$params = $t->params;
 						for ($i = 0, $j = count($params); $i < $j; $i++)
-							$s .= ($i ? ',' : '') . $params[$i];
-						$s .= '){' . $this->parseTree($t->body, true) . '}';
+							$s .= ($i ? ',' : '').$params[$i];
+						$s .= '){'.$this->parseTree($t->body, true).'}';
 					}
 				}
 				$s .= '}';
@@ -535,11 +535,11 @@ 
 			break;
 
 			case JS_GROUP:
-				$s = '(' . $this->parseTree($n->treeNodes[0]) . ')';
+				$s = '('.$this->parseTree($n->treeNodes[0]).')';
 			break;
 
 			default:
-				throw new Exception('UNKNOWN TOKEN TYPE: ' . $n->type);
+				throw new Exception('UNKNOWN TOKEN TYPE: '.$n->type);
 		}
 
 		return $s;
@@ -834,7 +834,7 @@ 
 					do
 					{
 						if (--$i < 0)
-							throw $this->t->newSyntaxError('Invalid ' . $tt);
+							throw $this->t->newSyntaxError('Invalid '.$tt);
 					}
 					while (!$ss[$i]->isLoop && ($tt != KEYWORD_BREAK || $ss[$i]->type != KEYWORD_SWITCH));
 				}
@@ -1041,7 +1041,7 @@ 
 		return $n;
 	}
 
-	private function Expression($x, $stop=false)
+	private function Expression($x, $stop = false)
 	{
 		$operators = array();
 		$operands = array();
@@ -1076,7 +1076,7 @@ 
 					if ($this->t->scanOperand)
 						break 2;
 
-					while (	!empty($operators) &&
+					while (!empty($operators) &&
 						$this->opPrecedence[end($operators)->type] > $this->opPrecedence[$tt]
 					)
 						$this->reduce($operators, $operands);
@@ -1106,7 +1106,7 @@ 
 						break 2;
 
 					// Use >, not >=, for right-associative ASSIGN
-					while (	!empty($operators) &&
+					while (!empty($operators) &&
 						$this->opPrecedence[end($operators)->type] > $this->opPrecedence[$tt]
 					)
 						$this->reduce($operators, $operands);
@@ -1152,7 +1152,7 @@ 
 					if ($this->t->scanOperand)
 						break 2;
 
-					while (	!empty($operators) &&
+					while (!empty($operators) &&
 						$this->opPrecedence[end($operators)->type] >= $this->opPrecedence[$tt]
 					)
 						$this->reduce($operators, $operands);
@@ -1181,7 +1181,7 @@ 
 				case OP_INCREMENT: case OP_DECREMENT:
 					if ($this->t->scanOperand)
 					{
-						array_push($operators, new JSNode($this->t));  // prefix increment or decrement
+						array_push($operators, new JSNode($this->t)); // prefix increment or decrement
 					}
 					else
 					{
@@ -1338,7 +1338,7 @@ 
 					}
 					else
 					{
-						while (	!empty($operators) &&
+						while (!empty($operators) &&
 							$this->opPrecedence[end($operators)->type] > $this->opPrecedence[KEYWORD_NEW]
 						)
 							$this->reduce($operators, $operands);
@@ -1519,7 +1519,7 @@ 
 	public $funDecls = array();
 	public $varDecls = array();
 
-	public function __construct($t, $type=0)
+	public function __construct($t, $type = 0)
 	{
 		if ($token = $t->currentToken())
 		{
@@ -1537,7 +1537,7 @@ 
 
 		if (($numargs = func_num_args()) > 2)
 		{
-			$args = func_get_args();;
+			$args = func_get_args(); ;
 			for ($i = 2; $i < $numargs; $i++)
 				$this->addNode($args[$i]);
 		}
@@ -1646,17 +1646,17 @@ 
 
 	public function __construct()
 	{
-		$this->opRegExp = '#^(' . implode('|', array_map('preg_quote', array_keys($this->opTypeNames))) . ')#';
+		$this->opRegExp = '#^('.implode('|', array_map('preg_quote', array_keys($this->opTypeNames))).')#';
 
 		// this is quite a hidden yet convenient place to create the defines for operators and keywords
 		foreach ($this->opTypeNames as $operand => $name)
-			define('OP_' . $name, $operand);
+			define('OP_'.$name, $operand);
 
 		define('OP_UNARY_PLUS', 'U+');
 		define('OP_UNARY_MINUS', 'U-');
 
 		foreach ($this->keywords as $keyword)
-			define('KEYWORD_' . strtoupper($keyword), $keyword);
+			define('KEYWORD_'.strtoupper($keyword), $keyword);
 	}
 
 	public function init($source, $filename = '', $lineno = 1)
@@ -1694,7 +1694,7 @@ 
 	public function mustMatch($tt)
 	{
 	        if (!$this->match($tt))
-			throw $this->newSyntaxError('Unexpected token; token ' . $tt . ' expected');
+			throw $this->newSyntaxError('Unexpected token; token '.$tt.' expected');
 
 		return $this->currentToken();
 	}
@@ -1735,7 +1735,7 @@ 
 
 	public function get($chunksize = 1000)
 	{
-		while($this->lookahead)
+		while ($this->lookahead)
 		{
 			$this->lookahead--;
 			$this->tokenIndex = ($this->tokenIndex + 1) & 3;
@@ -1747,7 +1747,7 @@ 
 		$conditional_comment = false;
 
 		// strip whitespace and comments
-		while(true)
+		while (true)
 		{
 			$input = $this->getInput($chunksize);
 
@@ -1783,7 +1783,7 @@ 
 			// check if this is a conditional (JScript) comment
 			if (!empty($match[1]))
 			{
-				$match[0] = '/*' . $match[1];
+				$match[0] = '/*'.$match[1];
 				$conditional_comment = true;
 				break;
 			}
@@ -1964,7 +1964,7 @@ 
 
 	public function newSyntaxError($m)
 	{
-		return new Exception('Parse error: ' . $m . ' in file \'' . $this->filename . '\' on line ' . $this->lineno);
+		return new Exception('Parse error: '.$m.' in file \''.$this->filename.'\' on line '.$this->lineno);
 	}
 }
 

tools/minify/minify.php

Doc Comments +6 added lines

@@ -172,6 +172,9 @@ 
 	}
 }
 
+/**
+ * @param string $ext
+ */
 function get_target_files($ext, $dir, $files_to_skip) {
 	$files = glob("{$dir}*.{$ext}");
 	$skips = glob("{$dir}*.min.{$ext}");
@@ -181,6 +184,9 @@ 
 	return $files;
 }
 
+/**
+ * @param string $content
+ */
 function closure_compile($content) {
 	require_once dirname(__FILE__).'/../../classes/httprequest/XEHttpRequest.class.php';
 

Braces +49 added lines, -17 removed lines

@@ -21,9 +21,13 @@ 
 	$argc = $_SERVER['argc'];
 
 	// get target directories
-	if($argc < 1) exit;
-	elseif($argc < 2) $dirs = array($_SERVER['PWD']);
-	else $dirs = array_slice($argv, 1);
+	if($argc < 1) {
+		exit;
+	} elseif($argc < 2) {
+		$dirs = array($_SERVER['PWD']);
+	} else {
+		$dirs = array_slice($argv, 1);
+	}
 
 	$dirs = array_map('realpath', $dirs);
 	$dirs = array_map('add_dirsep', $dirs);
@@ -33,7 +37,9 @@ 
 
 // add directory separator
 function add_dirsep($path) {
-	if(substr($path,-1) != DIRECTORY_SEPARATOR) $path .= DIRECTORY_SEPARATOR;
+	if(substr($path,-1) != DIRECTORY_SEPARATOR) {
+		$path .= DIRECTORY_SEPARATOR;
+	}
 	return $path;
 }
 
@@ -53,7 +59,9 @@ 
 	// files to skip
 	$files_to_skip = $config['skip'];
 	foreach($files_to_skip as $idx=>$file) {
-		if($file) $files_to_skip[$idx] = realpath($dir.trim($file));
+		if($file) {
+			$files_to_skip[$idx] = realpath($dir.trim($file));
+		}
 	}
 
 	echo "  Minifying JavaScript files...";
@@ -63,7 +71,9 @@ 
 		require dirname(__FILE__).'/jsminplus/jsminplus.php';
 	}
 	foreach($js_files as $file) {
-		if(!is_readable($file)) continue;
+		if(!is_readable($file)) {
+			continue;
+		}
 
 		$target  = preg_replace('@\.js$@', '.min.js', $file);
 		$content = file_get_contents($file);
@@ -102,7 +112,9 @@ 
 	$oCSSmin = new CSSmin();
 
 	foreach($css_files as $file) {
-		if(!is_readable($file)) continue;
+		if(!is_readable($file)) {
+			continue;
+		}
 
 		$target  = preg_replace('@\.css$@', '.min.css', $file);
 		$content = file_get_contents($file);
@@ -117,51 +129,71 @@ 
 	$default = array('option'=>array(), 'skip'=>array(), 'merge'=>array());
 	$file    = $dir.'minify.ini';
 
-	if(!is_readable($file)) return $default;
+	if(!is_readable($file)) {
+		return $default;
+	}
 
 	$config_str = file_get_contents($file);
 	$config_str = preg_replace_callback('/(\[(?:skip|merge *>> *.+?)\])([\s\S]+?)(?=\[|$)/', 'transform_config_str', $config_str);
 
 	$config = parse_ini_string($config_str, 1);
-	if($config === false) return $default;
+	if($config === false) {
+		return $default;
+	}
 
-	if(is_array($config['skip'])) $config['skip'] = array_keys($config['skip']);
+	if(is_array($config['skip'])) {
+		$config['skip'] = array_keys($config['skip']);
+	}
 
 	foreach($config as $section=>$value) {
 		if(preg_match('/merge *>> *(.+)/', $section, $match)) {
-			if(!is_array($config['merge'])) $config['merge'] = array();
+			if(!is_array($config['merge'])) {
+				$config['merge'] = array();
+			}
 			$config['merge'][trim($match[1])] = array_keys($value);
 
 			unset($config[$section]);
 		}
 	}
 
-	if(is_array($config['option'])) $config = array_merge($config['option'], $config);
+	if(is_array($config['option'])) {
+		$config = array_merge($config['option'], $config);
+	}
 	$config = array_merge($default, $config);
 
 	return $config;
 }
 
 function transform_config_str($matches) {
-	if(!$matches[2]) return $matches[0];
+	if(!$matches[2]) {
+		return $matches[0];
+	}
 	$values = preg_replace('/$/m', '=', trim($matches[2]));
 
 	return "{$matches[1]}\n{$values}\n\n";
 }
 
 function merge($files, $target, $base_dir) {
-	if(!is_array($files)) return false;
+	if(!is_array($files)) {
+		return false;
+	}
 
 	$body   = '';
 	$is_css = !!preg_match('/\.css$/', $target);
 
 	foreach($files as $file) {
 		$file = $base_dir.trim($file);
-		if(!is_readable($file)) continue;
+		if(!is_readable($file)) {
+			continue;
+		}
 
 		$content = trim(file_get_contents($file));
-		if($is_css && $body) $content = preg_replace('/^@.+?;/m', '', $content);
-		if($content) $body .= $content."\n";
+		if($is_css && $body) {
+			$content = preg_replace('/^@.+?;/m', '', $content);
+		}
+		if($content) {
+			$body .= $content."\n";
+		}
 	}
 
 	if ($body) {

Spacing +29 added lines, -29 removed lines

@@ -11,7 +11,7 @@ 
  * @author NAVER(developer@xpressengine.com)
  */
 
-if(version_compare(PHP_VERSION, '5.3.0', '<')) {
+if (version_compare(PHP_VERSION, '5.3.0', '<')) {
 	echo "PHP 5.3.0 or above version is required.";
 	exit(1);
 }
@@ -21,8 +21,8 @@ 
 	$argc = $_SERVER['argc'];
 
 	// get target directories
-	if($argc < 1) exit;
-	elseif($argc < 2) $dirs = array($_SERVER['PWD']);
+	if ($argc < 1) exit;
+	elseif ($argc < 2) $dirs = array($_SERVER['PWD']);
 	else $dirs = array_slice($argv, 1);
 
 	$dirs = array_map('realpath', $dirs);
@@ -33,7 +33,7 @@ 
 
 // add directory separator
 function add_dirsep($path) {
-	if(substr($path,-1) != DIRECTORY_SEPARATOR) $path .= DIRECTORY_SEPARATOR;
+	if (substr($path, -1) != DIRECTORY_SEPARATOR) $path .= DIRECTORY_SEPARATOR;
 	return $path;
 }
 
@@ -46,38 +46,38 @@ 
 	echo " Done\n";
 
 	// merge
-	foreach($config['merge'] as $target=>$files) {
+	foreach ($config['merge'] as $target=>$files) {
 		merge($files, $target, $dir);
 	}
 
 	// files to skip
 	$files_to_skip = $config['skip'];
-	foreach($files_to_skip as $idx=>$file) {
-		if($file) $files_to_skip[$idx] = realpath($dir.trim($file));
+	foreach ($files_to_skip as $idx=>$file) {
+		if ($file) $files_to_skip[$idx] = realpath($dir.trim($file));
 	}
 
 	echo "  Minifying JavaScript files...";
 	$js_files = get_target_files('js', $dir, $files_to_skip);
 
-	if(count($js_files) && !class_exists('JSMinPlus')) {
+	if (count($js_files) && !class_exists('JSMinPlus')) {
 		require dirname(__FILE__).'/jsminplus/jsminplus.php';
 	}
-	foreach($js_files as $file) {
-		if(!is_readable($file)) continue;
+	foreach ($js_files as $file) {
+		if (!is_readable($file)) continue;
 
 		$target  = preg_replace('@\.js$@', '.min.js', $file);
 		$content = file_get_contents($file);
 
 		// save copyright to preserve it
-		if(preg_match('@^[ \t]*(/\*\*.+?\*/)@s', $content, $matches)) {
+		if (preg_match('@^[ \t]*(/\*\*.+?\*/)@s', $content, $matches)) {
 			$copyright = $matches[1]."\n";
 		} else {
 			$copyright = '';
 		}
 
-		if($config['use_closure_compiler']) {
+		if ($config['use_closure_compiler']) {
 			$content = closure_compile($content);
-			if(!$content) {
+			if (!$content) {
 				echo "   CANNOT compile the js file with closure compiler.\n";
 				echo "   Trying again with JSMinPlus.\n";
 				$content = JSMinPlus::minify($content);
@@ -95,14 +95,14 @@ 
 	echo "  Minifying CSS files...";
 	$css_files = get_target_files('css', $dir, $files_to_skip);
 
-	if(count($css_files) && !class_exists('CSSmin')) {
+	if (count($css_files) && !class_exists('CSSmin')) {
 		require dirname(__FILE__).'/cssmin/CSSmin.php';
 	}
 
 	$oCSSmin = new CSSmin();
 
-	foreach($css_files as $file) {
-		if(!is_readable($file)) continue;
+	foreach ($css_files as $file) {
+		if (!is_readable($file)) continue;
 
 		$target  = preg_replace('@\.css$@', '.min.css', $file);
 		$content = file_get_contents($file);
@@ -117,51 +117,51 @@ 
 	$default = array('option'=>array(), 'skip'=>array(), 'merge'=>array());
 	$file    = $dir.'minify.ini';
 
-	if(!is_readable($file)) return $default;
+	if (!is_readable($file)) return $default;
 
 	$config_str = file_get_contents($file);
 	$config_str = preg_replace_callback('/(\[(?:skip|merge *>> *.+?)\])([\s\S]+?)(?=\[|$)/', 'transform_config_str', $config_str);
 
 	$config = parse_ini_string($config_str, 1);
-	if($config === false) return $default;
+	if ($config === false) return $default;
 
-	if(is_array($config['skip'])) $config['skip'] = array_keys($config['skip']);
+	if (is_array($config['skip'])) $config['skip'] = array_keys($config['skip']);
 
-	foreach($config as $section=>$value) {
-		if(preg_match('/merge *>> *(.+)/', $section, $match)) {
-			if(!is_array($config['merge'])) $config['merge'] = array();
+	foreach ($config as $section=>$value) {
+		if (preg_match('/merge *>> *(.+)/', $section, $match)) {
+			if (!is_array($config['merge'])) $config['merge'] = array();
 			$config['merge'][trim($match[1])] = array_keys($value);
 
 			unset($config[$section]);
 		}
 	}
 
-	if(is_array($config['option'])) $config = array_merge($config['option'], $config);
+	if (is_array($config['option'])) $config = array_merge($config['option'], $config);
 	$config = array_merge($default, $config);
 
 	return $config;
 }
 
 function transform_config_str($matches) {
-	if(!$matches[2]) return $matches[0];
+	if (!$matches[2]) return $matches[0];
 	$values = preg_replace('/$/m', '=', trim($matches[2]));
 
 	return "{$matches[1]}\n{$values}\n\n";
 }
 
 function merge($files, $target, $base_dir) {
-	if(!is_array($files)) return false;
+	if (!is_array($files)) return false;
 
 	$body   = '';
 	$is_css = !!preg_match('/\.css$/', $target);
 
-	foreach($files as $file) {
+	foreach ($files as $file) {
 		$file = $base_dir.trim($file);
-		if(!is_readable($file)) continue;
+		if (!is_readable($file)) continue;
 
 		$content = trim(file_get_contents($file));
-		if($is_css && $body) $content = preg_replace('/^@.+?;/m', '', $content);
-		if($content) $body .= $content."\n";
+		if ($is_css && $body) $content = preg_replace('/^@.+?;/m', '', $content);
+		if ($content) $body .= $content."\n";
 	}
 
 	if ($body) {

addons/adminlogging/adminlogging.addon.php

Spacing +2 added lines, -2 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 /* Copyright (C) NAVER <http://www.navercorp.com> */
 
-if(!defined('__XE__'))
+if (!defined('__XE__'))
 	exit();
 
 /**
@@ -10,7 +10,7 @@ 
  * @brief admin log
  */
 $logged_info = Context::get('logged_info');
-if($logged_info && $logged_info->is_admin == 'Y' && stripos(Context::get('act'), 'admin') !== false && $called_position == 'before_module_proc')
+if ($logged_info && $logged_info->is_admin == 'Y' && stripos(Context::get('act'), 'admin') !== false && $called_position == 'before_module_proc')
 {
 	$oAdminloggingController = getController('adminlogging');
 	$oAdminloggingController->insertLog($this->module, $this->act);

Braces +2 added lines, -1 removed lines

@@ -1,8 +1,9 @@
 <?php
 /* Copyright (C) NAVER <http://www.navercorp.com> */
 
-if(!defined('__XE__'))
+if(!defined('__XE__')) {
 	exit();
+}
 
 /**
  * @file adminlogging.addon.php