Added BaselineSet to Report

src/main/php/PHPMD/Baseline/BaselineSet.php

@@ -14,17 +14,17 @@ public function addEntry(ViolationBaseline $entry)
 
     /**
      * @param string $ruleName
-     * @param string $filename
+     * @param string $fileName
      * @return bool
      */
-    public function contains($ruleName, $filename)
+    public function contains($ruleName, $fileName)
     {
         if (isset($this->violations[$ruleName]) === false) {
             return false;
         }
 
         foreach ($this->violations[$ruleName] as $baseline) {
-            if ($baseline->getFilename() === $filename) {
+            if ($baseline->getFileName() === $fileName) {
                 return true;
             }
         }

src/main/php/PHPMD/Baseline/ViolationBaseline.php

@@ -8,16 +8,16 @@ class ViolationBaseline
     private $ruleName;
 
     /** @var string */
-    private $filename;
+    private $fileName;
 
     /**
      * @param string $ruleName
-     * @param string $filename
+     * @param string $fileName
      */
-    public function __construct($ruleName, $filename)
+    public function __construct($ruleName, $fileName)
     {
         $this->ruleName = $ruleName;
-        $this->filename = $filename;
+        $this->fileName = $fileName;
     }
 
     /**
@@ -31,8 +31,8 @@ public function getRuleName()
     /**
      * @return string
      */
-    public function getFilename()
+    public function getFileName()
     {
-        return $this->filename;
+        return $this->fileName;
     }
 }

src/main/php/PHPMD/PHPMD.php

@@ -17,6 +17,8 @@
 
 namespace PHPMD;
 
+use PHPMD\Baseline\BaselineSet;
+
 /**
  * This is the main facade of the PHP PMD application
  */
@@ -214,21 +216,23 @@ public function setOptions(array $options)
      * @param string $ruleSets
      * @param \PHPMD\AbstractRenderer[] $renderers
      * @param \PHPMD\RuleSetFactory $ruleSetFactory
+     * @param \PHPMD\Baseline\BaselineSet $baseline
      * @return void
      */
     public function processFiles(
         $inputPath,
         $ruleSets,
         array $renderers,
-        RuleSetFactory $ruleSetFactory
+        RuleSetFactory $ruleSetFactory,
+        BaselineSet $baseline
     ) {
 
         // Merge parsed excludes
         $this->addIgnorePatterns($ruleSetFactory->getIgnorePattern($ruleSets));
 
         $this->input = $inputPath;
 
-        $report = new Report();
+        $report = new Report($baseline);
 
         $factory = new ParserFactory();
         $parser = $factory->create($this);

src/main/php/PHPMD/Report.php

@@ -17,6 +17,8 @@
 
 namespace PHPMD;
 
+use PHPMD\Baseline\BaselineSet;
+
 /**
  * The report class collects all found violations and further information about
  * a PHPMD run.
@@ -52,6 +54,14 @@ class Report
      */
     private $errors = array();
 
+    /** @var BaselineSet|null */
+    private $baseline;
+
+    public function __construct(BaselineSet $baseline = null)
+    {
+        $this->baseline = $baseline;
+    }
+
     /**
      * Adds a rule violation to this report.
      *
@@ -61,6 +71,11 @@ class Report
     public function addRuleViolation(RuleViolation $violation)
     {
         $fileName = $violation->getFileName();
+        $ruleName = get_class($violation->getRule());
+        if ($this->baseline !== null && $this->baseline->contains($ruleName, $fileName)) {
+            return;
+        }
+
         if (!isset($this->ruleViolations[$fileName])) {
             $this->ruleViolations[$fileName] = array();
         }

src/test/php/PHPMD/Baseline/ViolationBaselineTest.php

@@ -12,12 +12,12 @@ class ViolationBaselineTest extends TestCase
     /**
      * @covers ::__construct
      * @covers ::getRuleName
-     * @covers ::getFilename
+     * @covers ::getFileName
      */
     public function testAccessors()
     {
         $violation = new ViolationBaseline('rule', 'foobar');
         static::assertSame('rule', $violation->getRuleName());
-        static::assertSame('foobar', $violation->getFilename());
+        static::assertSame('foobar', $violation->getFileName());
     }
 }

src/test/php/PHPMD/PHPMDTest.php

@@ -17,6 +17,7 @@
 
 namespace PHPMD;
 
+use PHPMD\Baseline\BaselineSet;
 use PHPMD\Renderer\XMLRenderer;
 use PHPMD\Stubs\WriterStub;
 
@@ -47,7 +48,8 @@ public function testRunWithDefaultSettingsAndXmlRenderer()
             self::createFileUri('source/ccn_function.php'),
             'pmd-refset1',
             array($renderer),
-            new RuleSetFactory()
+            new RuleSetFactory(),
+            new BaselineSet()
         );
 
         $this->assertXmlEquals($writer->getData(), 'pmd/default-xml.xml');
@@ -72,7 +74,8 @@ public function testRunWithDefaultSettingsAndXmlRendererAgainstDirectory()
             self::createFileUri('source'),
             'pmd-refset1',
             array($renderer),
