fix: make git hook grumphp invocation resilient

Author: coisa

resources/git-hooks/commit-msg

@@ -28,8 +28,18 @@ elif [ -f "${DEVTOOLS_GRUMPHP_CONFIG}" ]; then
 fi
 
 # Run GrumPHP
-if [ -n "${GRUMPHP_CONFIG_FILE}" ]; then
-  printf "%s\n" "${DIFF}" | exec 'vendor/bin/grumphp.phar' '--config' "${GRUMPHP_CONFIG_FILE}" 'git:commit-msg' "--git-user=$GIT_USER" "--git-email=$GIT_EMAIL" "$COMMIT_MSG_FILE"
+if [ -x "vendor/bin/grumphp" ]; then
+  GRUMPHP_COMMAND='vendor/bin/grumphp'
+elif [ -x "vendor/bin/grumphp.phar" ]; then
+  GRUMPHP_COMMAND='vendor/bin/grumphp.phar'
+else
+  GRUMPHP_COMMAND='grumphp'
 fi
 
-printf "%s\n" "${DIFF}" | exec 'vendor/bin/grumphp.phar' 'git:commit-msg' "--git-user=$GIT_USER" "--git-email=$GIT_EMAIL" "$COMMIT_MSG_FILE"
+if [ -n "${GRUMPHP_COMMAND}" ]; then
+  if [ -n "${GRUMPHP_CONFIG_FILE}" ]; then
+    printf "%s\n" "${DIFF}" | exec "${GRUMPHP_COMMAND}" '--config' "${GRUMPHP_CONFIG_FILE}" 'git:commit-msg' "--git-user=$GIT_USER" "--git-email=$GIT_EMAIL" "$COMMIT_MSG_FILE"
+  else
+    printf "%s\n" "${DIFF}" | exec "${GRUMPHP_COMMAND}" 'git:commit-msg' "--git-user=$GIT_USER" "--git-email=$GIT_EMAIL" "$COMMIT_MSG_FILE"
+  fi
+fi

resources/git-hooks/pre-commit

@@ -24,8 +24,18 @@ elif [ -f "${DEVTOOLS_GRUMPHP_CONFIG}" ]; then
 fi
 
 # Run GrumPHP
-if [ -n "${GRUMPHP_CONFIG_FILE}" ]; then
-  printf "%s\n" "${DIFF}" | exec 'vendor/bin/grumphp.phar' '--config' "${GRUMPHP_CONFIG_FILE}" 'git:pre-commit' '--skip-success-output'
+if [ -x "vendor/bin/grumphp" ]; then
+  GRUMPHP_COMMAND='vendor/bin/grumphp'
+elif [ -x "vendor/bin/grumphp.phar" ]; then
+  GRUMPHP_COMMAND='vendor/bin/grumphp.phar'
+else
+  GRUMPHP_COMMAND='grumphp'
 fi
 
-printf "%s\n" "${DIFF}" | exec 'vendor/bin/grumphp.phar' 'git:pre-commit' '--skip-success-output'
+if [ -n "${GRUMPHP_COMMAND}" ]; then
+  if [ -n "${GRUMPHP_CONFIG_FILE}" ]; then
+    printf "%s\n" "${DIFF}" | exec "${GRUMPHP_COMMAND}" '--config' "${GRUMPHP_CONFIG_FILE}" 'git:pre-commit' '--skip-success-output'
+  fi
+
+  printf "%s\n" "${DIFF}" | exec "${GRUMPHP_COMMAND}" 'git:pre-commit' '--skip-success-output'
+fi

tests/GitHooks/PackagedHooksTest.php

@@ -42,6 +42,9 @@ public function packagedPreCommitHookWillPreferProjectConfigAndFallbackToTheMana
             'DEVTOOLS_GRUMPHP_CONFIG=' . HookContentRenderer::MANAGED_GRUMPHP_CONFIG_PLACEHOLDER,
             $contents,
         );
+        self::assertStringContainsString('if [ -x "vendor/bin/grumphp" ]; then', $contents);
+        self::assertStringContainsString("GRUMPHP_COMMAND='vendor/bin/grumphp'", $contents);
+        self::assertStringContainsString('printf "%s\n" "${DIFF}" | exec "${GRUMPHP_COMMAND}"', $contents);
         self::assertStringContainsString("'--config' \"\${GRUMPHP_CONFIG_FILE}\" 'git:pre-commit'", $contents);
     }
 
@@ -58,6 +61,9 @@ public function packagedCommitMsgHookWillPreferProjectConfigAndFallbackToTheMana
             'DEVTOOLS_GRUMPHP_CONFIG=' . HookContentRenderer::MANAGED_GRUMPHP_CONFIG_PLACEHOLDER,
             $contents,
         );
+        self::assertStringContainsString('if [ -x "vendor/bin/grumphp" ]; then', $contents);
+        self::assertStringContainsString("GRUMPHP_COMMAND='vendor/bin/grumphp'", $contents);
+        self::assertStringContainsString('printf "%s\n" "${DIFF}" | exec "${GRUMPHP_COMMAND}"', $contents);
         self::assertStringContainsString("'--config' \"\${GRUMPHP_CONFIG_FILE}\" 'git:commit-msg'", $contents);
     }
 }