From a4bc1c15538ded0b01ad560dae9265f47b1fe705 Mon Sep 17 00:00:00 2001
From: Stefan Boonstra <s.boonstra@youwe.nl>
Date: Thu, 8 Dec 2022 14:26:46 +0100
Subject: [PATCH] fix: resolve blacklist false-positives for specific function
 names

---
 CHANGELOG.md               | 13 +++++++++++++
 config/default/grumphp.yml |  9 +++++----
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7f3fe9c..e3ea38f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,19 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 2.16.1
+### Changed
+- Git blacklist now matches on words instead of characters by default.
+- The git blacklist configuration for rejecting accidentally commited merge conflicts now properly reflects the
+full set of characters used by git.
+
+### Fixed
+- Resolved issue where the updated git blacklist configuration would provide a false positive result
+on functions ending with `add()` or `odd()` due to checks on dump and die `dd()` statements.
+
+### Added
+- Git blacklist now checks for `exit()` usage.
+
 ## 2.16.0
 ### Fixed
 - Testing suite no longer breaks during installation when composer project type is set to `pimcore-project`.
diff --git a/config/default/grumphp.yml b/config/default/grumphp.yml
index 7dcd096..06d112f 100644
--- a/config/default/grumphp.yml
+++ b/config/default/grumphp.yml
@@ -51,15 +51,16 @@ parameters:
     - "alert("
     - "print_r("
     - "phpinfo("
+    - "exit("
     - "exit;"
-    - "<<<<<"
-    - ">>>>>"
-    - "====="
+    - "<<<<<<<"
+    - ">>>>>>>"
+    - "======="
     - "<?php echo"
   git_blacklist.triggered_by: [ 'php', 'js' ]
   git_blacklist.whitelist_patterns: []
   git_blacklist.regexp_type: G
-  git_blacklist.match_word: false
+  git_blacklist.match_word: true
 
 grumphp:
   ascii: