Skip to content
Snippets Groups Projects
Unverified Commit 6ecd3a94 authored by Thijs Kinkhorst's avatar Thijs Kinkhorst Committed by GitHub
Browse files

Merge pull request #972 from mschwager/master

Moved phpunit.xml configuration file to root repository directory
parents a5819989 fecd5cf6
No related branches found
No related tags found
No related merge requests found
...@@ -15,7 +15,7 @@ before_script: ...@@ -15,7 +15,7 @@ before_script:
- if [[ "$TRAVIS_PHP_VERSION" == "5.6" ]]; then composer require --dev php-coveralls/php-coveralls; fi - if [[ "$TRAVIS_PHP_VERSION" == "5.6" ]]; then composer require --dev php-coveralls/php-coveralls; fi
script: script:
- bin/check-syntax.sh - bin/check-syntax.sh
- if [[ "$TRAVIS_PHP_VERSION" == "5.6" ]]; then php vendor/phpunit/phpunit/phpunit --configuration tools/phpunit; else php vendor/phpunit/phpunit/phpunit --configuration tools/phpunit --no-coverage; fi - if [[ "$TRAVIS_PHP_VERSION" == "5.6" ]]; then php vendor/phpunit/phpunit/phpunit; else php vendor/phpunit/phpunit/phpunit --no-coverage; fi
- if [[ "$TRAVIS_PHP_VERSION" == "7.0" ]]; then vendor/bin/psalm; fi - if [[ "$TRAVIS_PHP_VERSION" == "7.0" ]]; then vendor/bin/psalm; fi
after_success: after_success:
- if [[ "$TRAVIS_PHP_VERSION" == "5.6" ]]; then php vendor/bin/php-coveralls -v; fi - if [[ "$TRAVIS_PHP_VERSION" == "5.6" ]]; then php vendor/bin/php-coveralls -v; fi
......
...@@ -8,22 +8,22 @@ ...@@ -8,22 +8,22 @@
processIsolation="false" processIsolation="false"
stopOnFailure="false" stopOnFailure="false"
syntaxCheck="false" syntaxCheck="false"
bootstrap="./../../tests/bootstrap.php"> bootstrap="./tests/bootstrap.php">
<testsuites> <testsuites>
<testsuite name="Unit tests"> <testsuite name="Unit tests">
<directory>./../../tests/</directory> <directory>./tests/</directory>
</testsuite> </testsuite>
</testsuites> </testsuites>
<filter> <filter>
<whitelist processUncoveredFilesFromWhitelist="true"> <whitelist processUncoveredFilesFromWhitelist="true">
<directory suffix=".php">./../../lib/</directory> <directory suffix=".php">./lib/</directory>
<directory suffix=".php">./../../modules/consent/lib/</directory> <directory suffix=".php">./modules/consent/lib/</directory>
<directory suffix=".php">./../../modules/core/lib/</directory> <directory suffix=".php">./modules/core/lib/</directory>
<directory suffix=".php">./../../modules/saml/lib/</directory> <directory suffix=".php">./modules/saml/lib/</directory>
<exclude> <exclude>
<directory>./../../vendor/</directory> <directory>./vendor/</directory>
<directory>./../../tests/</directory> <directory>./tests/</directory>
<file>./../../lib/SimpleSAML/Utils/HttpAdapter.php</file> <file>./lib/SimpleSAML/Utils/HttpAdapter.php</file>
</exclude> </exclude>
</whitelist> </whitelist>
</filter> </filter>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment