dev improvements

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
pull/325/head
David Goodwin 5 years ago
parent 1ad184641d
commit 5f772afe14

@ -8,7 +8,8 @@
"@check-format", "@check-format",
"@lint", "@lint",
"@test-fixup", "@test-fixup",
"@psalm" "@psalm",
"@test"
], ],
"check-format": "php-cs-fixer fix --ansi --dry-run --diff", "check-format": "php-cs-fixer fix --ansi --dry-run --diff",
"format": "php-cs-fixer fix --ansi", "format": "php-cs-fixer fix --ansi",
@ -18,7 +19,7 @@
"psalm": "@php ./vendor/bin/psalm --no-cache --show-info=false " "psalm": "@php ./vendor/bin/psalm --no-cache --show-info=false "
}, },
"require": { "require": {
"php": ">=5.6" "php": ">=7.0"
}, },
"require-dev": { "require-dev": {
"ext-mysqli": "*", "ext-mysqli": "*",
@ -29,7 +30,7 @@
"php-coveralls/php-coveralls" : "*", "php-coveralls/php-coveralls" : "*",
"phpunit/phpunit": "^6|^7", "phpunit/phpunit": "^6|^7",
"vimeo/psalm":"^3.0", "vimeo/psalm":"^3.0",
"zendframework/zendframework1": "^1.12.0" "shardj/zf1-future" : "^1.12"
}, },
"autoload": { "autoload": {
"files": [ "files": [

@ -12,22 +12,20 @@
</php> </php>
<logging> <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> </logging>
<filter> <filter>
<whitelist> <whitelist>
<directory>./model</directory> <directory>./model/</directory>
<directory>./public</directory> <directory>./public/</directory>
<file>./functions.inc.php</file> <directory>./functions.inc.php/</directory>
</whitelist> <exclude>
<blacklist>
<!-- no point in doing coverage for the tests themselves -->
<directory>./tests/</directory> <directory>./tests/</directory>
<!-- we have no control over code from these directories -->
<directory>./vendor/</directory> <directory>./vendor/</directory>
<directory>./lib/</directory> <directory>./lib/</directory>
</blacklist> </exclude>
</whitelist>
</filter> </filter>
</phpunit> </phpunit>

Loading…
Cancel
Save