Move UndefinedVariable into CleanCode namespace

src/bin/phpmd

@@ -79,10 +79,10 @@ class_alias('PHPMD\\Rule\\UnusedFormalParameter', 'PHP_PMD_Rule_UnusedFormalPara
 class_alias('PHPMD\\Rule\\UnusedLocalVariable', 'PHP_PMD_Rule_UnusedLocalVariable');
 class_alias('PHPMD\\Rule\\UnusedPrivateField', 'PHP_PMD_Rule_UnusedPrivateField');
 class_alias('PHPMD\\Rule\\UnusedPrivateMethod', 'PHP_PMD_Rule_UnusedPrivateMethod');
-class_alias('PHPMD\\Rule\\UndefinedVariable', 'PHP_PMD_Rule_UndefinedVariable');
 class_alias('PHPMD\\Rule\\CleanCode\\BooleanArgumentFlag', 'PHP_PMD_Rule_CleanCode_BooleanArgumentFlag');
 class_alias('PHPMD\\Rule\\CleanCode\\ElseExpression', 'PHP_PMD_Rule_CleanCode_ElseExpression');
 class_alias('PHPMD\\Rule\\CleanCode\\StaticAccess', 'PHP_PMD_Rule_CleanCode_StaticAccess');
+class_alias('PHPMD\\Rule\\CleanCode\\UndefinedVariable', 'PHP_PMD_Rule_CleanCode_UndefinedVariable');
 class_alias('PHPMD\\Rule\\Controversial\\CamelCaseClassName', 'PHP_PMD_Rule_Controversial_CamelCaseClassName');
 class_alias('PHPMD\\Rule\\Controversial\\CamelCaseMethodName', 'PHP_PMD_Rule_Controversial_CamelCaseMethodName');
 class_alias('PHPMD\\Rule\\Controversial\\CamelCaseParameterName', 'PHP_PMD_Rule_Controversial_CamelCaseParameterName');

src/main/php/PHPMD/Rule/UndefinedVariable.php → src/main/php/PHPMD/Rule/CleanCode/UndefinedVariable.php

@@ -15,14 +15,17 @@
  * @link http://phpmd.org/
  */
 
-namespace PHPMD\Rule;
+namespace PHPMD\Rule\CleanCode;
 
 use PDepend\Source\AST\ASTVariable;
 use PDepend\Source\AST\State;
 use PHPMD\AbstractNode;
 use PHPMD\Node\AbstractCallableNode;
 use PHPMD\Node\ASTNode;
 use PHPMD\Node\MethodNode;
+use PHPMD\Rule\AbstractLocalVariable;
+use PHPMD\Rule\FunctionAware;
+use PHPMD\Rule\MethodAware;
 
 /**
  * This rule collects all undefined variables within a given function or method

src/main/resources/rulesets/cleancode.xml

@@ -157,4 +157,28 @@ function createArray() {
             ]]>
         </example>
     </rule>
+
+    <rule name="UndefinedVariable"
+          since="2.7"
+          message="Avoid using undefined variables such as '{0}' which will lead to PHP notices."
+          class="PHPMD\Rule\CleanCode\UndefinedVariable"
+          externalInfoUrl="">
+        <description>
+            Detects when a variable is used that has not been defined before.
+        </description>
+        <priority>3</priority>
+        <example>
+            <![CDATA[
+class Foo
+{
+    private function bar()
+    {
+        // $message is undefined
+        echo $message;
+    }
+}
+]]>
+        </example>
+    </rule>
+
 </ruleset>

src/main/resources/rulesets/unusedcode.xml

@@ -99,29 +99,6 @@ class Foo
         // $howdy is not used
     }
 }
-]]>
-        </example>
-    </rule>
-
-    <rule name="UndefinedVariable"
-          since="2.7"
-          message="Avoid using undefined variables such as '{0}' which will lead to PHP notices."
-          class="PHPMD\Rule\UndefinedVariable"
-          externalInfoUrl="">
-        <description>
-Detects when a variable is used that has not been defined before.
-        </description>
-        <priority>3</priority>
-        <example>
-<![CDATA[
-class Foo
-{
-    private function bar()
-    {
-        // $message is undefined
-        echo $message;
-    }
-}
 ]]>
         </example>
     </rule>

src/test/php/PHPMD/Rule/UndefinedValiableTest.php → src/test/php/PHPMD/Rule/CleanCode/UndefinedValiableTest.php

@@ -15,7 +15,7 @@
  * @link http://phpmd.org/
  */
 
-namespace PHPMD\Rule;
+namespace PHPMD\Rule\CleanCode;
 
 use PHPMD\AbstractTest;
 
@@ -86,4 +86,16 @@ public function testRuleDoesNotApplyToSuperGlobals()
         $rule->setReport($this->getReportMock(0));
         $rule->apply($this->getMethod());
     }
+
+    /**
+     * testRuleDoesNotApplyToUsedProperties
+     *
+     * @return void
+     */
+    public function testRuleDoesNotApplyToUsedProperties()
+    {
+        $rule = new UndefinedVariable();
+        $rule->setReport($this->getReportMock(0));
+        $rule->apply($this->getMethod());
+    }
 }

src/test/resources/files/Rule/CleanCode/UndefinedVariable/testRuleDoesNotApplyToUsedProperties.php

@@ -0,0 +1,26 @@
+<?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 testRuleDoesNotApplyToUsedProperties extends AbstractTest
+{
+    protected $x = 'abc';
+
+    function testRuleDoesNotApplyToUsedProperties()
+    {
+        echo $this->x;
+    }
+}