Merge pull request #77 from leviy/master_exclude-merge-prs-from-changelog

Exclude merge PRs from changelog with filter

Author: tlsvda

Diff for: src/Changelog/PullRequestChangelogGenerator.php

@@ -10,6 +10,7 @@
 use function array_reduce;
 use function preg_match;
 use function sprintf;
+use function strpos;
 
 final class PullRequestChangelogGenerator implements ChangelogGenerator
 {
@@ -30,8 +31,10 @@ public function getUnreleasedChangelog(): Changelog
         $unreleasedCommits = $this->versionControlSystem->getCommitsSinceLastVersion(self::PULL_REQUEST_PATTERN);
         $unreleasedChanges = array_map([$this, 'createChangeFromCommit'], $unreleasedCommits);
 
+        $filteredUnreleasedChanges = $this->filterUnreleasedChanges($unreleasedChanges);
+
         $changelog = new Changelog();
-        $changelog->addUnreleasedChanges($unreleasedChanges);
+        $changelog->addUnreleasedChanges($filteredUnreleasedChanges);
 
         return $changelog;
     }
@@ -58,14 +61,38 @@ function (Changelog $changelog, string $version): Changelog {
                     $commits
                 );
 
-                $changelog->addVersion($version, $changes);
+                $filterUnreleasedChanges = $this->filterUnreleasedChanges($changes);
+
+                $changelog->addVersion($version, $filterUnreleasedChanges);
 
                 return $changelog;
             },
             new Changelog()
         );
     }
 
+    /**
+     * @param mixed[] $changeLogElements
+     * @return mixed[]
+     */
+    private function filterUnreleasedChanges(array $changeLogElements): array
+    {
+        $filteredChangeLogElements = [];
+        foreach ($changeLogElements as $element) {
+            if (strpos($element, '[MERGE]') !== false) {
+                continue;
+            }
+
+            if (strpos($element, '[SKIP-LOG]') !== false) {
+                continue;
+            }
+
+            $filteredChangeLogElements[] = $element;
+        }
+
+        return $filteredChangeLogElements;
+    }
+
     /**
      * @SuppressWarnings(PHPMD.UnusedPrivateMethod) Method is used as callable in getChangelog()
      */