From 942caa300118957a1521011b7c5472de59fab05e Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Mon, 21 Oct 2019 15:37:47 +0200 Subject: [PATCH] Bug fixes and additional comments --- Inspection/inspect.sh | 15 +++++++++++++++ buildProject.sh | 1 + setup.sh | 5 +++++ 3 files changed, 21 insertions(+) diff --git a/Inspection/inspect.sh b/Inspection/inspect.sh index 28e2e32..0e76204 100755 --- a/Inspection/inspect.sh +++ b/Inspection/inspect.sh @@ -11,24 +11,39 @@ mysql -e 'create database oms;' -u ${DB_USER} --password="${DB_PASSWORD}" #. Js/build.sh # Executing unit tests +echo "#################################################" +echo "PHP tests" + . ${BUILD_PATH}/Inspection/Php/tests.sh # Stats & metrics +echo "#################################################" +echo "PHP stats" . ${BUILD_PATH}/Inspection/Php/stats.sh # Linting +echo "#################################################" +echo "Json and PHP linting" . ${BUILD_PATH}/Inspection/Php/linting.sh . ${BUILD_PATH}/Inspection/Json/linting.sh # Code style +echo "#################################################" +echo "PHP coding style" . ${BUILD_PATH}/Inspection/Php/style.sh # Custom html inspections +echo "#################################################" +echo "Custom html inspection" . ${BUILD_PATH}/Inspection/Html/tags.sh . ${BUILD_PATH}/Inspection/Html/attributes.sh # Custom php inspections +echo "#################################################" +echo "Custom php inspection" . ${BUILD_PATH}/Inspection/Php/security.sh # Build external test report +echo "#################################################" +echo "PHP test report" php ${TOOLS_PATH}/testreportgenerator.phar -l ${BUILD_PATH}/Config/reportLang.php -c ${INSPECTION_PATH}/Test/Php/coverage.xml -u ${INSPECTION_PATH}/Test/Php/junit_php.xml -d ${INSPECTION_PATH}/Test/ReportExternal --version 1.0.0 \ No newline at end of file diff --git a/buildProject.sh b/buildProject.sh index ffdfc96..a4c36c5 100755 --- a/buildProject.sh +++ b/buildProject.sh @@ -12,6 +12,7 @@ cd ${BUILD_PATH} . ${BUILD_PATH}/Inspection/inspect.sh # Build documentation +echo "#################################################" echo "Start documentation generation" php ${TOOLS_PATH}/documentor.phar -s ${ROOT_PATH}/phpOMS -d ${BASE_PATH}/Inspection/Test/Php/DocBlock -c ${INSPECTION_PATH}/Test/Php/coverage.xml -u ${INSPECTION_PATH}/Test/Php/junit_php.xml -b https://orange-management.org/Inspection/Test/Php/DocBlock diff --git a/setup.sh b/setup.sh index 94a2b7a..eb615f7 100755 --- a/setup.sh +++ b/setup.sh @@ -2,6 +2,7 @@ . config.sh +echo "#################################################" echo "Remove old setup" # Previous cleanup @@ -17,6 +18,7 @@ mkdir -p ${INSPECTION_PATH} cd ${BASE_PATH} +echo "#################################################" echo "Setup repositories" # Create git repositories @@ -33,6 +35,7 @@ cd ${ROOT_PATH} git submodule update --init --recursive git submodule foreach git checkout develop +echo "#################################################" echo "Setup hooks" # Setup hooks @@ -50,6 +53,7 @@ chmod +x ${ROOT_PATH}/.git/modules/jsOMS/hooks/pre-commit chmod +x ${ROOT_PATH}/.git/modules/Modules/hooks/pre-commit chmod +x ${ROOT_PATH}/.git/modules/cssOMS/hooks/pre-commit +echo "#################################################" echo "Setup build output" # Creating directories for inspection @@ -94,6 +98,7 @@ mkdir -p ${TOOLS_PATH} cd ${TOOLS_PATH} +echo "#################################################" echo "Setup tools" # Downloading tools