Skip to content

Commit 592fb1f

Browse files
PHPStan work correctly with DDEV
1 parent 83122ca commit 592fb1f

1 file changed

Lines changed: 4 additions & 2 deletions

File tree

.git-hooks-matomo/pre-push

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ REPO_DIR="$(git rev-parse --show-toplevel)"
2020
echo "Running pre-commit hook in repo: $REPO_DIR"
2121

2222
if [[ "$REPO_DIR" =~ /plugins/(.*) ]]; then
23-
PLUGIN_PATH=${REPO_DIR}
23+
PLUGIN_PATH="plugins/${BASH_REMATCH[1]}"
2424
else
2525
echo "Not a plugin, not running any further checks"
2626
exit 1
@@ -35,7 +35,7 @@ COMMAND=""
3535
# Use local PHP if setup
3636
if command -v php >/dev/null 2>&1; then
3737
if [ -f "${MATOMO_DIR}/vendor/bin/phpstan" ]; then
38-
COMMAND="${MATOMO_DIR}/vendor/bin/phpstan"
38+
COMMAND="cd ${MATOMO_DIR} && vendor/bin/phpstan"
3939
fi
4040
fi
4141
# Use ddev if setup (overridding local setup)
@@ -72,6 +72,7 @@ if [[ -f "$PHPSTAN_CREATED_CONFIG" ]]; then
7272
echo "No created PHP files"
7373
else
7474
echo "Running PHPstan at a very high level on new files"
75+
CHANGED_FILES=`echo "$CHANGED_FILES" | sed -e 's/^\(.*\)$/"\1"/' | xargs -I{} echo "${PLUGIN_PATH}/{}"`
7576
echo "$CHANGED_FILES" | xargs $COMMAND analyse -c ${PLUGIN_PATH}/${PHPSTAN_CREATED_CONFIG} || STATUS=1
7677
fi
7778
fi
@@ -86,6 +87,7 @@ if [[ -f "$PHPSTAN_MODIFIED_CONFIG" ]]; then
8687
echo "No changed PHP files"
8788
else
8889
echo "Running PHPstan on modified files"
90+
CHANGED_FILES=`echo "$CHANGED_FILES" | sed -e 's/^\(.*\)$/"\1"/' | xargs -I{} echo "${PLUGIN_PATH}/{}"`
8991
echo "$CHANGED_FILES" | xargs $COMMAND analyse -c ${PLUGIN_PATH}/${PHPSTAN_MODIFIED_CONFIG} || STATUS=1
9092
fi
9193
fi

0 commit comments

Comments
 (0)