Merge pull request #221 from gooh/master

Closes #220: ignore php4 style ctor in interfaces and namespaces

src/main/php/PHPMD/Rule/Naming/ConstructorWithNameAsEnclosingClass.php

@@ -44,6 +44,7 @@
 use PDepend\Source\AST\ASTTrait;
 use PHPMD\AbstractNode;
 use PHPMD\AbstractRule;
+use PHPMD\Node\InterfaceNode;
 use PHPMD\Rule\MethodAware;
 
 /**
@@ -71,6 +72,13 @@ public function apply(AbstractNode $node)
         if (strcasecmp($node->getName(), $node->getParentName()) !== 0) {
             return;
         }
+        if ($node->getParentType() instanceof InterfaceNode) {
+            return;
+        }
+        if ($node->getNamespaceName() !== '+global') {
+            return;
+        }
+
         $this->addViolation($node);
     }
 }

src/test/php/PHPMD/Rule/Naming/ConstructorWithNameAsEnclosingClassTest.php

@@ -93,4 +93,18 @@ public function testRuleNotAppliesToMethodNamedSimilarToEnclosingClass()
         $rule->setReport($this->getReportMock(0));
         $rule->apply($this->getMethod());
     }
+
+    public function testRuleNotAppliesToMethodNamedAsEnclosingInterface()
+    {
+        $rule = new ConstructorWithNameAsEnclosingClass();
+        $rule->setReport($this->getReportMock(0));
+        $rule->apply($this->getMethod());
+    }
+
+    public function testRuleNotAppliesToMethodInNamespaces()
+    {
+        $rule = new ConstructorWithNameAsEnclosingClass();
+        $rule->setReport($this->getReportMock(0));
+        $rule->apply($this->getMethod());
+    }
 }

src/test/resources/files/Rule/Naming/ConstructorWithNameAsEnclosingClass/testRuleNotAppliesToMethodInNamespaces.php

@@ -0,0 +1,10 @@
+<?php
+namespace Foo;
+
+class testRuleNotAppliesToMethodInNamespaces
+{
+    function testRuleNotAppliesToMethodInNamespaces()
+    {
+
+    }
+}

src/test/resources/files/Rule/Naming/ConstructorWithNameAsEnclosingClass/testRuleNotAppliesToMethodNamedAsEnclosingInterface.php

@@ -0,0 +1,5 @@
+<?php
+interface testRuleNotAppliesToMethodNamedAsEnclosingInterface
+{
+    function testRuleNotAppliesToMethodNamedAsEnclosingInterface();
+}