diff options
| -rw-r--r-- | .travis.yml | 28 | ||||
| -rw-r--r-- | tests/app/Module/AhnentafelReportModuleTest.php | 4 | ||||
| -rw-r--r-- | tests/app/Module/BirthDeathMarriageReportModuleTest.php | 4 | ||||
| -rw-r--r-- | tests/app/Module/BirthReportModuleTest.php | 4 | ||||
| -rw-r--r-- | tests/app/Module/CemeteryReportModuleTest.php | 4 | ||||
| -rw-r--r-- | tests/app/Module/ChangeReportModuleTest.php | 4 | ||||
| -rw-r--r-- | tests/app/Module/DeathReportModuleTest.php | 4 | ||||
| -rw-r--r-- | tests/app/Module/DescendancyReportModuleTest.php | 4 | ||||
| -rw-r--r-- | tests/app/Module/FactSourcesReportModuleTest.php | 4 | ||||
| -rw-r--r-- | tests/app/Module/FamilyGroupReportModuleTest.php | 4 | ||||
| -rw-r--r-- | tests/app/Module/IndividualFamiliesReportModuleTest.php | 4 | ||||
| -rw-r--r-- | tests/app/Module/IndividualReportModuleTest.php | 4 | ||||
| -rw-r--r-- | tests/app/Module/MarriageReportModuleTest.php | 4 | ||||
| -rw-r--r-- | tests/app/Module/MissingFactsReportModuleTest.php | 4 | ||||
| -rw-r--r-- | tests/app/Module/OccupationReportModuleTest.php | 4 | ||||
| -rw-r--r-- | tests/app/Module/PedigreeReportModuleTest.php | 4 | ||||
| -rw-r--r-- | tests/app/Module/RelatedIndividualsReportModuleTest.php | 4 |
17 files changed, 45 insertions, 47 deletions
diff --git a/.travis.yml b/.travis.yml index 0bf740634e..3f9f2b0d8d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,28 +16,26 @@ cache: - vendor - $HOME/.composer/cache +# 7.4snapshot does not currently have ext-gd - but we don't need it for our tests install: - - echo ${TRAVIS_PHP_VERSION:0:3} - curl -s http://getcomposer.org/installer | php - - # 7.4snapshot does not currently have ext-gd - but we don't need it for our tests - - if [ ${TRAVIS_PHP_VERSION:0:3} = 8.0 ]; then php composer.phar install --no-interaction --ignore-platform-reqs; fi - - if [ ${TRAVIS_PHP_VERSION:0:3} = 7.4 ]; then php composer.phar install --no-interaction --ignore-platform-reqs; fi - - if [ ${TRAVIS_PHP_VERSION:0:3} = 7.3 ]; then php composer.phar install --no-interaction --ignore-platform-reqs; fi - - if [ ${TRAVIS_PHP_VERSION:0:3} = 7.2 ]; then php composer.phar install --no-interaction; fi - - if [ ${TRAVIS_PHP_VERSION:0:3} = 7.1 ]; then php composer.phar install --no-interaction; fi + - if [ $TRAVIS_PHP_VERSION = nightly ]; then php composer.phar install --ignore-platform-reqs; fi + - if [ $TRAVIS_PHP_VERSION = 7.4snapshot ]; then php composer.phar install --ignore-platform-reqs; fi + - if [ $TRAVIS_PHP_VERSION = 7.3 ]; then php composer.phar install; fi + - if [ $TRAVIS_PHP_VERSION = 7.2 ]; then php composer.phar install; fi + - if [ $TRAVIS_PHP_VERSION = 7.1 ]; then php composer.phar install; fi before_script: - travis_retry composer config github-oauth.github.com "${GITHUB_OAUTH_TOKEN}" - echo "${TRAVIS_PHP_VERSION}" +# Coverage testing is slow, so only do it once. script: - - mkdir -p build/logs - - # nightly and 7.4snapshot do not currently have ext-xdebug, which is needed for coverage testing - - if [ ${TRAVIS_PHP_VERSION:0:3} = 8.0 ]; then vendor/bin/phpunit -c phpunit.xml.dist; fi - - if [ ${TRAVIS_PHP_VERSION:0:3} = 7.4 ]; then vendor/bin/phpunit -c phpunit.xml.dist; fi - - if [ ${TRAVIS_PHP_VERSION:0:3} = 7.3 ]; then vendor/bin/phpunit -c phpunit.xml.dist; fi - - if [ ${TRAVIS_PHP_VERSION:0:3} = 7.2 ]; then vendor/bin/phpunit -c phpunit.xml.dist --coverage-clover tests/clover.xml; fi - - if [ ${TRAVIS_PHP_VERSION:0:3} = 7.1 ]; then vendor/bin/phpunit -c phpunit.xml.dist --coverage-clover tests/clover.xml; fi + - if [ $TRAVIS_PHP_VERSION = nightly ]; then vendor/bin/phpunit -c phpunit.xml.dist; fi + - if [ $TRAVIS_PHP_VERSION = 7.4snapshot ]; then vendor/bin/phpunit -c phpunit.xml.dist; fi + - if [ $TRAVIS_PHP_VERSION = 7.3 ]; then vendor/bin/phpunit -c phpunit.xml.dist --coverage-clover tests/clover.xml; fi + - if [ $TRAVIS_PHP_VERSION = 7.2 ]; then vendor/bin/phpunit -c phpunit.xml.dist; fi + - if [ $TRAVIS_PHP_VERSION = 7.1 ]; then vendor/bin/phpunit -c phpunit.xml.dist; fi after_script: - - travis_retry php vendor/bin/php-coveralls -v + - if [ $TRAVIS_PHP_VERSION = 7.3 ]; then travis_retry php vendor/bin/php-coveralls -v; fi diff --git a/tests/app/Module/AhnentafelReportModuleTest.php b/tests/app/Module/AhnentafelReportModuleTest.php index 44066b351b..cfced96cd7 100644 --- a/tests/app/Module/AhnentafelReportModuleTest.php +++ b/tests/app/Module/AhnentafelReportModuleTest.php @@ -26,8 +26,8 @@ use Fisharebest\Webtrees\Tree; * Test harness for the class AhnentafelReportModule * * @covers \Fisharebest\Webtrees\Report\ReportHtml - * @covers \Fisharebest\Webtrees\Report\ReportParserGenerate; - * @covers \Fisharebest\Webtrees\Report\ReportPdf; + * @covers \Fisharebest\Webtrees\Report\ReportParserGenerate + * @covers \Fisharebest\Webtrees\Report\ReportPdf */ class AhnentafelReportModuleTest extends \Fisharebest\Webtrees\TestCase { diff --git a/tests/app/Module/BirthDeathMarriageReportModuleTest.php b/tests/app/Module/BirthDeathMarriageReportModuleTest.php index 4f5c159c13..0642347de9 100644 --- a/tests/app/Module/BirthDeathMarriageReportModuleTest.php +++ b/tests/app/Module/BirthDeathMarriageReportModuleTest.php @@ -26,8 +26,8 @@ use Fisharebest\Webtrees\Tree; * Test harness for the class BirthDeathMarriageReportModule * * @covers \Fisharebest\Webtrees\Report\ReportHtml - * @covers \Fisharebest\Webtrees\Report\ReportParserGenerate; - * @covers \Fisharebest\Webtrees\Report\ReportPdf; + * @covers \Fisharebest\Webtrees\Report\ReportParserGenerate + * @covers \Fisharebest\Webtrees\Report\ReportPdf */ class BirthDeathMarriageReportModuleTest extends \Fisharebest\Webtrees\TestCase { diff --git a/tests/app/Module/BirthReportModuleTest.php b/tests/app/Module/BirthReportModuleTest.php index 8e1e58e59e..48174b44f9 100644 --- a/tests/app/Module/BirthReportModuleTest.php +++ b/tests/app/Module/BirthReportModuleTest.php @@ -26,8 +26,8 @@ use Fisharebest\Webtrees\Tree; * Test harness for the class BirthReportModule * * @covers \Fisharebest\Webtrees\Report\ReportHtml - * @covers \Fisharebest\Webtrees\Report\ReportParserGenerate; - * @covers \Fisharebest\Webtrees\Report\ReportPdf; + * @covers \Fisharebest\Webtrees\Report\ReportParserGenerate + * @covers \Fisharebest\Webtrees\Report\ReportPdf */ class BirthReportModuleTest extends \Fisharebest\Webtrees\TestCase { diff --git a/tests/app/Module/CemeteryReportModuleTest.php b/tests/app/Module/CemeteryReportModuleTest.php index 7b8a1dad17..3cda92a417 100644 --- a/tests/app/Module/CemeteryReportModuleTest.php +++ b/tests/app/Module/CemeteryReportModuleTest.php @@ -26,8 +26,8 @@ use Fisharebest\Webtrees\Tree; * Test harness for the class CemeteryReportModule * * @covers \Fisharebest\Webtrees\Report\ReportHtml - * @covers \Fisharebest\Webtrees\Report\ReportParserGenerate; - * @covers \Fisharebest\Webtrees\Report\ReportPdf; + * @covers \Fisharebest\Webtrees\Report\ReportParserGenerate + * @covers \Fisharebest\Webtrees\Report\ReportPdf */ class CemeteryReportModuleTest extends \Fisharebest\Webtrees\TestCase { diff --git a/tests/app/Module/ChangeReportModuleTest.php b/tests/app/Module/ChangeReportModuleTest.php index d4e84d36ba..2e8229df7f 100644 --- a/tests/app/Module/ChangeReportModuleTest.php +++ b/tests/app/Module/ChangeReportModuleTest.php @@ -27,8 +27,8 @@ use Illuminate\Support\Carbon; * Test harness for the class ChangeReportModule * * @covers \Fisharebest\Webtrees\Report\ReportHtml - * @covers \Fisharebest\Webtrees\Report\ReportParserGenerate; - * @covers \Fisharebest\Webtrees\Report\ReportPdf; + * @covers \Fisharebest\Webtrees\Report\ReportParserGenerate + * @covers \Fisharebest\Webtrees\Report\ReportPdf */ class ChangeReportModuleTest extends \Fisharebest\Webtrees\TestCase { diff --git a/tests/app/Module/DeathReportModuleTest.php b/tests/app/Module/DeathReportModuleTest.php index f562a57322..4820f7ff58 100644 --- a/tests/app/Module/DeathReportModuleTest.php +++ b/tests/app/Module/DeathReportModuleTest.php @@ -26,8 +26,8 @@ use Fisharebest\Webtrees\Tree; * Test harness for the class DeathReportModule * * @covers \Fisharebest\Webtrees\Report\ReportHtml - * @covers \Fisharebest\Webtrees\Report\ReportParserGenerate; - * @covers \Fisharebest\Webtrees\Report\ReportPdf; + * @covers \Fisharebest\Webtrees\Report\ReportParserGenerate + * @covers \Fisharebest\Webtrees\Report\ReportPdf */ class DeathReportModuleTest extends \Fisharebest\Webtrees\TestCase { diff --git a/tests/app/Module/DescendancyReportModuleTest.php b/tests/app/Module/DescendancyReportModuleTest.php index d333ed66a4..b735b44bbc 100644 --- a/tests/app/Module/DescendancyReportModuleTest.php +++ b/tests/app/Module/DescendancyReportModuleTest.php @@ -26,8 +26,8 @@ use Fisharebest\Webtrees\Tree; * Test harness for the class DescendancyReportModule * * @covers \Fisharebest\Webtrees\Report\ReportHtml - * @covers \Fisharebest\Webtrees\Report\ReportParserGenerate; - * @covers \Fisharebest\Webtrees\Report\ReportPdf; + * @covers \Fisharebest\Webtrees\Report\ReportParserGenerate + * @covers \Fisharebest\Webtrees\Report\ReportPdf */ class DescendancyReportModuleTest extends \Fisharebest\Webtrees\TestCase { diff --git a/tests/app/Module/FactSourcesReportModuleTest.php b/tests/app/Module/FactSourcesReportModuleTest.php index 3a65d3ed40..9b32010d11 100644 --- a/tests/app/Module/FactSourcesReportModuleTest.php +++ b/tests/app/Module/FactSourcesReportModuleTest.php @@ -26,8 +26,8 @@ use Fisharebest\Webtrees\Tree; * Test harness for the class FactSourcesReportModule * * @covers \Fisharebest\Webtrees\Report\ReportHtml - * @covers \Fisharebest\Webtrees\Report\ReportParserGenerate; - * @covers \Fisharebest\Webtrees\Report\ReportPdf; + * @covers \Fisharebest\Webtrees\Report\ReportParserGenerate + * @covers \Fisharebest\Webtrees\Report\ReportPdf */ class FactSourcesReportModuleTest extends \Fisharebest\Webtrees\TestCase { diff --git a/tests/app/Module/FamilyGroupReportModuleTest.php b/tests/app/Module/FamilyGroupReportModuleTest.php index 370d3e993d..8c3dc43fc4 100644 --- a/tests/app/Module/FamilyGroupReportModuleTest.php +++ b/tests/app/Module/FamilyGroupReportModuleTest.php @@ -26,8 +26,8 @@ use Fisharebest\Webtrees\Tree; * Test harness for the class FamilyGroupReportModule * * @covers \Fisharebest\Webtrees\Report\ReportHtml - * @covers \Fisharebest\Webtrees\Report\ReportParserGenerate; - * @covers \Fisharebest\Webtrees\Report\ReportPdf; + * @covers \Fisharebest\Webtrees\Report\ReportParserGenerate + * @covers \Fisharebest\Webtrees\Report\ReportPdf */ class FamilyGroupReportModuleTest extends \Fisharebest\Webtrees\TestCase { diff --git a/tests/app/Module/IndividualFamiliesReportModuleTest.php b/tests/app/Module/IndividualFamiliesReportModuleTest.php index 839ab352f2..729b899b7b 100644 --- a/tests/app/Module/IndividualFamiliesReportModuleTest.php +++ b/tests/app/Module/IndividualFamiliesReportModuleTest.php @@ -26,8 +26,8 @@ use Fisharebest\Webtrees\Tree; * Test harness for the class IndividualFamiliesReportModule * * @covers \Fisharebest\Webtrees\Report\ReportHtml - * @covers \Fisharebest\Webtrees\Report\ReportParserGenerate; - * @covers \Fisharebest\Webtrees\Report\ReportPdf; + * @covers \Fisharebest\Webtrees\Report\ReportParserGenerate + * @covers \Fisharebest\Webtrees\Report\ReportPdf */ class IndividualFamiliesReportModuleTest extends \Fisharebest\Webtrees\TestCase { diff --git a/tests/app/Module/IndividualReportModuleTest.php b/tests/app/Module/IndividualReportModuleTest.php index b2c440f3dd..a23caf2bd3 100644 --- a/tests/app/Module/IndividualReportModuleTest.php +++ b/tests/app/Module/IndividualReportModuleTest.php @@ -26,8 +26,8 @@ use Fisharebest\Webtrees\Tree; * Test harness for the class IndividualReportModule * * @covers \Fisharebest\Webtrees\Report\ReportHtml - * @covers \Fisharebest\Webtrees\Report\ReportParserGenerate; - * @covers \Fisharebest\Webtrees\Report\ReportPdf; + * @covers \Fisharebest\Webtrees\Report\ReportParserGenerate + * @covers \Fisharebest\Webtrees\Report\ReportPdf */ class IndividualReportModuleTest extends \Fisharebest\Webtrees\TestCase { diff --git a/tests/app/Module/MarriageReportModuleTest.php b/tests/app/Module/MarriageReportModuleTest.php index 6d038606a6..4c2dc39d21 100644 --- a/tests/app/Module/MarriageReportModuleTest.php +++ b/tests/app/Module/MarriageReportModuleTest.php @@ -26,8 +26,8 @@ use Fisharebest\Webtrees\Tree; * Test harness for the class MarriageReportModule * * @covers \Fisharebest\Webtrees\Report\ReportHtml - * @covers \Fisharebest\Webtrees\Report\ReportParserGenerate; - * @covers \Fisharebest\Webtrees\Report\ReportPdf; + * @covers \Fisharebest\Webtrees\Report\ReportParserGenerate + * @covers \Fisharebest\Webtrees\Report\ReportPdf */ class MarriageReportModuleTest extends \Fisharebest\Webtrees\TestCase { diff --git a/tests/app/Module/MissingFactsReportModuleTest.php b/tests/app/Module/MissingFactsReportModuleTest.php index 88a527ac7b..33ed125729 100644 --- a/tests/app/Module/MissingFactsReportModuleTest.php +++ b/tests/app/Module/MissingFactsReportModuleTest.php @@ -26,8 +26,8 @@ use Fisharebest\Webtrees\Tree; * Test harness for the class MissingFactsReportModule * * @covers \Fisharebest\Webtrees\Report\ReportHtml - * @covers \Fisharebest\Webtrees\Report\ReportParserGenerate; - * @covers \Fisharebest\Webtrees\Report\ReportPdf; + * @covers \Fisharebest\Webtrees\Report\ReportParserGenerate + * @covers \Fisharebest\Webtrees\Report\ReportPdf */ class MissingFactsReportModuleTest extends \Fisharebest\Webtrees\TestCase { diff --git a/tests/app/Module/OccupationReportModuleTest.php b/tests/app/Module/OccupationReportModuleTest.php index e7f18ce47b..057e3d7cdf 100644 --- a/tests/app/Module/OccupationReportModuleTest.php +++ b/tests/app/Module/OccupationReportModuleTest.php @@ -26,8 +26,8 @@ use Fisharebest\Webtrees\Tree; * Test harness for the class OccupationReportModule * * @covers \Fisharebest\Webtrees\Report\ReportHtml - * @covers \Fisharebest\Webtrees\Report\ReportParserGenerate; - * @covers \Fisharebest\Webtrees\Report\ReportPdf; + * @covers \Fisharebest\Webtrees\Report\ReportParserGenerate + * @covers \Fisharebest\Webtrees\Report\ReportPdf */ class OccupationReportModuleTest extends \Fisharebest\Webtrees\TestCase { diff --git a/tests/app/Module/PedigreeReportModuleTest.php b/tests/app/Module/PedigreeReportModuleTest.php index 00a2c23e03..9630e97846 100644 --- a/tests/app/Module/PedigreeReportModuleTest.php +++ b/tests/app/Module/PedigreeReportModuleTest.php @@ -26,8 +26,8 @@ use Fisharebest\Webtrees\Tree; * Test harness for the class PedigreeReportModule * * @covers \Fisharebest\Webtrees\Report\ReportHtml - * @covers \Fisharebest\Webtrees\Report\ReportParserGenerate; - * @covers \Fisharebest\Webtrees\Report\ReportPdf; + * @covers \Fisharebest\Webtrees\Report\ReportParserGenerate + * @covers \Fisharebest\Webtrees\Report\ReportPdf */ class PedigreeReportModuleTest extends \Fisharebest\Webtrees\TestCase { diff --git a/tests/app/Module/RelatedIndividualsReportModuleTest.php b/tests/app/Module/RelatedIndividualsReportModuleTest.php index 3b8606d6d9..5e09982154 100644 --- a/tests/app/Module/RelatedIndividualsReportModuleTest.php +++ b/tests/app/Module/RelatedIndividualsReportModuleTest.php @@ -26,8 +26,8 @@ use Fisharebest\Webtrees\Tree; * Test harness for the class RelatedIndividualsReportModule * * @covers \Fisharebest\Webtrees\Report\ReportHtml - * @covers \Fisharebest\Webtrees\Report\ReportParserGenerate; - * @covers \Fisharebest\Webtrees\Report\ReportPdf; + * @covers \Fisharebest\Webtrees\Report\ReportParserGenerate + * @covers \Fisharebest\Webtrees\Report\ReportPdf */ class RelatedIndividualsReportModuleTest extends \Fisharebest\Webtrees\TestCase { |
