From fecd5cf6f695d4652eb3a70930c216496c141c45 Mon Sep 17 00:00:00 2001
From: Matt Schwager <schwag09@gmail.com>
Date: Mon, 29 Oct 2018 08:40:23 -0600
Subject: [PATCH] Moved phpunit.xml configuration file to root repository
directory
---
.travis.yml | 2 +-
tools/phpunit/phpunit.xml => phpunit.xml | 18 +++++++++---------
2 files changed, 10 insertions(+), 10 deletions(-)
rename tools/phpunit/phpunit.xml => phpunit.xml (62%)
diff --git a/.travis.yml b/.travis.yml
index 4b8c7209e..1b15ddce8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,7 +15,7 @@ before_script:
- if [[ "$TRAVIS_PHP_VERSION" == "5.6" ]]; then composer require --dev php-coveralls/php-coveralls; fi
script:
- 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
after_success:
- if [[ "$TRAVIS_PHP_VERSION" == "5.6" ]]; then php vendor/bin/php-coveralls -v; fi
diff --git a/tools/phpunit/phpunit.xml b/phpunit.xml
similarity index 62%
rename from tools/phpunit/phpunit.xml
rename to phpunit.xml
index eae5444c3..6915e5c0b 100644
--- a/tools/phpunit/phpunit.xml
+++ b/phpunit.xml
@@ -8,22 +8,22 @@
processIsolation="false"
stopOnFailure="false"
syntaxCheck="false"
- bootstrap="./../../tests/bootstrap.php">
+ bootstrap="./tests/bootstrap.php">
<testsuites>
<testsuite name="Unit tests">
- <directory>./../../tests/</directory>
+ <directory>./tests/</directory>
</testsuite>
</testsuites>
<filter>
<whitelist processUncoveredFilesFromWhitelist="true">
- <directory suffix=".php">./../../lib/</directory>
- <directory suffix=".php">./../../modules/consent/lib/</directory>
- <directory suffix=".php">./../../modules/core/lib/</directory>
- <directory suffix=".php">./../../modules/saml/lib/</directory>
+ <directory suffix=".php">./lib/</directory>
+ <directory suffix=".php">./modules/consent/lib/</directory>
+ <directory suffix=".php">./modules/core/lib/</directory>
+ <directory suffix=".php">./modules/saml/lib/</directory>
<exclude>
- <directory>./../../vendor/</directory>
- <directory>./../../tests/</directory>
- <file>./../../lib/SimpleSAML/Utils/HttpAdapter.php</file>
+ <directory>./vendor/</directory>
+ <directory>./tests/</directory>
+ <file>./lib/SimpleSAML/Utils/HttpAdapter.php</file>
</exclude>
</whitelist>
</filter>
--
GitLab