Merge pull request #3 from Ig0r-M-magic42

Use grumphp at least v0.18 and captainhook at least v5
captainhookphp · May 19, 2020 · 7338057 · 7338057
2 parents 7f40a58 + a318c56
commit 7338057
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,4 +2,5 @@
 .phpunit*
 composer.lock
 docs/coverage
-grumphp.yml
+grumphp.yml
+.idea
diff --git a/README.md b/README.md
@@ -27,7 +27,7 @@ Your `captainhook.json` should afterwards cnotain the following sections:
     "commit-msg" : {
         "enabled" : true,
         "actions" : [{
-            "action" : "GIT_USER=$(git config user.name);GIT_EMAIL=$(git config user.email);COMMIT_MSG_FILE={FILE};DIFF=$(git -c diff.mnemonicprefix=false --no-pager diff -r -p -m -M --full-index --no-color --staged | cat);printf \"%s\n\" \"${DIFF}\" | exec ./vendor/bin/grumphp git:commit-msg \"--git-user=$GIT_USER\" \"--git-email=$GIT_EMAIL\" \"$COMMIT_MSG_FILE\"",
+            "action" : "GIT_USER=$(git config user.name);GIT_EMAIL=$(git config user.email);COMMIT_MSG_FILE={$FILE};DIFF=$(git -c diff.mnemonicprefix=false --no-pager diff -r -p -m -M --full-index --no-color --staged | cat);printf \"%s\n\" \"${DIFF}\" | exec ./vendor/bin/grumphp git:commit-msg \"--git-user=$GIT_USER\" \"--git-email=$GIT_EMAIL\" \"$COMMIT_MSG_FILE\"",
             "options" : []
         }]
     }

diff --git a/composer.json b/composer.json
@@ -17,8 +17,8 @@
         "php" : "^7.2|^8.0",
         "ext-json" : "*",
         "composer-plugin-api": "~1.0",
-        "phpro/grumphp": "^0.15.0",
-        "captainhook/captainhook": "^4.0"
+        "phpro/grumphp": "^0.18",
+        "captainhook/captainhook": "^5.0"
     },
     "require-dev": {
         "composer/composer": "^1.8",

diff --git a/src/Composer/GrumPHPAdder.php b/src/Composer/GrumPHPAdder.php
@@ -25,7 +25,7 @@ class GrumPHPAdder
     ];
 
     const COMMIT_MSG_CONFIG = [
-        'action' => 'GIT_USER=$(git config user.name);GIT_EMAIL=$(git config user.email);COMMIT_MSG_FILE={FILE};DIFF=$(git -c diff.mnemonicprefix=false --no-pager diff -r -p -m -M --full-index --no-color --staged | cat);printf "%s\n" "${DIFF}" | exec ./vendor/bin/grumphp git:commit-msg "--git-user=$GIT_USER" "--git-email=$GIT_EMAIL" "$COMMIT_MSG_FILE"',
+        'action' => 'GIT_USER=$(git config user.name);GIT_EMAIL=$(git config user.email);COMMIT_MSG_FILE={$FILE};DIFF=$(git -c diff.mnemonicprefix=false --no-pager diff -r -p -m -M --full-index --no-color --staged | cat);printf "%s\n" "${DIFF}" | exec ./vendor/bin/grumphp git:commit-msg "--git-user=$GIT_USER" "--git-email=$GIT_EMAIL" "$COMMIT_MSG_FILE"',
         'options' => [],
     ];