From 4453f3a4cb6da0007fb1c0f66acb3b3cc097f1f4 Mon Sep 17 00:00:00 2001 From: Jason Varga Date: Wed, 18 Sep 2019 14:18:55 -0400 Subject: [PATCH 1/2] Allow monolog v2 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 651f1f8..5a80839 100644 --- a/composer.json +++ b/composer.json @@ -25,7 +25,7 @@ "require": { "ext-pcre": "*", "intervention/httpauth": "~2.0", - "monolog/monolog": "~1.1", + "monolog/monolog": "~1.1|~2.0", "mrclay/jsmin-php": "~2", "mrclay/props-dic": "^2.2", "php": "^5.3.0 || ^7.0", From 2bd66ae3f923c0f4c5117c0d6322ac6537e9159f Mon Sep 17 00:00:00 2001 From: Jason Varga Date: Wed, 18 Sep 2019 15:02:27 -0400 Subject: [PATCH 2/2] use phpunit from vendor --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 25a5f78..53cde3f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,6 +37,6 @@ before_script: script: - composer validate - - phpunit --verbose + - vendor/bin/phpunit --verbose # vim:ts=2:sw=2:et