Fix anonym variables to be excluded.

Author: dereuromark

src/Annotator/Template/VariableExtractor.php

@@ -146,6 +146,9 @@ protected function getExcludeReason(File $file, array $result): ?string {
 		if ($this->isTryCatchVar($file, $result)) {
 			return 'Try catch';
 		}
+		if ($this->isAnonymousFunctionParameter($file, $result)) {
+			return 'Anonymous function parameter';
+		}
 
 		if ($this->isAssignment($file, $result)) {
 			return 'Assignment';
@@ -220,6 +223,33 @@ protected function isTryCatchVar(File $file, array $result): bool {
 		return (bool)$file->findPrevious(T_CATCH, $startIndex - 1, $startIndex - 3);
 	}
 
+	/**
+	 * @param \PHP_CodeSniffer\Files\File $file
+	 * @param array<string, mixed> $result
+	 * @return bool
+	 */
+	protected function isAnonymousFunctionParameter(File $file, array $result): bool {
+		if (empty($result['context']['nested_parenthesis'])) {
+			return false;
+		}
+
+		$tokens = $file->getTokens();
+
+		// Check each level of nested parenthesis
+		foreach ($result['context']['nested_parenthesis'] as $openParen => $closeParen) {
+			// Check if this is immediately preceded by 'function' or 'fn' keyword
+			if ($openParen > 0) {
+				$prevToken = $file->findPrevious(T_WHITESPACE, $openParen - 1, (int)max(0, $openParen - 2), true);
+				if ($prevToken !== false && in_array($tokens[$prevToken]['code'], [T_CLOSURE, T_FN], true)) {
+					// This variable is inside an anonymous function's parameter list
+					return true;
+				}
+			}
+		}
+
+		return false;
+	}
+
 	/**
 	 * @param \PHP_CodeSniffer\Files\File $file
 	 * @param array<string, mixed> $result

tests/TestCase/Annotator/Template/VariableExtractorTest.php

@@ -208,4 +208,51 @@ public function testExtractFromStrings(): void {
 		$this->assertSame(['title', 'url'], array_keys($result));
 	}
 
+	/**
+	 * Test that anonymous function parameters are excluded
+	 *
+	 * @return void
+	 */
+	public function testExtractExcludesAnonymousFunctionParameters() {
+		$content = <<<'PHP'
+<?php
+$yourMoodIds = array_map(function($m) { return $m->mood_id; }, $participantMoods ?? []);
+$filtered = array_filter($items, function($item) {
+	return $item->active;
+});
+usort($data, function($a, $b) {
+	return $a->sort_order <=> $b->sort_order;
+});
+$doubled = array_map(fn($x) => $x * 2, $numbers);
+
+// Test with 'use' clause
+$multiplier = 5;
+$result = array_map(function($n) use ($multiplier) {
+	return $n * $multiplier;
+}, $values);
+PHP;
+
+		$file = $this->getFile('', $content);
+
+		$result = $this->variableExtractor->extract($file);
+
+		// Check that regular variables are found with correct exclusion reason
+		$regularVars = ['yourMoodIds', 'participantMoods', 'filtered', 'items', 'data', 'doubled', 'numbers', 'multiplier', 'result', 'values'];
+		foreach ($regularVars as $var) {
+			$this->assertArrayHasKey($var, $result, "Variable \$$var should be found");
+			if (in_array($var, ['yourMoodIds', 'filtered', 'doubled', 'multiplier', 'result'])) {
+				$this->assertEquals('Assignment', $result[$var]['excludeReason'], "Variable \$$var should be excluded as assignment");
+			} else {
+				$this->assertNull($result[$var]['excludeReason'], "Variable \$$var should not be excluded");
+			}
+		}
+
+		// Check that anonymous function parameters are excluded
+		$functionParams = ['m', 'item', 'a', 'b', 'x', 'n'];
+		foreach ($functionParams as $param) {
+			$this->assertArrayHasKey($param, $result, "Parameter \$$param should be found");
+			$this->assertEquals('Anonymous function parameter', $result[$param]['excludeReason'], "Parameter \$$param should be excluded as anonymous function parameter");
+		}
+	}
+
 }

tests/TestCase/Annotator/TemplateAnnotatorTest.php

@@ -465,6 +465,55 @@ public function testAnnotateWithMultilineArray() {
 		$this->assertTextContains('   -> 1 annotation added.', $output);
 	}
 
+	/**
+	 * Tests that anonymous function parameters are excluded from annotations.
+	 *
+	 * @return void
+	 */
+	public function testAnnotateWithAnonymousFunctions() {
+		Configure::write('IdeHelper.autoCollect', 'mixed');
+		$annotator = $this->_getAnnotatorMock([]);
+
+		$expectedVariables = [
+			'$this',
+			'$participantMoods',
+			'$yourMoodIds',
+			'$items',
+			'$filtered',
+			'$data',
+			'$numbers',
+			'$doubled',
+			'$multiplier',
+			'$values',
+			'$result',
+		];
+
+		// Variables that should NOT get annotations (anonymous function parameters)
+		$excludedVariables = ['$m', '$item', '$a', '$b', '$x', '$n'];
+		// Note: $id is excluded too, but it's a foreach loop variable, not an anonymous function parameter
+
+		$callback = function($value) use ($expectedVariables, $excludedVariables) {
+			// Extract just the PHPDoc block
+			if (preg_match('/\/\*\*(.*?)\*\//s', $value, $matches)) {
+				$docBlock = $matches[1];
+
+				foreach ($excludedVariables as $var) {
+					// Check if the variable appears in an @var annotation in the doc block
+					if (preg_match('/@var\s+[^\s]+\s+\\' . preg_quote($var, '/') . '/', $docBlock)) {
+						$this->fail("Variable {$var} should not have an annotation (it's an anonymous function parameter)");
+					}
+				}
+			}
+
+			return true;
+		};
+
+		$annotator->expects($this->once())->method('storeFile')->with($this->anything(), $this->callback($callback));
+
+		$path = APP_ROOT . DS . 'templates/Foos/anonymous.php';
+		$annotator->annotate($path);
+	}
+
 	/**
 	 * @param array $params
 	 * @return \IdeHelper\Annotator\TemplateAnnotator|\PHPUnit\Framework\MockObject\MockObject

tests/test_app/templates/Foos/anonymous.php

@@ -0,0 +1,37 @@
+<?php
+/**
+ * @var \Cake\View\View $this
+ * @var array<\App\Model\Entity\ParticipantMood> $participantMoods
+ */
+?>
+<div>
+	<?php
+	// This should NOT trigger an annotation for $m
+	$yourMoodIds = array_map(function($m) { return $m->mood_id; }, $participantMoods ?? []);
+
+	// This should NOT trigger an annotation for $item
+	$filtered = array_filter($items, function($item) {
+		return $item->active;
+	});
+
+	// This should NOT trigger annotations for $a and $b
+	usort($data, function($a, $b) {
+		return $a->sort_order <=> $b->sort_order;
+	});
+
+	// Arrow function - should NOT trigger annotation for $x
+	$doubled = array_map(fn($x) => $x * 2, $numbers);
+
+	// Variables with 'use' clause - $multiplier should still get annotation
+	$multiplier = 5;
+	$result = array_map(function($n) use ($multiplier) {
+		return $n * $multiplier;
+	}, $values);
+	?>
+
+	<ul>
+		<?php foreach ($yourMoodIds as $id): ?>
+			<li><?= h($id) ?></li>
+		<?php endforeach; ?>
+	</ul>
+</div>