From 5f772afe14a15600c5d6de1fc1cef6e6596631d9 Mon Sep 17 00:00:00 2001
From: David Goodwin <david@codepoets.co.uk>
Date: Fri, 31 Jan 2020 20:03:38 +0000
Subject: [PATCH] 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
---
 composer.json |  7 ++++---
 phpunit.xml   | 20 +++++++++-----------
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/composer.json b/composer.json
index 20f85618..83edc612 100644
--- a/composer.json
+++ b/composer.json
@@ -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",
@@ -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":  "*",
@@ -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": [
diff --git a/phpunit.xml b/phpunit.xml
index 59fd7575..dd3349ba 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -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>