Merge pull request #671 from kylekatarnls/feature/fix-661-assignation…

…s-in-closures

Fix #661 Scan only the statement inner expression (first one)

src/main/php/PHPMD/Rule/CleanCode/IfStatementAssignment.php

@@ -19,7 +19,6 @@
 
 use PDepend\Source\AST\ASTAssignmentExpression;
 use PDepend\Source\AST\ASTExpression;
-use PDepend\Source\AST\ASTStatement;
 use PHPMD\AbstractNode;
 use PHPMD\AbstractRule;
 use PHPMD\Node\ASTNode;
@@ -68,7 +67,7 @@ public function apply(AbstractNode $node)
      * Extracts if and elseif statements from method/function body
      *
      * @param AbstractNode $node An instance of MethodNode or FunctionNode class
-     * @return ASTStatement[]
+     * @return ASTNode[]
      */
     private function getStatements(AbstractNode $node)
     {
@@ -80,21 +79,14 @@ private function getStatements(AbstractNode $node)
     /**
      * Extracts all expression from statements array
      *
-     * @param ASTStatement[] $statements Array of if and elseif clauses
+     * @param ASTNode[] $statements Array of if and elseif clauses
      * @return ASTExpression[]
      */
     private function getExpressions(array $statements)
     {
-        $expressions = array();
-
-        /** @var ASTNode $statement */
-        foreach ($statements as $statement) {
-            $expressions = array_merge($expressions, array_filter($statement->findChildrenOfType('Expression'), function (ASTNode $node) {
-                return !count($node->getParent()->findChildrenOfType('FunctionPostfix'));
-            }));
-        }
-
-        return $expressions;
+        return array_map(function (ASTNode $statement) {
+            return $statement->getFirstChildOfType('Expression');
+        }, $statements);
     }
 
     /**

src/test/php/PHPMD/Rule/CleanCode/IfStatementAssignmentTest.php

@@ -28,6 +28,13 @@ public function testRuleNotAppliesInsideClosure()
         $rule->apply($this->getMethod());
     }
 
+    public function testRuleNotAppliesInsideClosureCallbacks()
+    {
+        $rule = new IfStatementAssignment();
+        $rule->setReport($this->getReportMock(0));
+        $rule->apply($this->getMethod());
+    }
+
     public function testRuleNotAppliesToIfsWithoutAssignment()
     {
         $rule = new IfStatementAssignment();

src/test/resources/files/Rule/CleanCode/IfStatementAssignment/testRuleNotAppliesInsideClosureCallbacks.php

@@ -0,0 +1,33 @@
+<?php
+/**
+ * This file is part of PHP Mess Detector.
+ *
+ * Copyright (c) Manuel Pichler <mapi@phpmd.org>.
+ * All rights reserved.
+ *
+ * Licensed under BSD License
+ * For full copyright and license information, please see the LICENSE file.
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @author Manuel Pichler <mapi@phpmd.org>
+ * @copyright Manuel Pichler. All rights reserved.
+ * @license https://opensource.org/licenses/bsd-license.php BSD License
+ * @link http://phpmd.org/
+ */
+
+namespace PHPMDTest;
+
+class Foo
+{
+    public function testRuleNotAppliesInsideClosureCallbacks($ids, $allocation)
+    {
+        if ('foo' === 'foo') {
+            $ids->each(function () use ($allocation) {
+                $allocation->status = 'paid';
+                $allocation->potato = 'round';
+            });
+
+            return true;
+        }
+    }
+}