maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

update dev tools

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2021-06-17 08:25:43 +02:00
parent 61a50cc657
commit c4fa8feb8c
4 changed files with 829 additions and 954 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
build.xml
View File

@@ -6,17 +6,16 @@
<property name="pdepend" value="${basedir}/vendor/bin/pdepend" /> <property name="pdepend" value="${basedir}/vendor/bin/pdepend" />
<property name="phpcpd" value="${basedir}/vendor/bin/phpcpd" /> <property name="phpcpd" value="${basedir}/vendor/bin/phpcpd" />
<property name="phpcs" value="${basedir}/vendor/bin/phpcs" /> <property name="phpcs" value="${basedir}/vendor/bin/phpcs" />
<property name="phpdox" value="${basedir}/vendor/bin/phpdox" />
<property name="phploc" value="${basedir}/vendor/bin/phploc" /> <property name="phploc" value="${basedir}/vendor/bin/phploc" />
<property name="phpmd" value="${basedir}/vendor/bin/phpmd" /> <property name="phpmd" value="${basedir}/vendor/bin/phpmd" />
<property name="phpunit" value="${basedir}/vendor/bin/phpunit" /> <property name="phpunit" value="${basedir}/vendor/bin/phpunit" />
<target name="full-build" <target name="full-build"
depends="prepare,composer,static-analysis,phpunit,phpdox,-check-failure" depends="prepare,composer,static-analysis,phpunit,-check-failure"
description="Performs static analysis, runs the tests, and generates project documentation" /> description="Performs static analysis, runs the tests, and generates project documentation" />
<target name="full-build-parallel" <target name="full-build-parallel"
depends="prepare,composer,static-analysis-parallel,phpunit,phpdox,-check-failure" depends="prepare,composer,static-analysis-parallel,phpunit,-check-failure"
description="Performs static analysis (executing the tools in parallel), runs the tests, and generates project documentation" /> description="Performs static analysis (executing the tools in parallel), runs the tests, and generates project documentation" />
<target name="quick-build" <target name="quick-build"
@@ -49,7 +48,6 @@
<delete dir="${basedir}/build/coverage" /> <delete dir="${basedir}/build/coverage" />
<delete dir="${basedir}/build/logs" /> <delete dir="${basedir}/build/logs" />
<delete dir="${basedir}/build/pdepend" /> <delete dir="${basedir}/build/pdepend" />
<delete dir="${basedir}/build/phpdox" />
<property name="clean.done" value="true" /> <property name="clean.done" value="true" />
</target> </target>
@@ -59,7 +57,6 @@
<mkdir dir="${basedir}/build/coverage" /> <mkdir dir="${basedir}/build/coverage" />
<mkdir dir="${basedir}/build/logs" /> <mkdir dir="${basedir}/build/logs" />
<mkdir dir="${basedir}/build/pdepend" /> <mkdir dir="${basedir}/build/pdepend" />
<mkdir dir="${basedir}/build/phpdox" />
<property name="prepare.done" value="true" /> <property name="prepare.done" value="true" />
</target> </target>
@@ -269,18 +266,6 @@
<property name="phpunit.done" value="true" /> <property name="phpunit.done" value="true" />
</target> </target>
<target name="phpdox" unless="phpdox.done"
depends="phploc-ci,phpcs-ci,phpcompat-ci,phpmd-ci"
description="Generate project documentation using phpDox">
<exec executable="${phpdox}" dir="${basedir}/build"
taskname="phpdox">
<arg value="--file" />
<arg path="${basedir}/phpdox.xml" />
</exec>
<property name="phpdox.done" value="true" />
</target>
<target name="-check-failure"> <target name="-check-failure">
<fail message="PHPUnit did not finish successfully"> <fail message="PHPUnit did not finish successfully">
<condition> <condition>

12
composer.json
View File

