#92 : checkWhiteSpaceBefore {, unless it's in

Author: IGNBPesty

RELEASE_NOTES.txt

@@ -2,6 +2,11 @@
                          ===========================
 
 
+Version 0.14.8
+--------------
+* Issue #92 : checkWhiteSpaceBefore "{", unless it's in ${var}
+* Issue #89 : False error "The function parameters must match those in its docblock @param" when using local variable tag
+
 Version 0.14.7
 --------------
 * Issue #81 : Fail to detect private functions with spaces after function (thanks to Hans-Christian Halfbrodt)

src/PHPCheckstyle/PHPCheckstyle.php

@@ -3730,6 +3730,7 @@ private function _checkVariableVariable($token) {
 	/**
 	 * Check the use of a complex variable ${.
 	 *
+	 * Skip the analysis inside the variable.
 	 * Should be the token T_DOLLAR_OPEN_CURLY_BRACES but can also be T_DOLLAR + T_BRACES_OPEN
 	 *
 	 * Called when the current token is a single $.
@@ -3738,17 +3739,14 @@ private function _checkVariableVariable($token) {
 	 */
 	private function _checkComplexVariable($token) {
 		if ($this->tokenizer->checkNextToken(T_BRACES_OPEN)) {
-			// We skip the T_BRACES_OPEN and T_BRACES_CLOSE analysis to avoid the creation of a new statement level.
-			$valueToken = $this->tokenizer->peekNextValidToken($token->position + 2);
-			$closeToken = $this->tokenizer->peekNextValidToken($valueToken->position + 1);
 
-			if ($closeToken->id === T_BRACES_CLOSE) {
+			// Detect the end of the complexe variable
+			$closePos = $this->tokenizer->findNextTokenPosition(T_BRACES_CLOSE);
 
-				$this->tokenizer->setCurrentPosition($valueToken->position);
+			if ($closePos !== null) {
 
-				$this->_processVariable($valueToken->text);
-
-				$this->tokenizer->setCurrentPosition($closeToken->position + 1);
+				// Skip the analysis of the content of the variable.
+				$this->tokenizer->setCurrentPosition($closePos + 1);
 			}
 		}
 	}