Merge pull request #47 from TerrorSquad/refactor/split-integration-script

Refactor integration script into modular components and add build pro…

Author: TerrorSquad

Makefile

@@ -1,4 +1,4 @@
-.PHONY: help test test-laravel test-symfony test-hooks test-clean test-env test-status
+.PHONY: help test test-laravel test-symfony test-hooks test-clean test-env test-status build
 
 # Default target - show help
 help:
@@ -7,6 +7,7 @@ help:
 	@echo "Usage: make <target>"
 	@echo ""
 	@echo "Available targets:"
+	@echo "  build             Build the integration script"
 	@echo "  test              Run full integration test (Laravel)"
 	@echo "  test-laravel      Run full Laravel integration test"
 	@echo "  test-symfony      Run full Symfony integration test"
@@ -20,6 +21,10 @@ help:
 	@echo "  make test-symfony # Test Symfony integration"
 	@echo "  make test-clean   # Clean up after tests"
 
+# Build the integration script
+build:
+	@bash booster/build.sh
+
 # Default test target (Laravel)
 test: test-laravel
 

booster/.ddev/scripts/setup-psalm-symlink.sh

@@ -16,9 +16,19 @@ PARENT_DIR=$(dirname "$HOST_ROOT")
 docker exec -u root "$CONTAINER_NAME" mkdir -p "$PARENT_DIR"
 
 # Create the symlink: HOST_ROOT -> /var/www/html
+# This "Symlink Hack" allows Psalm running inside the container to use the same absolute paths
+# as the host machine. This enables VS Code to map errors back to the correct files without
+# complex path mapping configurations in the extension.
+#
 # -s: symbolic link
 # -f: force (remove existing destination file)
 # -n: no dereference (treat destination as normal file if it is a symlink to a directory)
 docker exec -u root "$CONTAINER_NAME" ln -sfn /var/www/html "$HOST_ROOT"
 
 echo "Symlink created: $HOST_ROOT -> /var/www/html inside $CONTAINER_NAME"
+
+# Ensure psalm symlink exists if psalm.phar is present but psalm is not
+# This allows using 'psalm' command consistently even if only psalm.phar is installed
+if [ -f "vendor/bin/psalm.phar" ] && [ ! -f "vendor/bin/psalm" ]; then
+    ln -s psalm.phar "vendor/bin/psalm"
+fi

…github/workflows/php-auto-fix-simple.yml …oster/.github/workflows/php-auto-fix.ymlbooster/.github/workflows/php-auto-fix-simple.yml renamed to booster/.github/workflows/php-auto-fix.yml booster/.github/workflows/php-auto-fix-simple.yml renamed to booster/.github/workflows/php-auto-fix.yml

@@ -22,12 +22,6 @@ fi
 # Change to project root to ensure context is correct
 cd "$PROJECT_ROOT" || exit 1
 
-# Ensure psalm symlink exists if psalm.phar is present but psalm is not
-# This allows using 'psalm' command consistently even if only psalm.phar is installed
-if [ -f "vendor/bin/psalm.phar" ] && [ ! -f "vendor/bin/psalm" ]; then
-    ln -s psalm.phar "vendor/bin/psalm"
-fi
-
 # Load mise if available to ensure pnpm is found
 if command -v mise &> /dev/null; then
   eval "$(mise activate bash)"

booster/.husky/shared/runner.sh

@@ -0,0 +1,55 @@
+#!/usr/bin/env bash
+
+# Build script to compile the integration script from source
+
+# Get the directory of the script
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+cd "$DIR"
+
+SRC_DIR="src"
+OUTPUT_FILE="integrate_booster.sh"
+
+TMP_FILE="${OUTPUT_FILE}.tmp.$$"
+
+# Clean up temporary file on error
+trap 'rm -f "$TMP_FILE"' ERR
+
+echo "Building $OUTPUT_FILE..."
+
+# Ensure temporary output file is empty
+> "$TMP_FILE"
+
+# Concatenate files in the correct order
+cat "$SRC_DIR/header.sh" >> "$TMP_FILE"
+echo "" >> "$TMP_FILE"
+
+cat "$SRC_DIR/lib/version.sh" >> "$TMP_FILE"
+echo "" >> "$TMP_FILE"
+
+cat "$SRC_DIR/lib/logging.sh" >> "$TMP_FILE"
+echo "" >> "$TMP_FILE"
+
+cat "$SRC_DIR/lib/interactive.sh" >> "$TMP_FILE"
+echo "" >> "$TMP_FILE"
+
+cat "$SRC_DIR/lib/utils.sh" >> "$TMP_FILE"
+echo "" >> "$TMP_FILE"
+
+cat "$SRC_DIR/lib/files.sh" >> "$TMP_FILE"
+echo "" >> "$TMP_FILE"
+
+cat "$SRC_DIR/lib/ddev.sh" >> "$TMP_FILE"
+echo "" >> "$TMP_FILE"
+
+cat "$SRC_DIR/lib/composer.sh" >> "$TMP_FILE"
+echo "" >> "$TMP_FILE"
+
+cat "$SRC_DIR/lib/node.sh" >> "$TMP_FILE"
+echo "" >> "$TMP_FILE"
+
+cat "$SRC_DIR/main.sh" >> "$TMP_FILE"
+
+chmod +x "$TMP_FILE"
+mv "$TMP_FILE" "$OUTPUT_FILE"
+
+echo "Build complete: $OUTPUT_FILE"

booster/build.sh

@@ -0,0 +1,32 @@
+deptrac:
+  paths:
+    - ./src
+    - ./app
+  layers:
+    - name: Controller
+      collectors:
+        - type: className
+          regex: .*Controller.*
+    - name: Service
+      collectors:
+        - type: className
+          regex: .*Service.*
+    - name: Repository
+      collectors:
+        - type: className
+          regex: .*Repository.*
+    - name: Model
+      collectors:
+        - type: className
+          regex: .*Model.*
+  ruleset:
+    Controller:
+      - Service
+      - Repository
+      - Model
+    Service:
+      - Repository
+      - Model
+    Repository:
+      - Model
+    Model: []