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 @@
-
+
- ./model
- ./public
- ./functions.inc.php
+ ./model/
+ ./public/
+ ./functions.inc.php/
+
+ ./tests/
+ ./vendor/
+ ./lib/
+
-
-
- ./tests/
-
- ./vendor/
- ./lib/
-