Merge 4689799 into 46ccafe

the-tinderbox · Sep 23, 2020 · b8ef73a · b8ef73a
2 parents 46ccafe + 4689799
commit b8ef73a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -12,9 +12,6 @@ compiler:
   - clang
   - g++
 
-before_install:
-  - composer require satooshi/php-coveralls
-
 before_script:
   - composer self-update
   - composer install --prefer-source --dev

diff --git a/composer.json b/composer.json
@@ -19,17 +19,17 @@
   },
   "require": {
     "php": "~7.1",
-    "guzzlehttp/guzzle": "~6.0",
-    "satooshi/php-coveralls": "^2.2"
+    "guzzlehttp/guzzle": "~6.0|~7.0"
   },
   "bin": [
     "bin/ccat_linux",
     "bin/ccat_darwin"
   ],
   "require-dev": {
-    "mockery/mockery": "^0.9.9",
-    "phpunit/php-code-coverage": "^6.0",
-    "phpunit/phpunit": "~7.0"
+    "mockery/mockery": "^0.9|^1.4",
+    "phpunit/phpunit": "~7.0",
+    "php-coveralls/php-coveralls": "^2.2",
+    "phpunit/phpcov": "^5.0"
   },
   "scripts": {
     "test": "phpunit --coverage-text --colors=never"

diff --git a/phpunit.xml b/phpunit.xml
@@ -20,7 +20,7 @@
         </whitelist>
     </filter>
     <logging>
-        <log type="coverage-html" target="coverage" charset="UTF-8"/>
+        <log type="coverage-html" target="coverage"/>
     </logging>
     <php>
         <const name="CLICKHOUSE_SERVER_HOST" value="127.0.0.1"/>