Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history 
* develop:
  Update pre-commit to version 5.3.0
  Remove getTerm and getTermBy services
  Only use multi version support in pre-commit if the environment supports
  • Loading branch information
@lipemat
lipemat committed Oct 21, 2023
2 parents 8331b13 + bafc8b7 commit 9ff2af0
Show file tree
Hide file tree
Showing 4 changed files with 63 additions and 244 deletions.
122 changes: 63 additions & 59 deletions dev/git-hooks/pre-commit
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,12 @@
#
# @uses Global PHP version as different projects have different requirements.
#
# @version 4.5.1
# @version 5.3.0
#

PHP_VERSION="7.2"
PHPUNIT_DIR="dev/phpunit"

#####################################################################################

GREEN="$(tput setaf 2)"
Expand All @@ -18,67 +22,69 @@ RED="$(tput setaf 1)"
BLUE="$(tput setaf 6)"
RESET_COLOR="$(tput sgr0)"

PHP='php 7.2'
PHPCS='phpcs'
PHPUNIT='phpunit 7.2'
PHPSTAN='phpstan'

# Point to specific version of PHP if supported via environmental variables.
if [[ "true" == "$PHP_MULTI_VERSION_SUPPORT" ]]; then
PHP="php ${PHP_VERSION}"
PHPCS='phpcs'
PHPSTAN='phpstan'
PHPUNIT="phpunit ${PHP_VERSION}"
else
PHP='php'
PHPCS='phpcs'
PHPSTAN='phpstan'
PHPUNIT='phpunit'
fi
PROJECT=$(${PHP} -r "echo dirname(realpath('$0'), 3);")
## Fix windows paths
PROJECT=${PROJECT//\\//}

PHP_FILES=$(git diff-index --cached --name-only --diff-filter=ACMR HEAD | grep \\.php)
if [[ ! "$PHP_FILES" ]]; then
echo "${YELLOW}[pre-commit]${BLUE} No PHP Files Changed ${RESET_COLOR}"
exit 0
echo "${YELLOW}[pre-commit]${BLUE} No Lintable PHP Files Changed ${RESET_COLOR}"
fi

function exit_reset_colors() {
echo ${RESET_COLOR}
exit 1
echo ${RESET_COLOR}
exit 1
}

function php_unit() {
if [[ "$PHP_FILES" ]]; then
if [[ ! -f ${PROJECT}/dev/phpunit/phpunit.xml ]] && [[ ! -f ${PROJECT}/dev/phpunit/phpunit.xml.dist ]]; then
echo "${YELLOW}[pre-commit]${RED} ${PROJECT}/dev/phpunit/phpunit.xml or ${PROJECT}/dev/phpunit/phpunit.xml.dist not found!"
exit_reset_colors
fi
echo "${YELLOW}[pre-commit]${BLUE} Running PHP Unit... ${WHITE}"
cd "${PROJECT}/dev/phpunit" || exit
OUTPUT=$(${PHPUNIT})
if [[ $? != 0 ]]; then
echo
echo "${BLUE}PHP Unit Failed! Fix the error before commit!"
echo "${RED}$OUTPUT"
exit_reset_colors
fi
echo "${YELLOW}[pre-commit]${GREEN} PHP Unit Tests Passed!${WHITE}"
if [[ ! -f ${PROJECT}/${PHPUNIT_DIR}/phpunit.xml ]] && [[ ! -f ${PROJECT}/${PHPUNIT_DIR}/phpunit.xml.dist ]]; then
echo "${YELLOW}[pre-commit]${RED} ${PROJECT}/${PHPUNIT_DIR}/phpunit.xml or ${PROJECT}/${PHPUNIT_DIR}/phpunit.xml.dist not found!"
exit_reset_colors
fi
echo "${YELLOW}[pre-commit]${BLUE} Running PHP Unit... ${WHITE}"
cd "${PROJECT}/${PHPUNIT_DIR}" || exit
OUTPUT=$(${PHPUNIT})
if [[ $? != 0 ]]; then
echo
echo "${BLUE}PHP Unit Failed! Fix the error before commit!"
echo "${RED}$OUTPUT"
exit_reset_colors
fi
echo "${YELLOW}[pre-commit]${GREEN} PHP Unit Tests Passed!${RESET_COLOR}"
}
php_unit &

function php_lint() {
if [[ "$PHP_FILES" ]]; then
# Run php lint.
echo "${YELLOW}[pre-commit]${BLUE} Checking ${1} Lint... ${WHITE}"
for FILE in ${PHP_FILES}; do
OUTPUT=$(${1} -l -d display_errors=0 ${PROJECT}/${FILE})
if [[ $? != 0 ]]; then
echo
echo "${BLUE}${1} Lint Failed. Fix the error before commit."
echo "${RED}$OUTPUT"
exit_reset_colors
fi
done
echo "${YELLOW}[pre-commit]${GREEN} ${1} Lint Passed!${WHITE}"
fi
if [[ "$PHP_FILES" ]]; then
echo "${YELLOW}[pre-commit]${BLUE} Checking PHP Lint... ${WHITE}"
for FILE in ${PHP_FILES}; do
OUTPUT=$(${PHP} -l -d display_errors=0 ${PROJECT}/${FILE})
if [[ $? != 0 ]]; then
echo
echo "${BLUE}PHP Lint Failed. Fix the error before commit."
echo "${RED}$OUTPUT"
exit_reset_colors
fi
done
echo "${YELLOW}[pre-commit]${GREEN} PHP Lint Passed!${RESET_COLOR}"
fi
}

php_lint 'php' &
php_lint &

function php_code_sniffer() {
if [[ "$PHP_FILES" != "" ]]; then
if [[ "$PHP_FILES" || "$JS_FILES" ]]; then
if [[ ! -f ${PROJECT}/phpcs.xml ]] && [[ ! -f ${PROJECT}/phpcs.xml.dist ]]; then
echo "${YELLOW}[pre-commit]${RED} ${PROJECT}/phpcs.xml or ${PROJECT}/phpcs.xml.dist not found!"
exit_reset_colors
Expand All @@ -87,50 +93,48 @@ function php_code_sniffer() {
FILES="$FILES ${PROJECT}/${FILE}"
done
echo "${YELLOW}[pre-commit]${BLUE} Running PHPCS... ${WHITE}"
OUTPUT=$(${PHPCS} --encoding=utf-8 -s -p ${FILES})
OUTPUT=$(${PHPCS} --encoding=utf-8 -s -p)
if [[ $? != 0 ]]; then
echo
echo "${BLUE}PHPCS failed. Fix the error before commit!"
echo "${RED}$OUTPUT"
echo
echo "${YELLOW}For automatic fixes run"
echo
echo "${WHITE}phpcbf $FILES"
echo "${WHITE}phpcbf${FILES}"
echo
exit_reset_colors
fi
echo "${YELLOW}[pre-commit]${GREEN} PHPCS Passed!${WHITE}"
echo "${YELLOW}[pre-commit]${GREEN} PHPCS Passed!${RESET_COLOR}"
fi
}
php_code_sniffer &

function php_stan() {
if [[ "$PHP_FILES" ]]; then
echo "${YELLOW}[pre-commit]${BLUE} Running PHP Stan... ${WHITE}"
OUTPUT=$(${PHPSTAN} analyse --no-progress --memory-limit=2G)
if [[ $? != 0 ]]; then
echo
echo "${BLUE}PHP Stan Failed. Fix the error before commit."
echo "${RED}$OUTPUT"
exit_reset_colors
fi
echo "${YELLOW}[pre-commit]${GREEN} PHP Stan Passed!${WHITE}"
fi
echo "${YELLOW}[pre-commit]${BLUE} Running PHP Stan... ${WHITE}"
OUTPUT=$(${PHPSTAN} analyse --no-progress --memory-limit=2G)
if [[ $? != 0 ]]; then
echo
echo "${BLUE}PHP Stan Failed. Fix the error before commit."
echo "${RED}$OUTPUT"
exit_reset_colors
fi
echo "${YELLOW}[pre-commit]${GREEN} PHP Stan Passed!${RESET_COLOR}"
}
php_stan &

# Go through each background task
# If it sent exit code 1, it failed and the result from `wait` will be false.
FAIL=0
for job in $(jobs -p); do
wait "$job" || ((FAIL += 1))
wait "$job" || (( FAIL+=1 ))
done

echo "${RESET_COLOR}"

# If any of the background tasks failed, we exit 1
if [[ $FAIL -ne 0 ]]; then
exit 1
exit 1
else
exit 0
exit 0
fi
6 changes: 0 additions & 6 deletions extension.neon
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,6 @@ services:
- class: Lipe\Lib\Phpstan\Services\DynamicFunctionReturnType\GetApprovedComments
tags:
- phpstan.broker.dynamicFunctionReturnTypeExtension
- class: Lipe\Lib\Phpstan\Services\GetTermDynamicFunctionReturnTypeExtension
tags:
- phpstan.broker.dynamicFunctionReturnTypeExtension
- class: Lipe\Lib\Phpstan\Services\GetTermByDynamicFunctionReturnTypeExtension
tags:
- phpstan.broker.dynamicFunctionReturnTypeExtension
- class: Lipe\Lib\Phpstan\Services\DbGetDynamicFunctionReturnTypeExtension
tags:
- phpstan.broker.dynamicMethodReturnTypeExtension
Expand Down
90 changes: 0 additions & 90 deletions src/Services/GetTermByDynamicFunctionReturnTypeExtension.php
View file

This file was deleted.

89 changes: 0 additions & 89 deletions src/Services/GetTermDynamicFunctionReturnTypeExtension.php
View file

This file was deleted.

0 comments on commit 9ff2af0

Please sign in to comment.