Add explicit types for 'nested_parenthesis' (#286)

sirbrillig · web-flow · commit 6a0e2ffef96d · 2022-12-09T18:29:11.000-05:00
* Add explicit types for 'nested_parenthesis'

* Also allow string
diff --git a/VariableAnalysis/Lib/Helpers.php b/VariableAnalysis/Lib/Helpers.php
@@ -69,6 +69,9 @@ public static function findContainingOpeningBracket(File $phpcsFile, $stackPtr)
 	{
 		$tokens = $phpcsFile->getTokens();
 		if (isset($tokens[$stackPtr]['nested_parenthesis'])) {
+			/**
+			 * @var array<int|string|null>
+			 */
 			$openPtrs = array_keys($tokens[$stackPtr]['nested_parenthesis']);
 			return (int)end($openPtrs);
 		}
@@ -1081,6 +1084,9 @@ public static function getFunctionIndexForFunctionCallArgument(File $phpcsFile,
 		if (empty($token['nested_parenthesis'])) {
 			return null;
 		}
+		/**
+		 * @var array<int|string|null>
+		 */
 		$startingParenthesis = array_keys($token['nested_parenthesis']);
 		$startOfArguments = end($startingParenthesis);
 		if (! is_int($startOfArguments)) {

Original file line number	Diff line number	Diff line change
`@@ -69,6 +69,9 @@ public static function findContainingOpeningBracket(File $phpcsFile, $stackPtr)`
`69`	`69`	`{`
`70`	`70`	`$tokens = $phpcsFile->getTokens();`
`71`	`71`	`if (isset($tokens[$stackPtr]['nested_parenthesis'])) {`
	`72`	`+ /**`
	`73`	`+ * @var array<int\|string\|null>`
	`74`	`+ */`
`72`	`75`	`$openPtrs = array_keys($tokens[$stackPtr]['nested_parenthesis']);`
`73`	`76`	`return (int)end($openPtrs);`
`74`	`77`	`}`
`@@ -1081,6 +1084,9 @@ public static function getFunctionIndexForFunctionCallArgument(File $phpcsFile,`
`1081`	`1084`	`if (empty($token['nested_parenthesis'])) {`
`1082`	`1085`	`return null;`
`1083`	`1086`	`}`
	`1087`	`+ /**`
	`1088`	`+ * @var array<int\|string\|null>`
	`1089`	`+ */`
`1084`	`1090`	`$startingParenthesis = array_keys($token['nested_parenthesis']);`
`1085`	`1091`	`$startOfArguments = end($startingParenthesis);`
`1086`	`1092`	`if (! is_int($startOfArguments)) {`