Skip to content

Commit

Permalink
Merge pull request #16 from YouweGit/bugfix/git-blacklist-parsing
Browse files Browse the repository at this point in the history
fix: resolve blacklist false-positives for specific function names
  • Loading branch information
Anve94 committed Dec 8, 2022
2 parents a53b4a1 + a4bc1c1 commit abc42ee
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 4 deletions.
13 changes: 13 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`.
Expand Down
9 changes: 5 additions & 4 deletions config/default/grumphp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit abc42ee

Please sign in to comment.