D14564.id35228.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D14564.id35228.diff
View Options

	diff --git a/src/lint/linter/xhpast/rules/ArcanistUnexpectedReturnValueXHPASTLinterRule.php b/src/lint/linter/xhpast/rules/ArcanistUnexpectedReturnValueXHPASTLinterRule.php
	--- a/src/lint/linter/xhpast/rules/ArcanistUnexpectedReturnValueXHPASTLinterRule.php
	+++ b/src/lint/linter/xhpast/rules/ArcanistUnexpectedReturnValueXHPASTLinterRule.php
	@@ -33,6 +33,10 @@
	continue;
	}

	+ if ($this->isInAnonymousFunction($return)) {
	+ continue;
	+ }
	+
	$this->raiseLintAtNode(
	$return,
	pht(
	@@ -45,4 +49,15 @@
	}
	}

	+ private function isInAnonymousFunction(XHPASTNode $node) {
	+ while ($node) {
	+ if ($node->getTypeName() == 'n_FUNCTION_DECLARATION' &&
	+ $node->getChildByIndex(2)->getTypeName() == 'n_EMPTY') {
	+ return true;
	+ }
	+
	+ $node = $node->getParentNode();
	+ }
	+ }
	+
	}
	diff --git a/src/lint/linter/xhpast/rules/__tests__/unexpected-return-value/closure.lint-test b/src/lint/linter/xhpast/rules/__tests__/unexpected-return-value/closure.lint-test
	new file mode 100644
	--- /dev/null
	+++ b/src/lint/linter/xhpast/rules/__tests__/unexpected-return-value/closure.lint-test
	@@ -0,0 +1,11 @@
	+<?php
	+class SomeClass {
	+ private $closure;
	+
	+ public function __construct() {
	+ $this->closure = function() {
	+ return null;
	+ };
	+ }
	+}
	+~~~~~~~~~~