YetiForceCompany / YetiForceCRM

include/runtime/LanguageHandler.php

Braces +12 added lines, -8 removed lines

@@ -29,8 +29,9 @@ 
 			$currentLanguage = self::getLanguage();
 		}
 		//decoding for Start Date & Time and End Date & Time 
-		if (!is_array($key))
-			$key = decode_html($key);
+		if (!is_array($key)) {
+					$key = decode_html($key);
+		}
 		$translatedString = self::getLanguageTranslatedString($currentLanguage, $key, $module);
 
 		// label not found in users language pack, then check in the default language pack(config.inc.php)
@@ -60,8 +61,9 @@ 
 		$moduleStrings = [];
 
 		$module = str_replace(':', '.', $module);
-		if (is_array($module))
-			return null;
+		if (is_array($module)) {
+					return null;
+		}
 		$moduleStrings = self::getModuleStringsFromFile($language, $module);
 		if (!empty($moduleStrings['languageStrings'][$key])) {
 			return stripslashes($moduleStrings['languageStrings'][$key]);
@@ -78,8 +80,9 @@ 
 			}
 		}
 		$commonStrings = self::getModuleStringsFromFile($language);
-		if (!empty($commonStrings['languageStrings'][$key]))
-			return stripslashes($commonStrings['languageStrings'][$key]);
+		if (!empty($commonStrings['languageStrings'][$key])) {
+					return stripslashes($commonStrings['languageStrings'][$key]);
+		}
 
 		return null;
 	}
@@ -112,8 +115,9 @@ 
 		}
 
 		$commonStrings = self::getModuleStringsFromFile($language);
-		if (!empty($commonStrings['jsLanguageStrings'][$key]))
-			return $commonStrings['jsLanguageStrings'][$key];
+		if (!empty($commonStrings['jsLanguageStrings'][$key])) {
+					return $commonStrings['jsLanguageStrings'][$key];
+		}
 
 		return $key;
 	}

include/runtime/Controller.php

Braces +12 added lines, -8 removed lines

