Version 3 #1

Manually merged
timw4mail merged 47 commits from develop into master 2020-04-23 18:39:27 -04:00
6 changed files with 20 additions and 15 deletions
Showing only changes of commit 8013a9fc61 - Show all commits

2
.gitignore vendored
View File

@ -137,7 +137,6 @@ build/logs/*
build/pdepend/* build/pdepend/*
build/phpdox/* build/phpdox/*
cache.properties cache.properties
._*
tests/settings.json tests/settings.json
.php_cs .php_cs
coverage/* coverage/*
@ -146,3 +145,4 @@ composer.lock
docs/phpdoc* docs/phpdoc*
.project .project
all_tests all_tests
build/.phpunit.result.cache

View File

@ -3,8 +3,9 @@ sudo: false
language: php language: php
php: php:
- 7.1
- 7.2 - 7.2
- 7.3
- 7.4
- nightly - nightly
before_script: before_script:

View File

@ -94,7 +94,11 @@ class RoboFile extends \Robo\Tasks {
*/ */
public function coverage() public function coverage()
{ {
$this->_run(['phpdbg -qrr -- vendor/bin/phpunit -c build']); $this->taskPhpUnit()
->configFile('build/phpunit.xml')
->run();
// $this->_run(['phpdbg -qrr -- vendor/bin/phpunit -c build']);
} }
/** /**

View File

@ -7,8 +7,8 @@
* *
* @package Query * @package Query
* @author Timothy J. Warren <tim@timshomepage.net> * @author Timothy J. Warren <tim@timshomepage.net>
* @copyright 2012 - 2018 Timothy J. Warren * @copyright 2012 - 2019 Timothy J. Warren
* @license http://www.opensource.org/licenses/mit-license.html MIT License * @license http://www.opensource.org/licenses/mit-license.html MIT License
* @link https://git.timshomepage.net/aviat4ion/Query * @link https://git.timshomepage.net/aviat/Query
* @version 3.0.0 * @version 3.0.0
*/ */

View File

@ -27,7 +27,7 @@
<logging> <logging>
<log type="coverage-html" target="./../coverage"/> <log type="coverage-html" target="./../coverage"/>
<log type="coverage-clover" target="logs/clover.xml"/> <log type="coverage-clover" target="logs/clover.xml"/>
<log type="coverage-xml" target="logs/coverage" /> <log type="coverage-xml" lowUpperBound="85" highLowerBound="90" showUncoveredFiles="true" target="logs/coverage" />
<log type="junit" target="logs/junit.xml" /> <log type="junit" target="logs/junit.xml" />
</logging> </logging>
</phpunit> </phpunit>

View File

@ -7,7 +7,6 @@
"query builder", "query builder",
"codeigniter", "codeigniter",
"mysql", "mysql",
"firebird",
"sqlite", "sqlite",
"postgres", "postgres",
"pdo" "pdo"
@ -21,19 +20,20 @@
"role": "Developer" "role": "Developer"
}], }],
"require": { "require": {
"php": "^7.1" "php": "^7.2",
"ext-pdo": "*"
}, },
"require-dev": { "require-dev": {
"consolidation/robo": "^1.0.0", "consolidation/robo": "^2.0.0",
"monolog/monolog": "^1.21", "monolog/monolog": "^2.0.1",
"pdepend/pdepend": "^2.5", "pdepend/pdepend": "^2.5",
"phploc/phploc": "^4.0", "phploc/phploc": "^5.0",
"phpstan/phpstan": "^0.9.1", "phpstan/phpstan": "^0.12.2",
"phpunit/phpunit": "^6.5", "phpunit/phpunit": "^8.5",
"sebastian/phpcpd": "^3.0", "sebastian/phpcpd": "^4.1",
"simpletest/simpletest": "^1.1", "simpletest/simpletest": "^1.1",
"squizlabs/php_codesniffer": "^3.0.0", "squizlabs/php_codesniffer": "^3.0.0",
"theseer/phpdox": "^0.11.0" "theseer/phpdox": "^0.12.0"
}, },
"autoload": { "autoload": {
"psr-4": { "psr-4": {