From 8013a9fc619c66e42da8114cc612598f0398f9ff Mon Sep 17 00:00:00 2001 From: Timothy J Warren Date: Wed, 11 Dec 2019 16:32:21 -0500 Subject: [PATCH] Cleanup/update build scripts/dependencies --- .gitignore | 2 +- .travis.yml | 3 ++- RoboFile.php | 6 +++++- build/header_comment.txt | 4 ++-- build/phpunit.xml | 2 +- composer.json | 18 +++++++++--------- 6 files changed, 20 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index f771c09..2e700e6 100644 --- a/.gitignore +++ b/.gitignore @@ -137,7 +137,6 @@ build/logs/* build/pdepend/* build/phpdox/* cache.properties -._* tests/settings.json .php_cs coverage/* @@ -146,3 +145,4 @@ composer.lock docs/phpdoc* .project all_tests +build/.phpunit.result.cache diff --git a/.travis.yml b/.travis.yml index 47984a8..fc16395 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,8 +3,9 @@ sudo: false language: php php: - - 7.1 - 7.2 + - 7.3 + - 7.4 - nightly before_script: diff --git a/RoboFile.php b/RoboFile.php index 7f26934..250395f 100644 --- a/RoboFile.php +++ b/RoboFile.php @@ -94,7 +94,11 @@ class RoboFile extends \Robo\Tasks { */ 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']); + } /** diff --git a/build/header_comment.txt b/build/header_comment.txt index a7dad37..8d113b6 100644 --- a/build/header_comment.txt +++ b/build/header_comment.txt @@ -7,8 +7,8 @@ * * @package Query * @author Timothy J. Warren - * @copyright 2012 - 2018 Timothy J. Warren + * @copyright 2012 - 2019 Timothy J. Warren * @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 */ diff --git a/build/phpunit.xml b/build/phpunit.xml index 5eebd20..4215c21 100644 --- a/build/phpunit.xml +++ b/build/phpunit.xml @@ -27,7 +27,7 @@ - + \ No newline at end of file diff --git a/composer.json b/composer.json index 55d3460..fe41c92 100644 --- a/composer.json +++ b/composer.json @@ -7,7 +7,6 @@ "query builder", "codeigniter", "mysql", - "firebird", "sqlite", "postgres", "pdo" @@ -21,19 +20,20 @@ "role": "Developer" }], "require": { - "php": "^7.1" + "php": "^7.2", + "ext-pdo": "*" }, "require-dev": { - "consolidation/robo": "^1.0.0", - "monolog/monolog": "^1.21", + "consolidation/robo": "^2.0.0", + "monolog/monolog": "^2.0.1", "pdepend/pdepend": "^2.5", - "phploc/phploc": "^4.0", - "phpstan/phpstan": "^0.9.1", - "phpunit/phpunit": "^6.5", - "sebastian/phpcpd": "^3.0", + "phploc/phploc": "^5.0", + "phpstan/phpstan": "^0.12.2", + "phpunit/phpunit": "^8.5", + "sebastian/phpcpd": "^4.1", "simpletest/simpletest": "^1.1", "squizlabs/php_codesniffer": "^3.0.0", - "theseer/phpdox": "^0.11.0" + "theseer/phpdox": "^0.12.0" }, "autoload": { "psr-4": {