Remove null return type of findVariableScopeExceptArrowFunctions

sirbrillig · sirbrillig · commit f678747f72bb · 2025-01-06T10:42:16.000-05:00
diff --git a/VariableAnalysis/Lib/Helpers.php b/VariableAnalysis/Lib/Helpers.php
@@ -538,7 +538,7 @@ public static function getVariablesInsideCompact(File $phpcsFile, $stackPtr, $ar
 	 * @param File $phpcsFile
 	 * @param int  $stackPtr
 	 *
-	 * @return ?int
+	 * @return int
 	 */
 	public static function findVariableScopeExceptArrowFunctions(File $phpcsFile, $stackPtr)
 	{
@@ -567,7 +567,7 @@ public static function findVariableScopeExceptArrowFunctions(File $phpcsFile, $s
 			return $functionPtr;
 		}
 
-		self::debug('Cannot find function scope for variable at', $stackPtr);
+		self::debug('Cannot find function scope for variable (it may be in an arrow function) at', $stackPtr);
 		return $startOfTokenScope;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -538,7 +538,7 @@ public static function getVariablesInsideCompact(File $phpcsFile, $stackPtr, $ar`
`538`	`538`	`* @param File $phpcsFile`
`539`	`539`	`* @param int $stackPtr`
`540`	`540`	`*`
`541`		`- * @return ?int`
	`541`	`+ * @return int`
`542`	`542`	`*/`
`543`	`543`	`public static function findVariableScopeExceptArrowFunctions(File $phpcsFile, $stackPtr)`
`544`	`544`	`{`
`@@ -567,7 +567,7 @@ public static function findVariableScopeExceptArrowFunctions(File $phpcsFile, $s`
`567`	`567`	`return $functionPtr;`
`568`	`568`	`}`
`569`	`569`
`570`		`- self::debug('Cannot find function scope for variable at', $stackPtr);`
	`570`	`+ self::debug('Cannot find function scope for variable (it may be in an arrow function) at', $stackPtr);`
`571`	`571`	`return $startOfTokenScope;`
`572`	`572`	`}`
`573`	`573`