Guzzle up to 7.x (support laravel 8.x) (#14)

* Guzzle up to 7.x 

* change satooshi/php-coveralls library to php-coveralls/php-coveralls

* fix mockery/mockery

* fix phpcov

* fix "The attribute 'charset' is not allowed."

* add php 7.2+ to travis ci

* fix php7.3+

Author: rez1dent3

.travis.yml

@@ -2,6 +2,9 @@ language: php
 
 php:
   - '7.1'
+  - '7.2'
+  - '7.3'
+  - '7.4'
 
 sudo: required
 
@@ -12,9 +15,6 @@ compiler:
   - clang
   - g++
 
-before_install:
-  - composer require satooshi/php-coveralls
-
 before_script:
   - composer self-update
   - composer install --prefer-source --dev

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|^8.0|^9.0",
+    "php-coveralls/php-coveralls": "^2.2",
+    "phpunit/phpcov": "^5.0|^6.0|^7.0|^8.0"
   },
   "scripts": {
     "test": "phpunit --coverage-text --colors=never"

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"/>

tests/HttpTransportTest.php

@@ -377,7 +377,12 @@ public function testConnectionWithPassword()
         $transport = $this->getTransport();
 
         $this->expectException(TransportException::class);
-        $this->expectExceptionMessageRegExp('/Authentication failed: password is incorrect/');
+        $regularExpression = '/Authentication failed: password is incorrect/';
+        if (method_exists($this, 'expectExceptionMessageRegExp')) {
+            $this->expectExceptionMessageRegExp($regularExpression);
+        } else {
+            $this->expectErrorMessageMatches($regularExpression);
+        }
 
         $transport->read([
             new Query(new Server('127.0.0.1', 8123, 'default', 'default', 'pass'), 'select 1', [
@@ -391,7 +396,12 @@ public function testConnectionWithPasswordOnWrite()
         $transport = $this->getTransport();
 
         $this->expectException(TransportException::class);
-        $this->expectExceptionMessageRegExp('/Authentication failed: password is incorrect/');
+        $regularExpression = '/Authentication failed: password is incorrect/';
+        if (method_exists($this, 'expectExceptionMessageRegExp')) {
+            $this->expectExceptionMessageRegExp($regularExpression);
+        } else {
+            $this->expectErrorMessageMatches($regularExpression);
+        }
 
         $transport->write([
             new Query(new Server('127.0.0.1', 8123, 'default', 'default', 'pass'), 'insert into table 1', [