Merge pull request #1026 from phpmd/fix/issue-467-duplicate-camel-cas…

…e-violation Dedupe violation for CamelCaseVariableName
phpmd · Aug 21, 2023 · 208f850 · 208f850
2 parents 638eb73 + e0a5fb3
commit 208f850
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 6 deletions.
diff --git a/src/main/php/PHPMD/Rule/Controversial/CamelCaseVariableName.php b/src/main/php/PHPMD/Rule/Controversial/CamelCaseVariableName.php
@@ -56,14 +56,16 @@ class CamelCaseVariableName extends AbstractRule implements MethodAware, Functio
      */
     public function apply(AbstractNode $node)
     {
+        $variables = array();
+
         foreach ($node->findChildrenOfTypeVariable() as $variable) {
             if (!$this->isValid($variable)) {
-                $this->addViolation(
-                    $node,
-                    array(
-                        $variable->getImage(),
-                    )
-                );
+                $variableName = $variable->getImage();
+
+                if (!isset($variables[$variableName])) {
+                    $variables[$variableName] = true;
+                    $this->addViolation($variable, array($variableName));
+                }
             }
         }
     }

diff --git a/src/test/php/PHPMD/Rule/Controversial/CamelCaseVariableNameTest.php b/src/test/php/PHPMD/Rule/Controversial/CamelCaseVariableNameTest.php
@@ -87,6 +87,21 @@ public function testRuleDoesNotApplyForStaticVariableAccess()
         $rule->apply($this->getClass());
     }
 
+    /**
+     * Tests that the rule does NOT apply if name allowed by config
+     *
+     * @return void
+     */
+    public function testRuleDoesNotApplyIfExcluded()
+    {
+        $report = $this->getReportWithNoViolation();
+
+        $rule = new CamelCaseVariableName();
+        $rule->setReport($report);
+        $rule->addProperty('allow-underscore', 'false');
+        $rule->apply($this->getClass());
+    }
+
     /**
      * Tests that the rule does apply for a valid variable name
      * with an underscore at the beginning when it is allowed.

diff --git a/...sources/files/Rule/Controversial/CamelCaseVariableName/testRuleDoesNotApplyIfExcluded.php b/...sources/files/Rule/Controversial/CamelCaseVariableName/testRuleDoesNotApplyIfExcluded.php
@@ -0,0 +1,24 @@
+<?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/
+ */
+
+class testRuleDoesNotApplyIfExcluded
+{
+    public function validVariableName()
+    {
+        var_dump($_POST);
+    }
+}