Use netgen/git-hooks as the source of hooks and installer

netgen · Aug 27, 2020 · 58ee48d · 58ee48d
1 parent d1a453d
commit 58ee48d
Show file tree

Hide file tree

Showing 10 changed files with 8 additions and 358 deletions.
diff --git a/captainhook.json b/captainhook.json
diff --git a/captainhook_enabled.json → captainhook.template.json b/captainhook_enabled.json → captainhook.template.json
@@ -3,7 +3,7 @@
         "enabled": true,
         "actions": [
             {
-                "action": "\\AppBundle\\GitHooks\\Action\\Regex",
+                "action": "\\Netgen\\GitHooks\\Action\\Regex",
                 "options": {
                     "regex": "/^[A-Z]+-\\d+:?\\s/",
                     "error": "Your commit message MUST start with a ticket ID"
@@ -19,7 +19,7 @@
         "enabled": true,
         "actions": [
             {
-                "action": "\\AppBundle\\GitHooks\\Action\\CheckForBlockedWords",
+                "action": "\\Netgen\\GitHooks\\Action\\CheckForBlockedWords",
                 "options": {
                     "extensions": ["php", "twig"],
                     "keyword_blocklist": ["var_dump", "dump", "dd"],
@@ -30,16 +30,16 @@
                 "action": "\\CaptainHook\\App\\Hook\\Composer\\Action\\CheckLockFile"
             },
             {
-                "action": "\\AppBundle\\GitHooks\\Action\\PHPCSFixer"
+                "action": "\\Netgen\\GitHooks\\Action\\PHPCSFixer"
             },
             {
-                "action": "\\AppBundle\\GitHooks\\Action\\CheckLockFileCommitted",
+                "action": "\\Netgen\\GitHooks\\Action\\CheckLockFileCommitted",
                 "options": {
                     "enabled": true
                 }
             },
             {
-                "action": "\\AppBundle\\GitHooks\\Action\\CheckAssetsAction",
+                "action": "\\Netgen\\GitHooks\\Action\\CheckAssetsAction",
                 "options": {
                     "enabled": true
                 }

diff --git a/captainhook_disabled.json b/captainhook_disabled.json
diff --git a/composer.json b/composer.json
@@ -71,7 +71,7 @@
 
         "netgen/media-site-data": "~1.5.0",
         "netgen/site-bundle": "~1.3.0",
-        "netgen/site-generator-bundle": "~1.3.0",
+        "netgen/site-generator-bundle": "~1.3.1",
         "netgen/site-legacy-bundle": "^1.2",
         "netgen/site-installer-bundle": "^1.1",
         "netgen/information-collection-bundle": "^1.9",
@@ -105,7 +105,8 @@
         "predis/predis": "^1.1.3",
         "franzl/studio": "*",
         "deployer/recipes": "^6.2",
-        "captainhook/captainhook": "^5.3"
+
+        "netgen/git-hooks": "^1.0"
     },
     "conflict": {
         "doctrine/dbal": "2.7.0",
@@ -124,7 +125,6 @@
             "Netgen\\Bundle\\SiteBundle\\Composer\\ScriptHandler::installProjectSymlinks",
             "Netgen\\Bundle\\SiteLegacyBundle\\Composer\\ScriptHandler::installLegacySymlinks",
             "eZ\\Bundle\\EzPublishLegacyBundle\\Composer\\ScriptHandler::generateAutoloads",
-            "@php bin/captainhook install --force",
             "@php bin/security-checker security:check"
         ],
         "post-install-cmd": [

diff --git a/src/AppBundle/GitHooks/Action/Action.php b/src/AppBundle/GitHooks/Action/Action.php
diff --git a/src/AppBundle/GitHooks/Action/CheckAssetsAction.php b/src/AppBundle/GitHooks/Action/CheckAssetsAction.php
diff --git a/src/AppBundle/GitHooks/Action/CheckForBlockedWords.php b/src/AppBundle/GitHooks/Action/CheckForBlockedWords.php
diff --git a/src/AppBundle/GitHooks/Action/CheckLockFileCommitted.php b/src/AppBundle/GitHooks/Action/CheckLockFileCommitted.php