Merge pull request #489 from eeree/issue-401

Added new predefined variables to AbstractLocalVariable rule
phpmd · Jun 15, 2017 · 63047d9 · 63047d9
2 parents b1c15f8 + c2e378d
commit 63047d9
Show file tree

Hide file tree

Showing 3 changed files with 63 additions and 12 deletions.
diff --git a/src/main/php/PHPMD/Rule/AbstractLocalVariable.php b/src/main/php/PHPMD/Rule/AbstractLocalVariable.php
@@ -33,20 +33,23 @@ abstract class AbstractLocalVariable extends AbstractRule
      * can never be unused local variables.
      *
      * @var array(string=>boolean)
+     * @link http://php.net/manual/en/reserved.variables.php
      */
     private static $superGlobals = array(
-        '$argc'                => true,
-        '$argv'                => true,
-        '$_COOKIE'             => true,
-        '$_ENV'                => true,
-        '$_FILES'              => true,
-        '$_GET'                => true,
-        '$_POST'               => true,
-        '$_REQUEST'            => true,
-        '$_SERVER'             => true,
-        '$_SESSION'            => true,
-        '$GLOBALS'             => true,
-        '$HTTP_RAW_POST_DATA'  => true,
+        '$argc' => true,
+        '$argv' => true,
+        '$_COOKIE' => true,
+        '$_ENV' => true,
+        '$_FILES' => true,
+        '$_GET' => true,
+        '$_POST' => true,
+        '$_REQUEST' => true,
+        '$_SERVER' => true,
+        '$_SESSION' => true,
+        '$GLOBALS' => true,
+        '$HTTP_RAW_POST_DATA' => true,
+        '$php_errormsg' => true,
+        '$http_response_header' => true,
     );
 
     /**

diff --git a/src/test/php/PHPMD/Rule/UnusedLocalVariableTest.php b/src/test/php/PHPMD/Rule/UnusedLocalVariableTest.php
@@ -639,4 +639,17 @@ public function testNamespacedCompactFunctionRuleWorksCaseInsensitive()
         $rule->setReport($this->getReportMock(0));
         $rule->apply($this->getMethod());
     }
+
+    /**
+     * testRuleNotAppliesToPredefinedVariables.php
+     *
+     * @return void
+     */
+    public function testRuleNotAppliesToPredefinedVariables()
+    {
+        $rule = new UnusedLocalVariable();
+        $rule->addProperty('allow-unused-foreach-variables', 'false');
+        $rule->setReport($this->getReportMock(1));
+        $rule->apply($this->getMethod());
+    }
 }
diff --git a/...test/resources/files/Rule/UnusedLocalVariable/testRuleNotAppliesToPredefinedVariables.php b/...test/resources/files/Rule/UnusedLocalVariable/testRuleNotAppliesToPredefinedVariables.php
@@ -0,0 +1,35 @@
+<?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 testRuleNotAppliesToPredefinedVariables
+{
+    public function testRuleNotAppliesToPredefinedVariables()
+    {
+        $foo = 'bar';
+        $headers = array();
+        foreach ($http_response_header as $header) {
+            $headers[] = $header;
+            if (null !== $php_errormsg) {
+                continue;
+            }
+        }
+
+        return $headers;
+    }
+}