Skip to content
This repository was archived by the owner on Mar 6, 2021. It is now read-only.

Allow files to be ignored even if they are added to files to check. #2

Open
e42sh wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Allow files to be ignored even if they are added to files to check. #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 6 additions & 9 deletions phpcs-pre-commit/pre-commit
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,11 @@ for FILE in $FILES
do
echo "$FILE" | egrep -q "$PHPCS_FILE_PATTERN"
RETVAL=$?
if [ "$RETVAL" -eq "0" ]
echo "$FILE" | egrep -q "$PHPCS_IGNORE"
RETVAL_IGNORE=$?
# File is found in file pattern and not found in ignore pattern.
# Then add it to files to check.
if [ "$RETVAL" -eq "0" ] && [ "$RETVAL_IGNORE" -eq "1" ]
then
FILES_TO_CHECK="$FILES_TO_CHECK $FILE"
fi
Expand All @@ -63,13 +67,6 @@ if [ "$FILES_TO_CHECK" == "" ]; then
exit 0
fi

# execute the code sniffer
if [ "$PHPCS_IGNORE" != "" ]; then
IGNORE="--ignore=$PHPCS_IGNORE"
else
IGNORE=""
fi

# Copy contents of staged version of files to temporary staging area
# because we only want the staged version that will be commited and not
# the version in the working directory
Expand All @@ -85,7 +82,7 @@ do
STAGED_FILES="$STAGED_FILES $TMP_STAGING/$FILE"
done

OUTPUT=$($PHPCS_BIN -s --standard=$PHPCS_CODING_STANDARD $IGNORE $STAGED_FILES)
OUTPUT=$($PHPCS_BIN -s --standard=$PHPCS_CODING_STANDARD $STAGED_FILES)
RETVAL=$?

# delete temporary copy of staging area
Expand Down