YetiForceCompany / YetiForceCRM

include/fields/DateTimeRange.php

Doc Comments +3 added lines, -3 removed lines

@@ -266,7 +266,7 @@ 
 	 * Function to get start and end date of present calendar quarter
 	 * @param int $month
 	 * @param DateTime $dateObject
-	 * @return date range of present quarter
+	 * @return string[] range of present quarter
 	 */
 	public static function getPresentQuarterRange($month = null, &$dateObject = null)
 	{
@@ -299,7 +299,7 @@ 
 	 * Function to get start and end date of previous calendar quarter
 	 * @param int $month
 	 * @param DateTime $dateObject
-	 * @return date range of present quarter
+	 * @return string[] range of present quarter
 	 */
 	public static function getPreviousQuarterRange($month = null, &$dateObject = null)
 	{
@@ -333,7 +333,7 @@ 
 	 * Function to get start and end date of next calendar quarter
 	 * @param int $month
 	 * @param DateTime $dateObject
-	 * @return date range of present quarter
+	 * @return string[] range of present quarter
 	 */
 	public static function getNextQuarterRange($month = null, $dateObject = null)
 	{

include/runtime/cache/Connector.php

Doc Comments +3 added lines

@@ -29,6 +29,9 @@
 		return $ns . '-' . $key;
 	}
 
+	/**
+	 * @param string $namespace
+	 */
 	public function set($namespace, $key, $value)
 	{
 		$this->connection->set($this->cacheKey($namespace, $key), $value);

Braces +3 added lines, -2 removed lines

@@ -24,8 +24,9 @@
 
 	protected function cacheKey($ns, $key)
 	{
-		if (is_array($key))
-			$key = implode('-', $key);
+		if (is_array($key)) {
+					$key = implode('-', $key);
+		}
 		return $ns . '-' . $key;
 	}
 

include/runtime/cache/Connectors.php

Doc Comments +6 added lines

@@ -11,11 +11,17 @@
 class Vtiger_Cache_Connector_Memory
 {
 
+	/**
+	 * @param string $key
+	 */
 	public function set($key, $value)
 	{
 		$this->$key = $value;
 	}
 
+	/**
+	 * @param string $key
+	 */
 	public function get($key)
 	{
 		return isset($this->$key) ? $this->$key : false;

include/runtime/Globals.php

Doc Comments +1 added lines, -1 removed lines

@@ -10,7 +10,7 @@
 
 /**
  * Function to get or set a global variable
- * @param type $key
+ * @param string $key
  * @param type $value
  * @return value of the given key
  */

include/Webservices/Custom/ChangePassword.php

Doc Comments +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
 
 /**
  *
- * @param WebserviceId $id
+ * @param string $id
  * @param String $oldPassword
  * @param String $newPassword
  * @param String $confirmPassword

include/Webservices/Custom/DeleteUser.php

Doc Comments +2 added lines

@@ -12,6 +12,8 @@
 
 /**
  * @author MAK
+ * @param string $id
+ * @param string $newOwnerId
  */
 function vtws_deleteUser($id, $newOwnerId, $user)
 {

install/models/InitSchema.php

Doc Comments +6 added lines

@@ -38,6 +38,9 @@ 
 		RecalculateSharingRules();
 	}
 
+	/**
+	 * @param string $location
+	 */
 	public function initializeDatabase($location, $filesName = array())
 	{
 		$this->db->query('SET FOREIGN_KEY_CHECKS = 0;');
@@ -101,6 +104,9 @@ 
 		createUserPrivilegesfile(1);
 	}
 
+	/**
+	 * @param string $query
+	 */
 	public function _splitQueries($query)
 	{
 		$buffer = array();

Braces +3 added lines, -2 removed lines

@@ -267,8 +267,9 @@
 		if ($rootDirectory && strpos($src, $rootDirectory) === false) {
 			$src = $rootDirectory . $src;
 		}
-		if (!file_exists($src) || !$rootDirectory)
-			return;
+		if (!file_exists($src) || !$rootDirectory) {
+					return;
+		}
 		@chmod($src, 0777);
 		\App\Log::trace("Exiting VT620_to_YT::testest(" . $src . ") method ...");
 		if (is_dir($src)) {

libraries/antlr/BaseRecognizer.php

Doc Comments +7 added lines

@@ -48,6 +48,7 @@ 
 	 *  in a rule will cause an exception and immediate exit from
 	 *  rule.  Rule would recover by resynchronizing to the set of
 	 *  symbols that can follow rule ref.
+	 * @param Set $follow
 	 */
 	public function match($input, $ttype, $follow)
 	{
@@ -490,6 +491,9 @@ 
 		return $this->combineFollows(true);
 	}
 
+	/**
+	 * @param boolean $exact
+	 */
 	protected function combineFollows($exact) {
 		$top = $this->state->_fsp;
 		$followSet = new Set(array());
@@ -832,6 +836,9 @@ 
 		echo "\n";
 	}
 
+	/**
+	 * @param string $name
+	 */
 	public function getToken($name){
 		if(preg_match("/\d+/", $name)){
 			return (integer)$name;

Indentation +3 added lines, -3 removed lines

@@ -88,9 +88,9 @@
 		if ( $follow->member(TokenConst::$EOR_TOKEN_TYPE) ) {
 			$viableTokensFollowingThisRule = $this->computeContextSensitiveRuleFOLLOW();
 			$follow = $follow->union($viableTokensFollowingThisRule);
-            if ( $this->state->_fsp>=0 ) { // remove EOR if we're not the start symbol
-                $follow->remove(TokenConst::$EOR_TOKEN_TYPE);
-            }
+			if ( $this->state->_fsp>=0 ) { // remove EOR if we're not the start symbol
+				$follow->remove(TokenConst::$EOR_TOKEN_TYPE);
+			}
 		}
 		// if current token is consistent with what could come after set
 		// then we know we're missing a token; error recovery is free to

Braces +20 added lines, -34 removed lines

@@ -119,8 +119,7 @@ 
 	{
 		if ( $this->mismatchIsUnwantedToken($input, $ttype) ) {
 			throw new UnwantedTokenException($ttype, $input);
-		}
-		else if ( $this->mismatchIsMissingToken($input, $follow) ) {
+		} else if ( $this->mismatchIsMissingToken($input, $follow) ) {
 			throw new MissingTokenException($ttype, $input, null);
 		}
 		throw new MismatchedTokenException($ttype, $input);
@@ -190,72 +189,60 @@ 
 			$tokenName="<unknown>";
 			if ( $ute->expecting== TokenConst::$EOF ) {
 				$tokenName = "EOF";
-			}
-			else {
+			} else {
 				$tokenName = $tokenNames[$ute->expecting];
 			}
 			$msg = "extraneous input ".$this->getTokenErrorDisplay($ute->getUnexpectedToken()).
 				" expecting ".$tokenName;
-		}
-		else if ( $e instanceof MissingTokenException ) {
+		} else if ( $e instanceof MissingTokenException ) {
 			$mte = $e;
 			$tokenName="<unknown>";
 			if ( $mte->expecting== TokenConst::$EOF ) {
 				$tokenName = "EOF";
-			}
-			else {
+			} else {
 				$tokenName = $tokenNames[$mte->expecting];
 			}
 			$msg = "missing ".$tokenName." at ".$this->getTokenErrorDisplay($e->token);
-		}
-		else if ( $e instanceof MismatchedTokenException ) {
+		} else if ( $e instanceof MismatchedTokenException ) {
 			$mte = $e;
 			$tokenName="<unknown>";
 			if ( $mte->expecting== TokenConst::$EOF ) {
 				$tokenName = "EOF";
-			}
-			else {
+			} else {
 				$tokenName = $tokenNames[$mte->expecting];
 			}
 			$msg = "mismatched input ".$this->getTokenErrorDisplay($e->token).
 				" expecting ".$tokenName;
-		}
-		else if ( $e instanceof MismatchedTreeNodeException ) {
+		} else if ( $e instanceof MismatchedTreeNodeException ) {
 			$mtne = $e;
 			$tokenName="<unknown>";
 			if ( $mtne->expecting==TokenConst::$EOF ) {
 				$tokenName = "EOF";
-			}
-			else {
+			} else {
 				$tokenName = $tokenNames[$mtne->expecting];
 			}
 			$msg = "mismatched tree node: ".$mtne->node.
 				" expecting ".$tokenName;
-		}
-		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 input ".$this->getTokenErrorDisplay($e->token);
-		}
-		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 input ".
 				getTokenErrorDisplay($e->token);
-		}
-		else if ( $e instanceof MismatchedSetException ) {
+		} else if ( $e instanceof MismatchedSetException ) {
 			$mse = $e;
 			$msg = "mismatched input ".$this->getTokenErrorDisplay($e->token).
 				" expecting set ".$mse->expecting;
-		}
-		else if ( $e instanceof MismatchedNotSetException ) {
+		} else if ( $e instanceof MismatchedNotSetException ) {
 			$mse = $e;
 			$msg = "mismatched input ".$this->getTokenErrorDisplay($e->token).
 				" expecting set ".$mse->expecting;
-		}
-		else if ( $e instanceof FailedPredicateException ) {
+		} else if ( $e instanceof FailedPredicateException ) {
 			$fpe = $e;
 			$msg = "rule ".$fpe->ruleName." failed predicate: {".
 				$fpe->predicateText."}?";
@@ -293,8 +280,7 @@ 
 		if ( $s==null ) {
 			if ( $t->getType()==TokenConst::$EOF ) {
 				$s = "<EOF>";
-			}
-			else {
+			} else {
 				$s = "<".$t->getType().">";
 			}
 		}
@@ -508,8 +494,7 @@ 
 					if ( $i>0 ) {
 						$followSet->remove(TokenConst::$EOR_TOKEN_TYPE);
 					}
-				}
-				else { // can't see end of rule, quit
+				} else { // can't see end of rule, quit
 					break;
 				}
 			}
@@ -725,7 +710,9 @@ 
 	 *  Convert a List<Token> to List<String>
 	 */
 	public function toStrings($tokens) {
-		if ( $tokens==null ) return null;
+		if ( $tokens==null ) {
+			return null;
+		}
 		$strings = array();
 		for ($i=0; $i<$tokens->size(); $i++) {
 			$strings[] = $tokens[$i]->getText();
@@ -772,8 +759,7 @@ 
 		if ( $stopIndex==self::$MEMO_RULE_FAILED ) {
 			//System.out.println("rule "+ruleIndex+" will never succeed");
 			$this->state->failed=true;
-		}
-		else {
+		} else {
 			//System.out.println("seen rule "+ruleIndex+" before; skipping ahead to @"+(stopIndex+1)+" failed="+state.failed);
 			$input->seek($stopIndex+1); // jump to one past stop token
 		}
@@ -835,7 +821,7 @@ 
 	public function getToken($name){
 		if(preg_match("/\d+/", $name)){
 			return (integer)$name;
-		}else{
+		} else{
 			return $this->$name;
 		}
 	}

Spacing +102 added lines, -102 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-abstract class BaseRecognizer{
+abstract class BaseRecognizer {
 	
 	public static $MEMO_RULE_FAILED = -2;
 	public static $MEMO_RULE_UNKNOWN = -1;
@@ -13,7 +13,7 @@ 
 	public static $NEXT_TOKEN_RULE_NAME = "nextToken";
 	
 	public function __construct($state = null) {
-		if ( $state==null ) {
+		if ($state == null) {
 			$state = new RecognizerSharedState();
 		}
 		$this->state = $state;
@@ -22,7 +22,7 @@ 
 	/** reset the parser's state; subclasses must rewinds the input stream */
 	public function reset() {
 		// wack everything related to error recovery
-		if ( $this->state==null ) {
+		if ($this->state == null) {
 			return; // no shared state work to do
 		}
 		$this->state->_fsp = -1;
@@ -32,7 +32,7 @@ 
 		$this->state->syntaxErrors = 0;
 		// wack everything related to backtracking and memoization
 		$this->state->backtracking = 0;
-		for ($i = 0; $this->state->ruleMemo!=null && $i < $this->state->ruleMemo->length; $i++) { // wipe cache
+		for ($i = 0; $this->state->ruleMemo != null && $i < $this->state->ruleMemo->length; $i++) { // wipe cache
 			$this->state->ruleMemo[$i] = null;
 		}
 	}
@@ -53,13 +53,13 @@ 
 	{
 		//System.out.println("match "+((TokenStream)input).LT(1));
 		$matchedSymbol = $this->getCurrentInputSymbol($input);
-		if ( $input->LA(1)==$ttype ) {
+		if ($input->LA(1) == $ttype) {
 			$input->consume();
 			$this->state->errorRecovery = false;
 			$this->state->failed = false;
 			return $matchedSymbol;
 		}
-		if ( $this->state->backtracking>0 ) {
+		if ($this->state->backtracking > 0) {
 			$this->state->failed = true;
 			return $matchedSymbol;
 		}
@@ -75,20 +75,20 @@ 
 	}
 
 	public function mismatchIsUnwantedToken($input, $ttype) {
-		return $input->LA(2)==$ttype;
+		return $input->LA(2) == $ttype;
 	}
 
 	public function mismatchIsMissingToken($input, $follow) {
-		if ( $follow==null ) {
+		if ($follow == null) {
 			// we have no information about the follow; we can only consume
 			// a single token and hope for the best
 			return $false;
 		}
 		// compute what can follow this grammar element reference
-		if ( $follow->member(TokenConst::$EOR_TOKEN_TYPE) ) {
+		if ($follow->member(TokenConst::$EOR_TOKEN_TYPE)) {
 			$viableTokensFollowingThisRule = $this->computeContextSensitiveRuleFOLLOW();
 			$follow = $follow->union($viableTokensFollowingThisRule);
-            if ( $this->state->_fsp>=0 ) { // remove EOR if we're not the start symbol
+            if ($this->state->_fsp >= 0) { // remove EOR if we're not the start symbol
                 $follow->remove(TokenConst::$EOR_TOKEN_TYPE);
             }
 		}
@@ -102,7 +102,7 @@ 
 		// BitSet cannot handle negative numbers like -1 (EOF) so I leave EOR
 		// in follow set to indicate that the fall of the start symbol is
 		// in the set (EOF can follow).
-		if ( $follow->member($input->LA(1)) || $follow->member(TokenConst::$EOR_TOKEN_TYPE) ) {
+		if ($follow->member($input->LA(1)) || $follow->member(TokenConst::$EOR_TOKEN_TYPE)) {
 			//System.out.println("LT(1)=="+((TokenStream)input).LT(1)+" is consistent with what follows; inserting...");
 			return true;
 		}
@@ -117,10 +117,10 @@ 
 	 */
 	protected function mismatch($input, $ttype, $follow)
 	{
-		if ( $this->mismatchIsUnwantedToken($input, $ttype) ) {
+		if ($this->mismatchIsUnwantedToken($input, $ttype)) {
 			throw new UnwantedTokenException($ttype, $input);
 		}
-		else if ( $this->mismatchIsMissingToken($input, $follow) ) {
+		else if ($this->mismatchIsMissingToken($input, $follow)) {
 			throw new MissingTokenException($ttype, $input, null);
 		}
 		throw new MismatchedTokenException($ttype, $input);
@@ -144,7 +144,7 @@ 
 	public function reportError($e) {
 		// if we've already reported an error and have not matched a token
 		// yet successfully, don't report any errors.
-		if ( $this->state->errorRecovery ) {
+		if ($this->state->errorRecovery) {
 			//System.err.print("[SPURIOUS] ");
 			return;
 		}
@@ -155,10 +155,10 @@ 
 	}
 	
 	
-	public function displayRecognitionError($tokenNames, $e){
+	public function displayRecognitionError($tokenNames, $e) {
 		$hdr = $this->getErrorHeader($e);
 		$msg = $this->getErrorMessage($e, $tokenNames);
-		$this->emitErrorMessage($hdr." ".$msg);
+		$this->emitErrorMessage($hdr . " " . $msg);
 	}
 	
 	/** What error message should be generated for the various
@@ -185,80 +185,80 @@ 
 	 */
 	public function getErrorMessage($e, $tokenNames) {
 		$msg = $e->getMessage();
-		if ( $e instanceof UnwantedTokenException ) {
+		if ($e instanceof UnwantedTokenException) {
 			$ute = $e;
-			$tokenName="<unknown>";
-			if ( $ute->expecting== TokenConst::$EOF ) {
+			$tokenName = "<unknown>";
+			if ($ute->expecting == TokenConst::$EOF) {
 				$tokenName = "EOF";
 			}
 			else {
 				$tokenName = $tokenNames[$ute->expecting];
 			}
-			$msg = "extraneous input ".$this->getTokenErrorDisplay($ute->getUnexpectedToken()).
-				" expecting ".$tokenName;
+			$msg = "extraneous input " . $this->getTokenErrorDisplay($ute->getUnexpectedToken()) .
+				" expecting " . $tokenName;
 		}
-		else if ( $e instanceof MissingTokenException ) {
+		else if ($e instanceof MissingTokenException) {
 			$mte = $e;
-			$tokenName="<unknown>";
-			if ( $mte->expecting== TokenConst::$EOF ) {
+			$tokenName = "<unknown>";
+			if ($mte->expecting == TokenConst::$EOF) {
 				$tokenName = "EOF";
 			}
 			else {
 				$tokenName = $tokenNames[$mte->expecting];
 			}
-			$msg = "missing ".$tokenName." at ".$this->getTokenErrorDisplay($e->token);
+			$msg = "missing " . $tokenName . " at " . $this->getTokenErrorDisplay($e->token);
 		}
-		else if ( $e instanceof MismatchedTokenException ) {
+		else if ($e instanceof MismatchedTokenException) {
 			$mte = $e;
-			$tokenName="<unknown>";
-			if ( $mte->expecting== TokenConst::$EOF ) {
+			$tokenName = "<unknown>";
+			if ($mte->expecting == TokenConst::$EOF) {
 				$tokenName = "EOF";
 			}
 			else {
 				$tokenName = $tokenNames[$mte->expecting];
 			}
-			$msg = "mismatched input ".$this->getTokenErrorDisplay($e->token).
-				" expecting ".$tokenName;
+			$msg = "mismatched input " . $this->getTokenErrorDisplay($e->token) .
+				" expecting " . $tokenName;
 		}
-		else if ( $e instanceof MismatchedTreeNodeException ) {
+		else if ($e instanceof MismatchedTreeNodeException) {
 			$mtne = $e;
-			$tokenName="<unknown>";
-			if ( $mtne->expecting==TokenConst::$EOF ) {
+			$tokenName = "<unknown>";
+			if ($mtne->expecting == TokenConst::$EOF) {
 				$tokenName = "EOF";
 			}
 			else {
 				$tokenName = $tokenNames[$mtne->expecting];
 			}
-			$msg = "mismatched tree node: ".$mtne->node.
-				" expecting ".$tokenName;
+			$msg = "mismatched tree node: " . $mtne->node .
+				" expecting " . $tokenName;
 		}
-		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 input ".$this->getTokenErrorDisplay($e->token);
+			$msg = "no viable alternative at input " . $this->getTokenErrorDisplay($e->token);
 		}
-		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 input ".
+			$msg = "required (...)+ loop did not match anything at input " .
 				getTokenErrorDisplay($e->token);
 		}
-		else if ( $e instanceof MismatchedSetException ) {
+		else if ($e instanceof MismatchedSetException) {
 			$mse = $e;
-			$msg = "mismatched input ".$this->getTokenErrorDisplay($e->token).
-				" expecting set ".$mse->expecting;
+			$msg = "mismatched input " . $this->getTokenErrorDisplay($e->token) .
+				" expecting set " . $mse->expecting;
 		}
-		else if ( $e instanceof MismatchedNotSetException ) {
+		else if ($e instanceof MismatchedNotSetException) {
 			$mse = $e;
-			$msg = "mismatched input ".$this->getTokenErrorDisplay($e->token).
-				" expecting set ".$mse->expecting;
+			$msg = "mismatched input " . $this->getTokenErrorDisplay($e->token) .
+				" expecting set " . $mse->expecting;
 		}
-		else if ( $e instanceof FailedPredicateException ) {
+		else if ($e instanceof FailedPredicateException) {
 			$fpe = $e;
-			$msg = "rule ".$fpe->ruleName." failed predicate: {".
-				$fpe->predicateText."}?";
+			$msg = "rule " . $fpe->ruleName . " failed predicate: {" .
+				$fpe->predicateText . "}?";
 		}
 		return $msg;
 	}
@@ -276,7 +276,7 @@ 
 
 	/** What is the error header, normally line/character position information? */
 	public function getErrorHeader($e) {
-		return "line ".$e->line.":".$e->charPositionInLine;
+		return "line " . $e->line . ":" . $e->charPositionInLine;
 	}
 	
 	
@@ -290,18 +290,18 @@ 
 	 */
 	public function getTokenErrorDisplay($t) {
 		$s = $t->getText();
-		if ( $s==null ) {
-			if ( $t->getType()==TokenConst::$EOF ) {
+		if ($s == null) {
+			if ($t->getType() == TokenConst::$EOF) {
 				$s = "<EOF>";
 			}
 			else {
-				$s = "<".$t->getType().">";
+				$s = "<" . $t->getType() . ">";
 			}
 		}
 		$s = str_replace("\n", '\n', $s);
-		$s = str_replace("\r",'\r', $s);
-		$s = str_replace("\t",'\t', $s);
-		return "'".$s."'";
+		$s = str_replace("\r", '\r', $s);
+		$s = str_replace("\t", '\t', $s);
+		return "'" . $s . "'";
 	}
 
 	/** Override this method to change where error messages go */
@@ -316,7 +316,7 @@ 
 	 *  token that the match() routine could not recover from.
 	 */
 	public function recover($input, $re = null) {
-		if ( $this->state->lastErrorIndex==$input->index() ) {
+		if ($this->state->lastErrorIndex == $input->index()) {
 			// uh oh, another error at same token index; must be a case
 			// where LT(1) is in the recovery token set so nothing is
 			// consumed; consume a single token so at least to prevent
@@ -493,19 +493,19 @@ 
 	protected function combineFollows($exact) {
 		$top = $this->state->_fsp;
 		$followSet = new Set(array());
-		for ($i=$top; $i>=0; $i--) {
+		for ($i = $top; $i >= 0; $i--) {
 			$localFollowSet = $this->state->following[$i];
 			/*
 			System.out.println("local follow depth "+i+"="+
 							   localFollowSet.toString(getTokenNames())+")");
 			 */
 			$followSet->unionInPlace($localFollowSet);
-			if ( $this->exact ) {
+			if ($this->exact) {
 				// can we see end of rule?
-				if ( $localFollowSet->member(TokenConst::$EOR_TOKEN_TYPE) ) {
+				if ($localFollowSet->member(TokenConst::$EOR_TOKEN_TYPE)) {
 					// Only leave EOR in set if at top (start rule); this lets
 					// us know if have to include follow(start rule); i.e., EOF
-					if ( $i>0 ) {
+					if ($i > 0) {
 						$followSet->remove(TokenConst::$EOR_TOKEN_TYPE);
 					}
 				}
@@ -551,7 +551,7 @@ 
 		$e = null;
 		// if next token is what we are looking for then "delete" this token
 
-		if ( $this->mismatchIsUnwantedToken($input, $ttype) ) {
+		if ($this->mismatchIsUnwantedToken($input, $ttype)) {
 			$e = new UnwantedTokenException($ttype, $input);
 			/*
 			System.err.println("recoverFromMismatchedToken deleting "+
@@ -561,17 +561,17 @@ 
 			$this->beginResync();
 			$input->consume(); // simply delete extra token
 			$this->endResync();
-			$this->reportError($e);  // report after consuming so AW sees the token in the exception
+			$this->reportError($e); // report after consuming so AW sees the token in the exception
 			// we want to return the token we're actually matching
 			$matchedSymbol = $this->getCurrentInputSymbol($input);
 			$input->consume(); // move past ttype token as if all were ok
 			return $matchedSymbol;
 		}
 		// can't recover with single token deletion, try insertion
-		if ( $this->mismatchIsMissingToken($input, $follow) ) {
+		if ($this->mismatchIsMissingToken($input, $follow)) {
 			$inserted = $this->getMissingSymbol($input, $e, $ttype, $follow);
 			$e = new MissingTokenException($ttype, $input, $inserted);
-			$this->reportError($e);  // report after inserting so AW sees the token in the exception
+			$this->reportError($e); // report after inserting so AW sees the token in the exception
 			return $inserted;
 		}
 		// even that didn't work; must throw the exception
@@ -581,7 +581,7 @@ 
 
 	/** Not currently used */
 	public function recoverFromMismatchedSet($input, $e, $follow) {
-		if ( $this->mismatchIsMissingToken($input, $follow) ) {
+		if ($this->mismatchIsMissingToken($input, $follow)) {
 			// System.out.println("missing token");
 			reportError($e);
 			// we don't know how to conjure up a token for sets yet
@@ -637,7 +637,7 @@ 
 	public function consumeUntilInSet($input, $set) {
 		//System.out.println("consumeUntil("+set.toString(getTokenNames())+")");
 		$ttype = $input->LA(1);
-		while ($ttype != TokenConst::$EOF && !$set->member($ttype) ) {
+		while ($ttype != TokenConst::$EOF && !$set->member($ttype)) {
 			//System.out.println("consume during recover LA(1)="+getTokenNames()[input.LA(1)]);
 			$input->consume();
 			$ttype = $input->LA(1);
@@ -654,13 +654,13 @@ 
  		$this->state->following[++$this->state->_fsp] = $fset;
 	}
 
-	public static function getRuleInvocationStack($e=null,
-											  $recognizerClassName=null)
+	public static function getRuleInvocationStack($e = null,
+											  $recognizerClassName = null)
 	{
-		if($e==null){
+		if ($e == null) {
 			$e = new Exception();
 		}
-		if($recognizerClassName==null){
+		if ($recognizerClassName == null) {
 			$recognizerClassName = get_class($this);
 		}
 		throw new Exception("Not implemented yet");
@@ -708,9 +708,9 @@ 
 	 *  Convert a List<Token> to List<String>
 	 */
 	public function toStrings($tokens) {
-		if ( $tokens==null ) return null;
+		if ($tokens == null) return null;
 		$strings = array();
-		for ($i=0; $i<$tokens->size(); $i++) {
+		for ($i = 0; $i < $tokens->size(); $i++) {
 			$strings[] = $tokens[$i]->getText();
 		}
 		return $strings;
@@ -727,12 +727,12 @@ 
 	 *  tosses out data after we commit past input position i.
 	 */
 	public function getRuleMemoization($ruleIndex, $ruleStartIndex) {
-		if ( $this->state->ruleMemo[$ruleIndex]==null ) {
+		if ($this->state->ruleMemo[$ruleIndex] == null) {
 			$this->state->ruleMemo[$ruleIndex] = array();
 		}
 		$stopIndexI =
 			$this->state->ruleMemo[$ruleIndex][$ruleStartIndex];
-		if ( $stopIndexI==null ) {
+		if ($stopIndexI == null) {
 			return self::$MEMO_RULE_UNKNOWN;
 		}
 		return $stopIndexI;
@@ -749,16 +749,16 @@ 
 	 */
 	public function alreadyParsedRule($input, $ruleIndex) {
 		$stopIndex = $this->getRuleMemoization($ruleIndex, $input->index());
-		if ( $stopIndex==self::$MEMO_RULE_UNKNOWN ) {
+		if ($stopIndex == self::$MEMO_RULE_UNKNOWN) {
 			return false;
 		}
-		if ( $stopIndex==self::$MEMO_RULE_FAILED ) {
+		if ($stopIndex == self::$MEMO_RULE_FAILED) {
 			//System.out.println("rule "+ruleIndex+" will never succeed");
-			$this->state->failed=true;
+			$this->state->failed = true;
 		}
 		else {
 			//System.out.println("seen rule "+ruleIndex+" before; skipping ahead to @"+(stopIndex+1)+" failed="+state.failed);
-			$input->seek($stopIndex+1); // jump to one past stop token
+			$input->seek($stopIndex + 1); // jump to one past stop token
 		}
 		return true;
 	}
@@ -766,61 +766,61 @@ 
 	/** Record whether or not this rule parsed the input at this position
 	 *  successfully.  Use a standard java hashtable for now.
 	 */
-	public function memoize($input, $ruleIndex, $ruleStartIndex){
-		$stopTokenIndex = $this->state->failed?self::$MEMO_RULE_FAILED:$input->index()-1;
-		if ( $this->state->ruleMemo==null ) {
-			echo("!!!!!!!!! memo array is null for ". getGrammarFileName());
+	public function memoize($input, $ruleIndex, $ruleStartIndex) {
+		$stopTokenIndex = $this->state->failed ? self::$MEMO_RULE_FAILED : $input->index() - 1;
+		if ($this->state->ruleMemo == null) {
+			echo("!!!!!!!!! memo array is null for " . getGrammarFileName());
 		}
-		if ( $ruleIndex >= sizeof($this->state->ruleMemo) ) {
-			echo("!!!!!!!!! memo size is ".sizeof($this->state->ruleMemo).", but rule index is ".$ruleIndex);
+		if ($ruleIndex >= sizeof($this->state->ruleMemo)) {
+			echo("!!!!!!!!! memo size is " . sizeof($this->state->ruleMemo) . ", but rule index is " . $ruleIndex);
 		}
-		if ( $this->state->ruleMemo[$ruleIndex]!=null ) {
+		if ($this->state->ruleMemo[$ruleIndex] != null) {
 			$this->state->ruleMemo[$ruleIndex][$ruleStartIndex] = $stopTokenIndex;
 		}
 	}
 
 	public function getRuleMemoizationCacheSize() {
 		$n = 0;
-		for ($i = 0; $this->state->ruleMemo!=null && $i < sizeof($this->state->ruleMemo); $i++) {
+		for ($i = 0; $this->state->ruleMemo != null && $i < sizeof($this->state->ruleMemo); $i++) {
 			$ruleMap = $this->state->ruleMemo[$i];
-			if ( $ruleMap!=null ) {
+			if ($ruleMap != null) {
 				$n += sizeof($ruleMap); // how many input indexes are recorded?
 			}
 		}
 		return $n;
 	}
 
-	public function traceIn($ruleName, $ruleIndex, $inputSymbol)  {
-		echo("enter ".$ruleName." ".$inputSymbol);
-		if ( $this->state->failed ) {
-			echo(" failed=".$this->state->failed);
+	public function traceIn($ruleName, $ruleIndex, $inputSymbol) {
+		echo("enter " . $ruleName . " " . $inputSymbol);
+		if ($this->state->failed) {
+			echo(" failed=" . $this->state->failed);
 		}
-		if ( $this->state->backtracking>0 ) {
-			echo(" backtracking=".$this->state->backtracking);
+		if ($this->state->backtracking > 0) {
+			echo(" backtracking=" . $this->state->backtracking);
 		}
 		echo "\n";
 	}
 
 	public function traceOut($ruleName, $ruleIndex, $inputSymbol) {
-		echo("exit ".$ruleName." ".$inputSymbol);
-		if ( $this->state->failed ) {
-			echo(" failed=".$this->state->failed);
+		echo("exit " . $ruleName . " " . $inputSymbol);
+		if ($this->state->failed) {
+			echo(" failed=" . $this->state->failed);
 		}
-		if ( $this->state->backtracking>0 ) {
+		if ($this->state->backtracking > 0) {
 			echo(" backtracking="+$this->state->backtracking);
 		}
 		echo "\n";
 	}
 
-	public function getToken($name){
-		if(preg_match("/\d+/", $name)){
-			return (integer)$name;
-		}else{
+	public function getToken($name) {
+		if (preg_match("/\d+/", $name)) {
+			return (integer) $name;
+		} else {
 			return $this->$name;
 		}
 	}
 	
-	public function getTokenName($tokenId){
+	public function getTokenName($tokenId) {
 		
 	}
 

libraries/antlr/CharStream.php

Doc Comments +4 added lines

@@ -39,6 +39,7 @@ 
 	/** For infinite streams, you don't need this; primarily I'm providing
 	 *  a useful interface for action code.  Just make sure actions don't
 	 *  use this on streams that don't support it.
+	 * @return string
 	 */
 	public function substring($start, $stop);
 
@@ -55,6 +56,9 @@ 
 	/** Because this stream can rewind, we need to be able to reset the line */
 	public function setLine($line);
 
+	/**
+	 * @return void
+	 */
 	public function setCharPositionInLine($pos);
 
 	/** The index of the character relative to the beginning of the line 0..n-1 */

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
 */
 
 
-class CharStreamConst{
+class CharStreamConst {
 	public static $EOF = -1;
 }
 $CharStream_EOF = -1;