Skip to content

Commit

Permalink
dev improvements
Browse files Browse the repository at this point in the history
 bump minimum php variant to 7.0
 update phpunit.xml
 switch to shardj/zf1-future rather than unsupported zf1
 try running tests by default in github
  • Loading branch information
DavidGoodwin committed Jan 31, 2020
1 parent 1ad1846 commit 5f772af
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 14 deletions.
7 changes: 4 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
"@check-format",
"@lint",
"@test-fixup",
"@psalm"
"@psalm",
"@test"
],
"check-format": "php-cs-fixer fix --ansi --dry-run --diff",
"format": "php-cs-fixer fix --ansi",
Expand All @@ -18,7 +19,7 @@
"psalm": "@php ./vendor/bin/psalm --no-cache --show-info=false "
},
"require": {
"php": ">=5.6"
"php": ">=7.0"
},
"require-dev": {
"ext-mysqli": "*",
Expand All @@ -29,7 +30,7 @@
"php-coveralls/php-coveralls" : "*",
"phpunit/phpunit": "^6|^7",
"vimeo/psalm":"^3.0",
"zendframework/zendframework1": "^1.12.0"
"shardj/zf1-future" : "^1.12"
},
"autoload": {
"files": [
Expand Down
20 changes: 9 additions & 11 deletions phpunit.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,22 +12,20 @@
</php>

<logging>
<log type="coverage-html" target="./coverage" charset="UTF-8" highlight="false" lowUpperBound="35" highLowerBound="70"/>
<log type="coverage-html" target="./coverage" lowUpperBound="35" highLowerBound="70"/>
</logging>

<filter>
<whitelist>
<directory>./model</directory>
<directory>./public</directory>
<file>./functions.inc.php</file>
<directory>./model/</directory>
<directory>./public/</directory>
<directory>./functions.inc.php/</directory>
<exclude>
<directory>./tests/</directory>
<directory>./vendor/</directory>
<directory>./lib/</directory>
</exclude>
</whitelist>
<blacklist>
<!-- no point in doing coverage for the tests themselves -->
<directory>./tests/</directory>
<!-- we have no control over code from these directories -->
<directory>./vendor/</directory>
<directory>./lib/</directory>
</blacklist>
</filter>

</phpunit>

0 comments on commit 5f772af

Please sign in to comment.