diff --git a/docs/run-linter-locally.md b/docs/run-linter-locally.md index 9593d53a..0e04b994 100644 --- a/docs/run-linter-locally.md +++ b/docs/run-linter-locally.md @@ -33,7 +33,7 @@ Notes: - If the default branch for your repository doesn't match the default, you can use the `DEFAULT_BRANCH` variable to set the default branch. For more information about the default value of the `DEFAULT_BRANCH` variable, see the - [README](../README.md). + [Readme](../README.md). - You can add as many configuration options as needed. Configuration options are documented in the [readme](../README.md#configure-super-linter). diff --git a/lib/functions/detectFiles.sh b/lib/functions/detectFiles.sh index eed28ef7..39e5a539 100755 --- a/lib/functions/detectFiles.sh +++ b/lib/functions/detectFiles.sh @@ -293,9 +293,13 @@ function RunAdditionalInstalls() { ################################## # Run installs for Psalm and PHP # ################################## - if [ "${VALIDATE_PHP_PSALM}" == "true" ] && [ -e "${FILE_ARRAYS_DIRECTORY_PATH}/file-array-PHP_PSALM" ]; then + if [[ ("${VALIDATE_PHP:-"${VALIDATE_PHP_BUILTIN}"}" == "true" && -e "${FILE_ARRAYS_DIRECTORY_PATH}/file-array-PHP_BUILTIN") ]] || + [[ ("${VALIDATE_PHP_BUILTIN}" == "true" && -e "${FILE_ARRAYS_DIRECTORY_PATH}/file-array-PHP_BUILTIN") ]] || + [[ ("${VALIDATE_PHP_PHPCS}" == "true" && -e "${FILE_ARRAYS_DIRECTORY_PATH}/file-array-PHP_PHPCS") ]] || + [[ ("${VALIDATE_PHP_PHPSTAN}" == "true" && -e "${FILE_ARRAYS_DIRECTORY_PATH}/file-array-PHP_PHPSTAN") ]] || + [[ ("${VALIDATE_PHP_PSALM}" == "true" && -e "${FILE_ARRAYS_DIRECTORY_PATH}/file-array-PHP_PSALM") ]]; then # found PHP files and were validating it, need to composer install - info "Found PHP files to validate, and VALIDATE_PHP_PSALM is set to ${VALIDATE_PHP_PSALM}. Check if we need to run composer install" + info "Found PHP files to validate. Check if we need to run composer install" mapfile -t COMPOSER_FILE_ARRAY < <(find "${GITHUB_WORKSPACE}" -name composer.json 2>&1) debug "COMPOSER_FILE_ARRAY contents: ${COMPOSER_FILE_ARRAY[*]}" if [ "${#COMPOSER_FILE_ARRAY[@]}" -ne 0 ]; then