@@ -50,16 +50,16 @@
"voku/anti-xss": "^4.1" "voku/anti-xss": "^4.1"
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": "8.4.1", "phpunit/phpunit": "^9",
"php": ">=7.3", "php": ">=7.3",
"ext-pcntl": "*", "ext-pcntl": "*",
"phpcompatibility/php-compatibility": "*", "phpcompatibility/php-compatibility": "*",
"squizlabs/php_codesniffer": "*", "squizlabs/php_codesniffer": "*",
"pdepend/pdepend": "^2.5", "pdepend/pdepend": "^2.9",
"sebastian/phpcpd": "^4.1", "sebastian/phpcpd": "^6.0",
"theseer/phpdox": "^0.12.0", "phploc/phploc": "^7.0",
"phploc/phploc": "^5.0", "phpmd/phpmd": "^2.10",
"phpmd/phpmd": "^2.6" "phpunit/php-timer" : "^5"
}, },
"suggest": { "suggest": {
"ext-bcmath": "*", "ext-bcmath": "*",

1673
composer.lock generated
View File

File diff suppressed because it is too large Load Diff

79
phpunit.xml
View File

@@ -1,45 +1,38 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<phpunit backupGlobals="false" backupStaticAttributes="false" <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" backupStaticAttributes="false" colors="false" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false" stopOnFailure="false" bootstrap="tests/bootstrap.php" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
colors="false" convertErrorsToExceptions="true" <coverage processUncoveredFiles="true">
convertNoticesToExceptions="true" convertWarningsToExceptions="true" <include>
processIsolation="false" stopOnFailure="false" <directory suffix=".php">./lib/Froxlor</directory>
bootstrap="tests/bootstrap.php"> </include>
<report>
<testsuites> <clover outputFile="build/logs/clover.xml"/>
<testsuite name="froxlor"> <crap4j outputFile="build/logs/crap4j.xml"/>
<!-- we need to specify the order of the tests for dependency-reasons --> <html outputDirectory="build/coverage" lowUpperBound="35" highLowerBound="70"/>
<directory>tests/Global</directory> </report>
<directory>tests/Admins</directory> </coverage>
<directory>tests/Customers</directory> <testsuites>
<directory>tests/IpsAndPorts</directory> <testsuite name="froxlor">
<directory>tests/Domains</directory> <!-- we need to specify the order of the tests for dependency-reasons -->
<directory>tests/Cronjobs</directory> <directory>tests/Global</directory>
<directory>tests/SubDomains</directory> <directory>tests/Admins</directory>
<directory>tests/Certificates</directory> <directory>tests/Customers</directory>
<directory>tests/Ftps</directory> <directory>tests/IpsAndPorts</directory>
<directory>tests/Emails</directory> <directory>tests/Domains</directory>
<directory>tests/Extras</directory> <directory>tests/Cronjobs</directory>
<directory>tests/Backup</directory> <directory>tests/SubDomains</directory>
<directory>tests/DomainZones</directory> <directory>tests/Certificates</directory>
<directory>tests/Mysqls</directory> <directory>tests/Ftps</directory>
<directory>tests/PhpAndFpm</directory> <directory>tests/Emails</directory>
<directory>tests/Traffic</directory> <directory>tests/Extras</directory>
<directory>tests/Froxlor</directory> <directory>tests/Backup</directory>
</testsuite> <directory>tests/DomainZones</directory>
</testsuites> <directory>tests/Mysqls</directory>
<directory>tests/PhpAndFpm</directory>
<logging> <directory>tests/Traffic</directory>
<log type="coverage-html" target="build/coverage" <directory>tests/Froxlor</directory>
lowUpperBound="35" highLowerBound="70" /> </testsuite>
<log type="coverage-clover" target="build/logs/clover.xml" /> </testsuites>
<log type="coverage-crap4j" target="build/logs/crap4j.xml" /> <logging>
<log type="junit" target="build/logs/junit.xml" /> <junit outputFile="build/logs/junit.xml"/>
</logging> </logging>
<filter>
<whitelist processUncoveredFilesFromWhitelist="true">
<directory suffix=".php">./lib/Froxlor</directory>
</whitelist>
</filter>
</phpunit> </phpunit>