Merge pull request #809 from phpmd/feature/issue-808-supress-warnings

Fix #808 Ignore rule path for supression annotation

src/main/php/PHPMD/Node/Annotation.php

@@ -80,7 +80,10 @@ private function isSuppressed(Rule $rule)
     {
         if (in_array($this->value, array('PHPMD', 'PMD'))) {
             return true;
-        } elseif (preg_match('/^(PH)?PMD\.' . $rule->getName() . '/', $this->value)) {
+        } elseif (preg_match(
+            '/^(PH)?PMD\.' . preg_replace('/^.*\/([^\/]*)$/', '$1', $rule->getName()) . '/',
+            $this->value
+        )) {
             return true;
         }
 

src/test/php/PHPMD/Node/ClassNodeTest.php

@@ -21,6 +21,7 @@
 use PDepend\Source\AST\ASTMethod;
 use PDepend\Source\AST\ASTNamespace;
 use PHPMD\AbstractTest;
+use PHPMD\Rule\Design\CouplingBetweenObjects;
 
 /**
  * Test case for the class node implementation.
@@ -62,6 +63,34 @@ public function testHasSuppressWarningsAnnotationForReturnsTrue()
         $this->assertTrue($node->hasSuppressWarningsAnnotationFor($rule));
     }
 
+    /**
+     * testHasSuppressWarningsWithRuleNameContainingSlashes
+     *
+     * @return void
+     */
+    public function testHasSuppressWarningsWithRuleNameContainingSlashes()
+    {
+        $class = new ASTClass(null);
+        $class->setComment('/** @SuppressWarnings(PMD.CouplingBetweenObjects) */');
+
+        $rule = new CouplingBetweenObjects();
+        $rule->setName('rulesets/design.xml/CouplingBetweenObjects');
+
+        $node = new ClassNode($class);
+
+        $this->assertTrue($node->hasSuppressWarningsAnnotationFor($rule));
+
+        $class = new ASTClass(null);
+        $class->setComment('/** @SuppressWarnings(PMD.TooManyFields) */');
+
+        $rule = new CouplingBetweenObjects();
+        $rule->setName('rulesets/design.xml/CouplingBetweenObjects');
+
+        $node = new ClassNode($class);
+
+        $this->assertFalse($node->hasSuppressWarningsAnnotationFor($rule));
+    }
+
     /**
      * testGetFullQualifiedNameReturnsExpectedValue
      *