@@ -398,8 +398,9 @@ 
 				$fallBackFilePath = Vtiger_Loader::resolveNameToPath($preLayoutPath . $layoutPath . '/' . $jsFile, $fileExtension);
 				if (is_file($fallBackFilePath)) {
 					$filePath = $jsFile;
-					if (empty($preLayoutPath))
-						$filePath = str_replace('.', '/', $filePath) . '.js';
+					if (empty($preLayoutPath)) {
+											$filePath = str_replace('.', '/', $filePath) . '.js';
+					}
 					$minFilePath = str_replace('.js', '.min.js', $filePath);
 					if (vtlib\Functions::getMinimizationOptions($fileExtension) && is_file(Vtiger_Loader::resolveNameToPath('~' . $layoutPath . '/' . $minFilePath, $fileExtension))) {
 						$filePath = $minFilePath;
@@ -413,8 +414,9 @@ 
 				$fallBackFilePath = Vtiger_Loader::resolveNameToPath($preLayoutPath . $layoutPath . '/' . $jsFile, $fileExtension);
 				if (is_file($fallBackFilePath)) {
 					$filePath = $jsFile;
-					if (empty($preLayoutPath))
-						$filePath = str_replace('.', '/', $jsFile) . '.js';
+					if (empty($preLayoutPath)) {
+											$filePath = str_replace('.', '/', $jsFile) . '.js';
+					}
 					$minFilePath = str_replace('.js', '.min.js', $filePath);
 					if (vtlib\Functions::getMinimizationOptions($fileExtension) && is_file(Vtiger_Loader::resolveNameToPath('~' . $layoutPath . '/' . $minFilePath, $fileExtension))) {
 						$filePath = $minFilePath;
@@ -471,8 +473,9 @@ 
 				$layoutPath = 'layouts' . '/' . Yeti_Layout::getActiveLayout();
 				$fallBackFilePath = Vtiger_Loader::resolveNameToPath($preLayoutPath . $layoutPath . '/' . $cssFile, $fileExtension);
 				if (is_file($fallBackFilePath)) {
-					if (empty($preLayoutPath))
-						$filePath = str_replace('.', '/', $cssFile) . '.css';
+					if (empty($preLayoutPath)) {
+											$filePath = str_replace('.', '/', $cssFile) . '.css';
+					}
 					$minFilePath = str_replace('.css', '.min.css', $filePath);
 					if (vtlib\Functions::getMinimizationOptions($fileExtension) && is_file(Vtiger_Loader::resolveNameToPath('~' . $layoutPath . '/' . $minFilePath, $fileExtension))) {
 						$filePath = $minFilePath;
@@ -485,8 +488,9 @@ 
 				$layoutPath = 'layouts' . '/' . Vtiger_Viewer::getDefaultLayoutName();
 				$fallBackFilePath = Vtiger_Loader::resolveNameToPath($preLayoutPath . $layoutPath . '/' . $cssFile, $fileExtension);
 				if (is_file($fallBackFilePath)) {
-					if (empty($preLayoutPath))
-						$filePath = str_replace('.', '/', $cssFile) . '.css';
+					if (empty($preLayoutPath)) {
+											$filePath = str_replace('.', '/', $cssFile) . '.css';
+					}
 					$minFilePath = str_replace('.css', '.min.css', $filePath);
 					if (vtlib\Functions::getMinimizationOptions($fileExtension) && is_file(Vtiger_Loader::resolveNameToPath('~' . $layoutPath . '/' . $minFilePath, $fileExtension))) {
 						$filePath = $minFilePath;

Doc Comments -2 removed lines

@@ -77,8 +77,6 @@
 
 	/**
 	 * Function invokes exposed methods for this class
-	 * @param string $name - method name
-	 * @param Vtiger_Request $request
 	 * @throws Exception
 	 */
 	public function invokeExposedMethod()

include/http/Request.php

Braces +3 added lines, -2 removed lines

@@ -306,8 +306,9 @@
 	public function validateWriteAccess($skipRequestTypeCheck = false)
 	{
 		if (!$skipRequestTypeCheck) {
-			if ($_SERVER['REQUEST_METHOD'] != 'POST')
-				throw new \Exception\Csrf('Invalid request - validate Write Access');
+			if ($_SERVER['REQUEST_METHOD'] != 'POST') {
+							throw new \Exception\Csrf('Invalid request - validate Write Access');
+			}
 		}
 		$this->validateReadAccess();
 		$this->validateCSRF();

Doc Comments +25 added lines, -2 removed lines

@@ -79,6 +79,7 @@ 
 
 	/**
 	 * Get value for key as boolean
+	 * @param string $key
 	 */
 	public function getBoolean($key, $defvalue = '')
 	{
@@ -88,8 +89,8 @@ 
 	/**
 	 * Function to get the value if its safe to use for SQL Query (column).
 	 * @param string $key
-	 * @param boolean $skipEmpty - Skip the check if string is empty
-	 * @return Value for the given key
+	 * @param boolean $skipEmtpy - Skip the check if string is empty
+	 * @return string|false for the given key
 	 */
 	public function getForSql($key, $skipEmtpy = true)
 	{
@@ -157,6 +158,7 @@ 
 
 	/**
 	 * Is the value (linked to key) empty?
+	 * @param string $key
 	 */
 	public function isEmpty($key)
 	{
@@ -187,6 +189,7 @@ 
 
 	/**
 	 * Set the value for key
+	 * @param string $key
 	 */
 	public function delete($key)
 	{
@@ -256,6 +259,9 @@ 
 		return $headers;
 	}
 
+	/**
+	 * @param string $key
+	 */
 	public function getHeader($key)
 	{
 		if (empty($this->headers)) {
@@ -264,6 +270,9 @@ 
 		return isset($this->headers[$key]) ? $this->headers[$key] : null;
 	}
 
+	/**
+	 * @return string
+	 */
 	public function getRequestMetod()
 	{
 		$method = $_SERVER['REQUEST_METHOD'];
@@ -362,6 +371,9 @@ 
 		return static::$request->get($key, $defvalue);
 	}
 
+	/**
+	 * @param string $key
+	 */
 	public static function has($key)
 	{
 		if (!static::$request) {
@@ -370,6 +382,11 @@ 
 		return static::$request->has($key);
 	}
 
+	/**
+	 * @param string $key
+	 *
+	 * @return string
+	 */
 	public static function getForSql($key, $skipEmtpy = true)
 	{
 		if (!static::$request) {
@@ -378,6 +395,9 @@ 
 		return static::$request->getForSql($key, $skipEmtpy);
 	}
 
+	/**
+	 * @param string $key
+	 */
 	public static function set($key, $value)
 	{
 		if (!static::$request) {
@@ -386,6 +406,9 @@ 
 		return static::$request->set($key, $value);
 	}
 
+	/**
+	 * @param string $key
+	 */
 	public static function isEmpty($key)
 	{
 		if (!static::$request) {

libraries/antlr/MismatchedRangeException.php

Spacing +1 added lines, -1 removed lines

@@ -38,7 +38,7 @@
 	}
 
 	public function __toString() {
-		return "MismatchedNotSetException(".$this->getUnexpectedType()." not in [".a.",".b."])";
+		return "MismatchedNotSetException(" . $this->getUnexpectedType() . " not in [" . a . "," . b . "])";
 	}
 }
 

libraries/antlr/AntlrParser.php

Indentation +2 added lines, -2 removed lines

@@ -37,7 +37,7 @@ 
 	public function __construct($input, $state = null) {
 		parent::__construct($state); // share the state object with another parser
 		$this->setTokenStream($input);
-    }
+	}
 
 	public function reset() {
 		parent::reset(); // reset all recognizer state variables
@@ -77,7 +77,7 @@ 
 		$this->input = $input;
 	}
 
-    public function getTokenStream() {
+	public function getTokenStream() {
 		return $this->input;
 	}
 

Spacing +6 added lines, -6 removed lines

@@ -41,7 +41,7 @@ 
 
 	public function reset() {
 		parent::reset(); // reset all recognizer state variables
-		if ( $this->input!=null ) {
+		if ($this->input != null) {
 			$this->input->seek(0); // rewind the input
 		}
 	}
@@ -53,15 +53,15 @@ 
 	protected function getMissingSymbol($input, $e, $expectedTokenType, $follow)
 	{
 		$tokenText = null;
-		if ( $expectedTokenType==TokenConst::$EOF ){ 
+		if ($expectedTokenType == TokenConst::$EOF) { 
 			$tokenText = "<missing EOF>";
 		} else {
 			$tokenNames = $this->getTokenNames();
-			$tokenText = "<missing ".$tokenNames[$expectedTokenType].">";
+			$tokenText = "<missing " . $tokenNames[$expectedTokenType] . ">";
 		}
 		$t = CommonToken::forTypeAndText($expectedTokenType, $tokenText);
 		$current = $input->LT(1);
-		if ( $current->getType() == TokenConst::$EOF ) {
+		if ($current->getType() == TokenConst::$EOF) {
 			$current = $this->input->LT(-1);
 		}
 		$t->line = $current->getLine();
@@ -85,11 +85,11 @@ 
 		return $this->input->getSourceName();
 	}
 
-	public function traceIn($ruleName, $ruleIndex, $inputSymbol=null)  {
+	public function traceIn($ruleName, $ruleIndex, $inputSymbol = null) {
 		parent::traceIn($ruleName, $ruleIndex, $this->input->LT(1));
 	}
 
-	public function traceOut($ruleName, $ruleIndex, $inputSymbol=null)  {
+	public function traceOut($ruleName, $ruleIndex, $inputSymbol = null) {
 		parent::traceOut($ruleName, $ruleIndex, $this->input->LT(1));
 	}
 	

libraries/antlr/Token.php

Indentation +1 added lines, -1 removed lines

@@ -10,7 +10,7 @@
 
 		public static $MIN_TOKEN_TYPE;// = UP+1;
 
-	    public static $EOF;// = CharStream.EOF;
+		public static $EOF;// = CharStream.EOF;
 		public static $EOF_TOKEN;// = new CommonToken(EOF);
 
 		public static $INVALID_TOKEN_TYPE = 0;

Spacing +26 added lines, -26 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-	class TokenConst{
+	class TokenConst {
 		public static $EOR_TOKEN_TYPE = 1;
 
 		/** imaginary tree navigation type; traverse "get child" link */
@@ -8,18 +8,18 @@ 
 		/** imaginary tree navigation type; finish with a child list */
 		public static $UP = 3;
 
-		public static $MIN_TOKEN_TYPE;// = UP+1;
+		public static $MIN_TOKEN_TYPE; // = UP+1;
 
-	    public static $EOF;// = CharStream.EOF;
-		public static $EOF_TOKEN;// = new CommonToken(EOF);
+	    public static $EOF; // = CharStream.EOF;
+		public static $EOF_TOKEN; // = new CommonToken(EOF);
 
 		public static $INVALID_TOKEN_TYPE = 0;
-		public static $INVALID_TOKEN;// = new CommonToken(INVALID_TOKEN_TYPE);
+		public static $INVALID_TOKEN; // = new CommonToken(INVALID_TOKEN_TYPE);
 
 		/** In an action, a lexer rule can set token to this SKIP_TOKEN and ANTLR
 		 *  will avoid creating a token for this symbol and try to fetch another.
 		 */
-		public static $SKIP_TOKEN;// = new CommonToken(INVALID_TOKEN_TYPE);
+		public static $SKIP_TOKEN; // = new CommonToken(INVALID_TOKEN_TYPE);
 
 		/** All tokens go to the parser (unless skip() is called in that rule)
 		 *  on a particular "channel".  The parser tunes to a particular channel
@@ -34,20 +34,20 @@ 
 	}
 	
 	
-	interface Token{
+	interface Token {
 	}
 	
 	
 	class CommonToken implements Token {
 
 		
-		public function __construct(){
+		public function __construct() {
 			
 		}
 		
-		public static function forInput($input=null, $type, $channel=0, $start=0, $stop=0) {
+		public static function forInput($input = null, $type, $channel = 0, $start = 0, $stop = 0) {
 			$ct = new CommonToken();
-			$ct->charPositionInLine=-1;
+			$ct->charPositionInLine = -1;
 			$ct->input = $input;
 			$ct->type = $type;
 			$ct->channel = $channel;
@@ -56,8 +56,8 @@ 
 			return $ct;
 		}
 		
-		public static function forType($type){
-			return CommonToken::forInput($input=null, $type);
+		public static function forType($type) {
+			return CommonToken::forInput($input = null, $type);
 		}
 	
 		public static function forTypeAndText($type, $text) {
@@ -90,13 +90,13 @@ 
 		}
 
 		public function getText() {
-			if ( $this->text!=null ) {
+			if ($this->text != null) {
 				return $this->text;
 			}
-			if ( $this->input==null ) {
+			if ($this->input == null) {
 				return null;
 			}
-			$this->text = $this->input->substring($this->start,$this->stop);
+			$this->text = $this->input->substring($this->start, $this->stop);
 			return $this->text;
 		}
 
@@ -167,28 +167,28 @@ 
 
 		public function toString() {
 			$channelStr = "";
-			if ( $this->channel>0 ) {
-				$channelStr=",channel=".$this->channel;
+			if ($this->channel > 0) {
+				$channelStr = ",channel=" . $this->channel;
 			}
 			$txt = $this->getText();
-			if ( $txt!=null ) {
-				$txt = str_replace("\n",'\n', $txt);
-				$txt = str_replace("\r",'\r', $txt);
-				$txt = str_replace("\t",'\t', $txt);
+			if ($txt != null) {
+				$txt = str_replace("\n", '\n', $txt);
+				$txt = str_replace("\r", '\r', $txt);
+				$txt = str_replace("\t", '\t', $txt);
 			}
 			else {
 				$txt = "<no text>";
 			}
-			return "[@".$this->getTokenIndex().",".$this->start.":".$this->stop."='".$txt."',<".$this->type.">".$channelStr.",".$this->line.":".$this->getCharPositionInLine()."]";
+			return "[@" . $this->getTokenIndex() . "," . $this->start . ":" . $this->stop . "='" . $txt . "',<" . $this->type . ">" . $channelStr . "," . $this->line . ":" . $this->getCharPositionInLine() . "]";
 		}
 		
-		public function __toString(){
+		public function __toString() {
 			return $this->toString();
 		}
 	}
 	
-	TokenConst::$DEFAULT_CHANNEL=0;
-	TokenConst::$INVALID_TOKEN_TYPE=0;
+	TokenConst::$DEFAULT_CHANNEL = 0;
+	TokenConst::$INVALID_TOKEN_TYPE = 0;
 
 	TokenConst::$EOF = CharStreamConst::$EOF;
 	TokenConst::$EOF_TOKEN = CommonToken::forType(TokenConst::$EOF);
@@ -213,7 +213,7 @@ 
 	
 	
 	
-	TokenConst::$MIN_TOKEN_TYPE = TokenConst::$UP+1;
+	TokenConst::$MIN_TOKEN_TYPE = TokenConst::$UP + 1;
 
 
 

Braces +1 added lines, -2 removed lines

@@ -175,8 +175,7 @@
 				$txt = str_replace("\n",'\n', $txt);
 				$txt = str_replace("\r",'\r', $txt);
 				$txt = str_replace("\t",'\t', $txt);
-			}
-			else {
+			} else {
 				$txt = "<no text>";
 			}
 			return "[@".$this->getTokenIndex().",".$this->start.":".$this->stop."='".$txt."',<".$this->type.">".$channelStr.",".$this->line.":".$this->getCharPositionInLine()."]";

libraries/antlr/RecognizerSharedState.php

Indentation +3 added lines, -3 removed lines

@@ -55,12 +55,12 @@ 
 			 *  something nonnull so that the auto token emit mechanism will not
 			 *  emit another token.
 			 */
-		    $this->token = null;
+			$this->token = null;
 
 			/** What character index in the stream did the current token start at?
 			 *  Needed, for example, to get the text for current token.  Set at
 			 *  the start of nextToken.
-		 	 */
+			 */
 			$this->tokenStartCharIndex = -1;
 
 			/** The line on which the first character of the token resides */
@@ -77,7 +77,7 @@ 
 
 			/** You can set the text for the current token to override what is in
 			 *  the input char buffer.  Use setText() or can set this instance var.
-		 	 */
+			 */
 			$this->text=null;
 			
 		}

Spacing +4 added lines, -4 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 	class RecognizerSharedState {
-		public function __construct(){
+		public function __construct() {
 			/** Track the set of token types that can follow any rule invocation.
 			 *  Stack grows upwards.  When it hits the max, it grows 2x in size
 			 *  and keeps going.
@@ -24,9 +24,9 @@ 
 			/** In lieu of a return value, this indicates that a rule or token
 			 *  has failed to match.  Reset to false upon valid token match.
 			 */
-			$this->failed=false;
+			$this->failed = false;
 			/** Did the recognizer encounter a syntax error?  Track how many. */
-			$this->syntaxErrors=0;
+			$this->syntaxErrors = 0;
 			
 			/** If 0, no backtracking is going on.  Safe to exec actions etc...
 			 *  If >0 then it's the level of backtracking.
@@ -78,7 +78,7 @@ 
 			/** You can set the text for the current token to override what is in
 			 *  the input char buffer.  Use setText() or can set this instance var.
 		 	 */
-			$this->text=null;
+			$this->text = null;
 			
 		}
 

libraries/antlr/AntlrLexer.php

Spacing +46 added lines, -46 removed lines

@@ -2,12 +2,12 @@ 
 /**
  * Base class for lexers
  */
-abstract class AntlrLexer extends BaseRecognizer{
+abstract class AntlrLexer extends BaseRecognizer {
 	public static $DEFAULT_TOKEN_CHANNEL = 0;
 	protected $input;
 	
-	public function __construct($input, &$state=null) {
-		if($state==null){
+	public function __construct($input, &$state = null) {
+		if ($state == null) {
 			$state = new RecognizerSharedState();
 		}
 		$this->state = $state;
@@ -17,10 +17,10 @@ 
 	public function reset() {
 		parent::reset(); // reset all recognizer state variables
 		// wack Lexer state variables
-		if ( $this->input!=null ) {
+		if ($this->input != null) {
 			$this->input->seek(0); // rewind the input
 		}
-		if ( $this->state==null ) {
+		if ($this->state == null) {
 			return; // no shared state work to do
 		}
 		$this->state->token = null;
@@ -39,20 +39,20 @@ 
 	public function nextToken() {
 		while (true) {
 			$this->state->token = null;
-			$this->state->channel = 0;//Token::DEFAULT_CHANNEL;
+			$this->state->channel = 0; //Token::DEFAULT_CHANNEL;
 			$this->state->tokenStartCharIndex = $this->input->index();
 			$this->state->tokenStartCharPositionInLine = $this->input->getCharPositionInLine();
 			$this->state->tokenStartLine = $this->input->getLine();
 			$this->state->text = null;
-			if ( $this->input->LA(1)==CharStreamConst::$EOF ) {
+			if ($this->input->LA(1) == CharStreamConst::$EOF) {
 				return TokenConst::$EOF_TOKEN;
 			}
 			try {
 				$this->mTokens();
-				if ( $this->state->token==null ) {
+				if ($this->state->token == null) {
 					$this->emit();
 				}
-				else if ( $this->state->token==Token::$SKIP_TOKEN ) {
+				else if ($this->state->token == Token::$SKIP_TOKEN) {
 					continue;
 				}
 				return $this->state->token;
@@ -110,10 +110,10 @@ 
 	 *  If you are building trees, then you should also override
 	 *  Parser or TreeParser.getMissingSymbol().
 	 */
-	public function emit($token=null) {
-		if($token==null){
+	public function emit($token = null) {
+		if ($token == null) {
 			$token = CommonToken::forInput($this->input, $this->state->type, $this->state->channel,
-				$this->state->tokenStartCharIndex, $this->getCharIndex()-1);
+				$this->state->tokenStartCharIndex, $this->getCharIndex() - 1);
 			$token->setLine($this->state->tokenStartLine);
 			$token->setText($this->state->text);
 			$token->setCharPositionInLine($this->state->tokenStartCharPositionInLine);
@@ -122,11 +122,11 @@ 
 		return $token;
 	}
 	
-	public function matchString($s){
+	public function matchString($s) {
 		$i = 0;
-		while ( $i<strlen($s)) {
-			if ( $this->input->LA(1)!=charAt($s, $i) ) {
-				if ( $this->state->backtracking>0 ) {
+		while ($i < strlen($s)) {
+			if ($this->input->LA(1) != charAt($s, $i)) {
+				if ($this->state->backtracking > 0) {
 					$this->state->failed = true;
 					return;
 				}
@@ -140,18 +140,18 @@ 
 		}
 	}
 	
-	public function matchAny($x=null) {
+	public function matchAny($x = null) {
 		$this->input->consume();
 	}
 	
 	public function matchChar($c) {
-		if ($this->input->LA(1)!=$c ) {
-			if ( $this->state->backtracking>0 ) {
+		if ($this->input->LA(1) != $c) {
+			if ($this->state->backtracking > 0) {
 				$this->state->failed = true;
 				return;
 			}
 			$mte = new MismatchedTokenException($c, $this->input);
-			$this->recover($mte);  // don't really recover; just consume in lexer
+			$this->recover($mte); // don't really recover; just consume in lexer
 			throw $mte;
 		}
 		$this->input->consume();
@@ -159,8 +159,8 @@ 
 	}
 	
 	public function matchRange($a, $b) {
-		if ( $this->input->LA(1)<$a || $this->input->LA(1)>$b ) {
-			if ( $this->state->backtracking>0 ) {
+		if ($this->input->LA(1) < $a || $this->input->LA(1) > $b) {
+			if ($this->state->backtracking > 0) {
 				$this->state->failed = true;
 				return;
 			}
@@ -190,10 +190,10 @@ 
 	 *  text override.
 	 */
 	public function getText() {
-		if ( $this->state->text!=null ) {
+		if ($this->state->text != null) {
 			return $this->state->text;
 		}
-		return $this->input->substring($this->state->tokenStartCharIndex,$this->getCharIndex()-1);
+		return $this->input->substring($this->state->tokenStartCharIndex, $this->getCharIndex() - 1);
 	}
 
 	/** Set the complete text of this token; it wipes any previous
@@ -220,35 +220,35 @@ 
 	
 	public function getErrorMessage($e, $tokenNames) {
 		$msg = null;
-		if ( $e instanceof MismatchedTokenException ) {
+		if ($e instanceof MismatchedTokenException) {
 			$mte = $e;
-			$msg = "mismatched character ".$this->getCharErrorDisplay($e->c).
-				" expecting ".$this->getCharErrorDisplay($mte->expecting);
+			$msg = "mismatched character " . $this->getCharErrorDisplay($e->c) .
+				" expecting " . $this->getCharErrorDisplay($mte->expecting);
 		}
-		else if ( $e instanceof NoViableAltException ) {
+		else if ($e instanceof NoViableAltException) {
 			$nvae = $e;
 			// for development, can add "decision=<<"+nvae.grammarDecisionDescription+">>"
 			// and "(decision="+nvae.decisionNumber+") and
 			// "state "+nvae.stateNumber
-			$msg = "no viable alternative at character ".$this->getCharErrorDisplay($e->c);
+			$msg = "no viable alternative at character " . $this->getCharErrorDisplay($e->c);
 		}
-		else if ( $e instanceof EarlyExitException ) {
+		else if ($e instanceof EarlyExitException) {
 			$eee = $e;
 			// for development, can add "(decision="+eee.decisionNumber+")"
-			$msg = "required (...)+ loop did not match anything at character ".$this->getCharErrorDisplay($e->c);
+			$msg = "required (...)+ loop did not match anything at character " . $this->getCharErrorDisplay($e->c);
 		}
-		else if ( $e instanceof MismatchedNotSetException ) {
+		else if ($e instanceof MismatchedNotSetException) {
 			$mse = $e;
-			$msg = "mismatched character ".$this->getCharErrorDisplay($e->c)." expecting set ".$mse->expecting;
+			$msg = "mismatched character " . $this->getCharErrorDisplay($e->c) . " expecting set " . $mse->expecting;
 		}
-		else if ( $e instanceof MismatchedSetException ) {
+		else if ($e instanceof MismatchedSetException) {
 			$mse = $e;
-			$msg = "mismatched character ".$this->getCharErrorDisplay($e->c)." expecting set ".$mse->expecting;
+			$msg = "mismatched character " . $this->getCharErrorDisplay($e->c) . " expecting set " . $mse->expecting;
 		}
-		else if ( $e instanceof MismatchedRangeException ) {
+		else if ($e instanceof MismatchedRangeException) {
 			$mre = $e;
-			$msg = "mismatched character ".$this->getCharErrorDisplay($e->c)." expecting set ".
-				  $this->getCharErrorDisplay($mre->a)."..".$this->getCharErrorDisplay($mre->b);
+			$msg = "mismatched character " . $this->getCharErrorDisplay($e->c) . " expecting set " .
+				  $this->getCharErrorDisplay($mre->a) . ".." . $this->getCharErrorDisplay($mre->b);
 		}
 		else {
 			$msg = parent::getErrorMessage($e, $tokenNames);
@@ -258,7 +258,7 @@ 
 	
 	public function getCharErrorDisplay($c) {
 		$s = chr($c);
-		switch ( $s ) {
+		switch ($s) {
 			case '\n' :
 				$s = "\\n";
 				break;
@@ -269,10 +269,10 @@ 
 				$s = "\\r";
 				break;
 		}
-		if ($c==TokenConst::$EOF){
+		if ($c == TokenConst::$EOF) {
 			$s = "<EOF>";
 		}
-		return "'".$s."'";
+		return "'" . $s . "'";
 	}
 	
 	/** Lexers can normally match any char in it's vocabulary after matching
@@ -280,18 +280,18 @@ 
 	 *  it all works out.  You can instead use the rule invocation stack
 	 *  to do sophisticated error recovery if you are in a fragment rule.
 	 */
-	public function recover($re, $input=null) {
+	public function recover($re, $input = null) {
 		$this->input->consume();
 	}
 	
 	
-	public function traceIn($ruleName, $ruleIndex, $inputSymbol=null)  {
-		$inputSymbol = $this->input->LT(1)." line=".$this->getLine().":".$this->getCharPositionInLine();
+	public function traceIn($ruleName, $ruleIndex, $inputSymbol = null) {
+		$inputSymbol = $this->input->LT(1) . " line=" . $this->getLine() . ":" . $this->getCharPositionInLine();
 		parent::traceIn($ruleName, $ruleIndex, $inputSymbol);
 	}
 
-	public function traceOut($ruleName, $ruleIndex, $inputSymbol=null)  {
-		$inputSymbol = $this->input->LT(1)." line=".$this->getLine().":".$this->getCharPositionInLine();
+	public function traceOut($ruleName, $ruleIndex, $inputSymbol = null) {
+		$inputSymbol = $this->input->LT(1) . " line=" . $this->getLine() . ":" . $this->getCharPositionInLine();
 		parent::traceOut($ruleName, $ruleIndex, $inputSymbol);
 	}
 }

Braces +9 added lines, -18 removed lines

@@ -51,17 +51,14 @@ 
 				$this->mTokens();
 				if ( $this->state->token==null ) {
 					$this->emit();
-				}
-				else if ( $this->state->token==Token::$SKIP_TOKEN ) {
+				} else if ( $this->state->token==Token::$SKIP_TOKEN ) {
 					continue;
 				}
 				return $this->state->token;
-			}
-			catch (NoViableAltException $nva) {
+			} catch (NoViableAltException $nva) {
 				$this->reportError($nva);
 				$this->recover($nva); // throw out current char and try again
-			}
-			catch (RecognitionException $re) {
+			} catch (RecognitionException $re) {
 				$this->reportError($re);
 				// match() routine has already called recover()
 			}
@@ -224,33 +221,27 @@ 
 			$mte = $e;
 			$msg = "mismatched character ".$this->getCharErrorDisplay($e->c).
 				" expecting ".$this->getCharErrorDisplay($mte->expecting);
-		}
-		else if ( $e instanceof NoViableAltException ) {
+		} else if ( $e instanceof NoViableAltException ) {
 			$nvae = $e;
 			// for development, can add "decision=<<"+nvae.grammarDecisionDescription+">>"
 			// and "(decision="+nvae.decisionNumber+") and
 			// "state "+nvae.stateNumber
 			$msg = "no viable alternative at character ".$this->getCharErrorDisplay($e->c);
-		}
-		else if ( $e instanceof EarlyExitException ) {
+		} else if ( $e instanceof EarlyExitException ) {
 			$eee = $e;
 			// for development, can add "(decision="+eee.decisionNumber+")"
 			$msg = "required (...)+ loop did not match anything at character ".$this->getCharErrorDisplay($e->c);
-		}
-		else if ( $e instanceof MismatchedNotSetException ) {
+		} else if ( $e instanceof MismatchedNotSetException ) {
 			$mse = $e;
 			$msg = "mismatched character ".$this->getCharErrorDisplay($e->c)." expecting set ".$mse->expecting;
-		}
-		else if ( $e instanceof MismatchedSetException ) {
+		} else if ( $e instanceof MismatchedSetException ) {
 			$mse = $e;
 			$msg = "mismatched character ".$this->getCharErrorDisplay($e->c)." expecting set ".$mse->expecting;
-		}
-		else if ( $e instanceof MismatchedRangeException ) {
+		} else if ( $e instanceof MismatchedRangeException ) {
 			$mre = $e;
 			$msg = "mismatched character ".$this->getCharErrorDisplay($e->c)." expecting set ".
 				  $this->getCharErrorDisplay($mre->a)."..".$this->getCharErrorDisplay($mre->b);
-		}
-		else {
+		} else {
 			$msg = parent::getErrorMessage($e, $tokenNames);
 		}
 		return $msg;

Doc Comments +13 added lines

@@ -122,6 +122,9 @@ 
 		return $token;
 	}
 	
+	/**
+	 * @param string $s
+	 */
 	public function matchString($s){
 		$i = 0;
 		while ( $i<strlen($s)) {
@@ -144,6 +147,9 @@ 
 		$this->input->consume();
 	}
 	
+	/**
+	 * @param integer $c
+	 */
 	public function matchChar($c) {
 		if ($this->input->LA(1)!=$c ) {
 			if ( $this->state->backtracking>0 ) {
@@ -158,6 +164,10 @@ 
 		$this->state->failed = false;
 	}
 	
+	/**
+	 * @param integer $a
+	 * @param integer $b
+	 */
 	public function matchRange($a, $b) {
 		if ( $this->input->LA(1)<$a || $this->input->LA(1)>$b ) {
 			if ( $this->state->backtracking>0 ) {
@@ -203,6 +213,9 @@ 
 		$this->state->text = $text;
 	}
 	
+	/**
+	 * @param RecognitionException $e
+	 */
 	public function reportError($e) {
 		$this->displayRecognitionError($this->getTokenNames(), $e);
 	}

libraries/antlr/MismatchedTokenException.php

Spacing +2 added lines, -2 removed lines

@@ -30,13 +30,13 @@
 /** A mismatched char or Token or tree node */
 class MismatchedTokenException extends RecognitionException {
 
-	public function __construct($expecting=0, $input=null) {
+	public function __construct($expecting = 0, $input = null) {
 		parent::__construct($input);
 		$this->expecting = $expecting;
 	}
 
 	public function __toString() {
-		return "MismatchedTokenException(".$this->getUnexpectedType()."!=".$this->expecting.")";
+		return "MismatchedTokenException(" . $this->getUnexpectedType() . "!=" . $this->expecting . ")";
 	}
 }
 ?>