Codify pattern updates, name replacements

Author: Ayesh

src/CommitFormatter.php

@@ -6,10 +6,13 @@ class CommitFormatter {
     private array $commitsList = [];
 
     private array $commitsGroupedByAuthor = [];
+
+    private array $nameReplacements = [];
     private const EOL = "\r\n";
 
-    public function __construct(array $inputCommits) {
+    public function __construct(array $inputCommits, array $nameReplacements = []) {
         $this->process($inputCommits);
+        $this->nameReplacements = $nameReplacements;
     }
 
     private function process(array $inputCommits): void {
@@ -35,7 +38,15 @@ private function process(array $inputCommits): void {
         }
 
         $this->commitsList = $formattedCommits;
-        ksort($this->commitsGroupedByAuthor);
+
+        foreach ($this->nameReplacements as $originalName => $newName) {
+            if (isset($this->commitsGroupedByAuthor[$originalName])) {
+                $this->commitsGroupedByAuthor[$newName] = $this->commitsGroupedByAuthor[$originalName];
+                unset($this->commitsGroupedByAuthor[$originalName]);
+            }
+        }
+
+        ksort($this->commitsGroupedByAuthor, SORT_NATURAL | SORT_FLAG_CASE);
     }
 
     private function splitCommit(\stdClass $commit): array {
@@ -88,7 +99,7 @@ public function getFormattedCommitList(): array {
     public function getFormattedCommitListMarkup(): string {
         $output = '';
         foreach ($this->getFormattedCommitList() as $commit) {
-            $output .= $this->getFormattedCommitListMarkup($commit['formatted'] . ' by ' . $commit['author']);
+            $output .= self::markdownListItem($commit['formatted'] . ' by ' . ($this->nameReplacements[$commit['author']] ?? $commit['author']));
         }
 
         return $output;
@@ -114,6 +125,8 @@ public function getFormattedCommitListGroupedByAuthorMarkup(): string {
             foreach ($commitList as $commit) {
                 $output .= self::markdownListItem($commit['formatted']);
             }
+
+            $output .= self::EOL . self::EOL;
         }
 
         return $output;

src/KeywordEnhancer.php

@@ -5,15 +5,17 @@
 class KeywordEnhancer {
     protected const CODIFY_PATTERNS = [
         '/\b(?<!`)(?:zend|php)_[a-z_]+\(\)(?!`)/i', // zend_foo_bar()
-        '/\b(?<!`)(?:zend|php)_[a-z_*]+\b(?![`.(])\*?/i', // zend_foo_bar()
+        '/\b(?<!`)(?:zend|php|_php)_[a-z_*]+\b(?![`.(=])\*?/i', // zend_foo_bar
         '/\b(?<![`\/])[a-z][a-z\d_-]+(.stubs?)?\.(phpt?|c|h)(?![`.?])/', // run-tests.php / foo.stub.php foo.stubs.php / test-foo-bar.phpt,
         '/\b(?<!`)ext\/[a-z_]+\b(?![`\/])/', // ext-names
-        '/\b(?<!`)[A-Z][A-Za-z]+::[a-z][A-Za-z_]+\(\)(?![`\/])/', // Class::methods()
-        '/\b(?<!`)[A-Z][A-Za-z]+::[A-Z_]+\b(?![`\/])/', // Class::CONSTANTS
-        '/\b(?<!`)[A-Z][A-Za-z]+::[a-z][A-Za-z_\d]+\b(?![`\/])/', // Class::constants
-        '/\b(?<!`)[a-z]+_[a-z]+(?:_[a-z_]+)?\(\)(?![`\/])/', // Functions with underscores and ()
-        '/\b(?<!`)(?:ldap|ftp|array|mb|stream|open|hash)_[a-z_]+\d?\b(?![`\/])/', // Functions with underscores and no ()
-        '/\b(?<!`)xleak\b(?![`\/])/i', // xleak
+        '/\b(?<!`)[A-Z][A-Za-z]+::[a-z][A-Za-z\d_]+\(\)(?![`\/-])/', // Class::methods()
+        '/\b(?<!`)[A-Z][A-Za-z]+::[A-Z_]+\b(?![`\/(])/', // Class::CONSTANTS
+        '/\b(?<!`)[A-Z][A-Za-z]+::[a-z][A-Za-z_\d]+\b(?![`\/(])/', // Class::constants
+        '/\b(?<!`-)[a-z]+_[a-z]+(?:_[a-z_]+)?\(\)(?![`\/])/', // Functions with underscores and ()
+        '/\b(?<![`>])[a-z_][a-z][a-z\d_]+\(\)(?![`.>\/-])/', // Functions with underscores and ()
+        '/\b(?<!`)(?:ldap|ftp|array|mb|stream|open|hash|xml)_[a-z_]+\d?\b(?![`\/])/', // Functions with underscores and no ()
+        '/\b(?<!`)(xleak|xfail|skipif)\b(?![`\/])/i', // xleak
+        '/(?<![`>()-])--[a-z][a-z-]+(?![`])/i', // --flags, --flags-and-more
     ];
 
     public static function enhance(string $inputText): string {