-            new RuleSetFactory()
+            new RuleSetFactory(),
+            new BaselineSet()
         );
 
         $this->assertXmlEquals($writer->getData(), 'pmd/single-directory.xml');
@@ -97,7 +100,8 @@ public function testRunWithDefaultSettingsAndXmlRendererAgainstSingleFile()
             self::createFileUri('source/ccn_function.php'),
             'pmd-refset1',
             array($renderer),
-            new RuleSetFactory()
+            new RuleSetFactory(),
+            new BaselineSet()
         );
 
         $this->assertXmlEquals($writer->getData(), 'pmd/single-file.xml');
@@ -142,7 +146,8 @@ public function testHasViolationsReturnsFalseForSourceWithoutViolations()
             self::createFileUri('source/source_without_violations.php'),
             'pmd-refset1',
             array($renderer),
-            new RuleSetFactory()
+            new RuleSetFactory(),
+            new BaselineSet()
         );
 
         $this->assertFalse($phpmd->hasErrors());
@@ -166,7 +171,8 @@ public function testHasViolationsReturnsTrueForSourceWithViolation()
             self::createFileUri('source/source_with_npath_violation.php'),
             'pmd-refset1',
             array($renderer),
-            new RuleSetFactory()
+            new RuleSetFactory(),
+            new BaselineSet()
         );
 
         $this->assertFalse($phpmd->hasErrors());
@@ -190,7 +196,8 @@ public function testHasErrorsReturnsTrueForSourceWithError()
             self::createFileUri('source/source_with_parse_error.php'),
             'pmd-refset1',
             array($renderer),
-            new RuleSetFactory()
+            new RuleSetFactory(),
+            new BaselineSet()
         );
 
         $this->assertTrue($phpmd->hasErrors());
@@ -213,7 +220,8 @@ public function testIgnorePattern()
             self::createFileUri('sourceExcluded/'),
             'pmd-refset1',
             array(),
-            new RuleSetFactory()
+            new RuleSetFactory(),
+            new BaselineSet()
         );
 
         $this->assertFalse($phpmd->hasErrors());
@@ -224,7 +232,8 @@ public function testIgnorePattern()
             self::createFileUri('sourceExcluded/'),
             'exclude-pattern',
             array(),
-            new RuleSetFactory()
+            new RuleSetFactory(),
+            new BaselineSet()
         );
 
         $this->assertFalse($phpmd->hasErrors());

src/test/php/PHPMD/Regression/AcceptsFilesAndDirectoriesAsInputTicket001Test.php

@@ -17,6 +17,7 @@
 
 namespace PHPMD\Regression;
 
+use PHPMD\Baseline\BaselineSet;
 use PHPMD\PHPMD;
 use PHPMD\Renderer\XMLRenderer;
 use PHPMD\RuleSetFactory;
@@ -46,7 +47,8 @@ public function testCliAcceptsDirectoryAsInput()
             self::createFileUri('source'),
             'pmd-refset1',
             array($renderer),
-            new RuleSetFactory()
+            new RuleSetFactory(),
+            new BaselineSet()
         );
     }
 
@@ -67,7 +69,8 @@ public function testCliAcceptsSingleFileAsInput()
             self::createFileUri('source/FooBar.php'),
             'pmd-refset1',
             array($renderer),
-            new RuleSetFactory()
+            new RuleSetFactory(),
+            new BaselineSet()
         );
     }
 }

src/test/php/PHPMD/Regression/ExcessivePublicCountWorksCorrectlyWithStaticMethodsTest.php

@@ -17,6 +17,7 @@
 
 namespace PHPMD\Regression;
 
+use PHPMD\Baseline\BaselineSet;
 use PHPMD\PHPMD;
 use PHPMD\Report;
 use PHPMD\RuleSetFactory;
@@ -87,7 +88,8 @@ function (Report $report) use ($self) {
             __DIR__ . '/Sources/ExcessivePublicCountWorksForPublicStaticMethods.php',
             'codesize',
             array($this->renderer),
-            new RuleSetFactory()
+            new RuleSetFactory(),
+            new BaselineSet()
         );
     }
 
@@ -127,7 +129,8 @@ function (Report $report) use ($self) {
             __DIR__ . '/Sources/ExcessivePublicCountSuppressionWorksForPublicStaticMethods.php',
             'codesize',
             array($this->renderer),
-            new RuleSetFactory()
+            new RuleSetFactory(),
+            new BaselineSet()
         );
     }
 }

src/test/php/PHPMD/Regression/MaximumNestingLevelTicket24975295Test.php

@@ -17,6 +17,7 @@
 
 namespace PHPMD\Regression;
 
+use PHPMD\Baseline\BaselineSet;
 use PHPMD\PHPMD;
 use PHPMD\Renderer\TextRenderer;
 use PHPMD\RuleSetFactory;
@@ -49,6 +50,6 @@ public function testLocalVariableUsedInDoubleQuoteStringGetsNotReported()
         $factory = new RuleSetFactory();
 
         $phpmd = new PHPMD();
-        $phpmd->processFiles($inputs, $rules, $renderes, $factory);
+        $phpmd->processFiles($inputs, $rules, $renderes, $factory, new BaselineSet());
     }
 }