Merge branch 'develop'

This commit is contained in:
Dennis Eichhorn 2024-03-20 06:04:02 +00:00
commit c5f283c61d
5 changed files with 69 additions and 6 deletions

View File

@ -79,7 +79,7 @@ foreach ($modules as $module) {
. 'final class Null' . $model . 'Test extends \PHPUnit\Framework\TestCase' . "\n"
. '{' . "\n"
. ' /**' . "\n"
. ' * @covers Modules\\' . $module . '\Models\Null' . $model . '' . "\n"
. ' * @covers \Modules\\' . $module . '\Models\Null' . $model . '' . "\n"
. ' * @group module' . "\n"
. ' */' . "\n"
. ' public function testNull() : void' . "\n"
@ -88,7 +88,7 @@ foreach ($modules as $module) {
. ' }' . "\n"
. "\n"
. ' /**' . "\n"
. ' * @covers Modules\\' . $module . '\Models\Null' . $model . '' . "\n"
. ' * @covers \Modules\\' . $module . '\Models\Null' . $model . '' . "\n"
. ' * @group module' . "\n"
. ' */' . "\n"
. ' public function testId() : void' . "\n"
@ -98,7 +98,7 @@ foreach ($modules as $module) {
. ' }' . "\n"
. "\n"
. ' /**' . "\n"
. ' * @covers Modules\\' . $module . '\Models\Null' . $model . '' . "\n"
. ' * @covers \Modules\\' . $module . '\Models\Null' . $model . '' . "\n"
. ' * @group module' . "\n"
. ' */' . "\n"
. ' public function testJsonSerialize() : void' . "\n"

View File

@ -51,4 +51,4 @@ echo "#################################################"
echo "# PHP stats inspection"
echo "#################################################"
./vendor/bin/phploc --exclude vendor --exclude node_modules --exclude Resources --exclude Build --exclude .git --exclude privateSetup --exclude demoSetup ./
#./vendor/bin/phploc --exclude vendor --exclude node_modules --exclude Resources --exclude Build --exclude .git --exclude privateSetup --exclude demoSetup ./

62
Helper/Scripts/release.sh Normal file
View File

@ -0,0 +1,62 @@
#!/bin/bash
echo "#################################################"
echo "# Build develop"
echo "#################################################"
git submodule foreach "git checkout develop || true"
git submodule foreach git pull
git checkout develop
git pull
npm run scss
npm run release
echo "#################################################"
echo "# Update develop submodules"
echo "#################################################"
git submodule foreach git add .
git submodule foreach "git commit -m 'Preparing for master update' || true"
git submodule foreach git push
echo "#################################################"
echo "# Update develop main repo"
echo "#################################################"
git git add .
git git commit -m "Preparing for master update"
git git push
echo "#################################################"
echo "# Switch to master"
echo "#################################################"
git submodule foreach git checkout master
git submodule foreach git pull
git checkout master
git pull
echo "#################################################"
echo "# Merge develop"
echo "#################################################"
git submodule foreach git merge develop
git git merge develop
git submodule foreach git add .
git submodule foreach "git commit -m 'Update master' || true"
git submodule foreach git push
git git add .
git git commit -m "Update master"
git git push
echo "#################################################"
echo "# Switch to develop"
echo "#################################################"
git submodule foreach "git checkout develop || true"
git checkout develop

View File

@ -8,6 +8,7 @@
export PROMPT_COMMAND='echo "$(date "+%Y-%m-%d.%H:%M:%S") $(pwd) $(history 1)" >> /var/www/html/backup/bash/$(date "+%d").log'
add-apt-repository ppa:ondrej/php
apt-get update
apt-get upgrade
apt-get install git snapd ufw software-properties-common composer nodejs npm
@ -37,7 +38,7 @@ service fail2ban restart
## Web
###############################################################
apt-get install php8.1 php8.1-dev php8.1-cli php8.1-common php8.1-mysql php8.1-pgsql php8.1-xdebug php8.1-opcache php8.1-pdo php8.1-sqlite php8.1-mbstring php8.1-curl php8.1-imap php8.1-bcmath php8.1-zip php8.1-dom php8.1-xml php8.1-phar php8.1-gd php-pear apache2 libapache2-mpm-itk apache2-utils mariadb-server mariadb-client wkhtmltopdf tesseract-ocr poppler-utils imagemagick
apt-get install php8.2 php8.2-dev php8.2-cli php8.2-common php8.2-intl php8.2-mysql php8.2-pgsql php8.2-xdebug php8.2-opcache php8.2-pdo php8.2-sqlite php8.2-mbstring php8.2-curl php8.2-imap php8.2-bcmath php8.2-zip php8.2-dom php8.2-xml php8.2-phar php8.2-gd php-pear apache2 libapache2-mpm-itk apache2-utils mariadb-server mariadb-client wkhtmltopdf tesseract-ocr poppler-utils imagemagick
pecl install pcov
#echo "extension=pcov.so" > /etc/php/cli/conf.d/20-xdebug.ini

View File

@ -7,5 +7,5 @@ echo "Start php stats inspection"
echo "#################################################"
#
php ${TOOLS_PATH}/vendor/bin/phploc ${INSPECTION_PATH} > ${OUTPUT_PATH}/phploc.log || true
#php ${TOOLS_PATH}/vendor/bin/phploc ${INSPECTION_PATH} > ${OUTPUT_PATH}/phploc.log || true
php ${TOOLS_PATH}/vendor/bin/phpmetrics --config=${BUILD_PATH}/Config/phpmetrics.json --junit=${OUTPUT_PATH}/junit_php.xml --report-html=${OUTPUT_PATH}/metrics ${INSPECTION_PATH} || true