Merge pull request #10 from FriendsOfDoctrine/travisCI

Add Travis ci, update version phpClickHouse to ^0.18, cs fix

Author: argayash

.gitignore

@@ -2,3 +2,6 @@
 composer.lock
 vendor/
 phpunit.xml
+Vagrantfile
+puphpet/
+.vagrant/

.travis.yml

@@ -0,0 +1,27 @@
+language: php
+dist: trusty
+sudo: required
+
+php:
+  - 7.1
+  - 7.2
+  - nightly
+
+services:
+  - docker
+before_install:
+  - docker run -d -p 127.0.0.1:8123:8123 --name test-clickhouse-server --ulimit nofile=262144:262144 yandex/clickhouse-server
+  - docker ps -a
+  - sed -i 's/localhost/clickhouse-server/' ./phpunit.xml.dist
+  - echo '127.0.0.1 clickhouse-server' | sudo tee /etc/hosts > /dev/null
+
+before_script:
+  - composer install
+
+script:
+  - ./vendor/bin/phpunit --configuration ./phpunit.xml.dist
+
+matrix:
+  fast_finish: true
+  allow_failures:
+    - php: nightly

README.md

@@ -1,3 +1,8 @@
+[![Build Status](https://travis-ci.org/FriendsOfDoctrine/dbal-clickhouse.svg?branch=master)](https://travis-ci.org/FriendsOfDoctrine/dbal-clickhouse)
+[![Total Downloads](https://poser.pugx.org/friendsofdoctrine/dbal-clickhouse/d/total.svg)](https://packagist.org/packages/friendsofdoctrine/dbal-clickhouse)
+[![Latest Stable Version](https://poser.pugx.org/friendsofdoctrine/dbal-clickhouse/v/stable.svg)](https://packagist.org/packages/friendsofdoctrine/dbal-clickhouse)
+[![License](https://poser.pugx.org/friendsofdoctrine/dbal-clickhouse/license.svg)](https://packagist.org/packages/friendsofdoctrine/dbal-clickhouse)
+
 # Doctrine DBAL ClickHouse Driver
 
 Doctrine DBAL driver for ClickHouse -- an open-source column-oriented database management system by Yandex (https://clickhouse.yandex/)

composer.json

@@ -13,8 +13,8 @@
         }
     ],
     "require": {
-        "php": ">=5.4.0",
-        "smi2/phpClickHouse": "^0.17",
+        "php": "^7.1",
+        "smi2/phpClickHouse": "^0.18",
         "doctrine/dbal": ">=2.6"
     },
     "autoload": {
@@ -24,6 +24,6 @@
         "psr-4": { "FOD\\DBALClickHouse\\Tests\\": "tests/" }
     },
     "require-dev": {
-        "phpunit/phpunit": "^6.1"
+        "phpunit/phpunit": "^7.0"
     }
 }

src/ClickHouseConnection.php

@@ -35,14 +35,21 @@ class ClickHouseConnection implements \Doctrine\DBAL\Driver\Connection
     /**
      * Connection constructor
      *
-     * @param string $username      The username to use when connecting.
-     * @param string $password      The password to use when connecting.
+     * @param string $username The username to use when connecting.
+     * @param string $password The password to use when connecting.
      * @param string $host
      * @param int $port
      * @param string $database
+     * @param AbstractPlatform $platform
      */
-    public function __construct($username = 'default', $password = '', $host = 'localhost', $port = 8123, $database = 'default', AbstractPlatform $platform = null)
-    {
+    public function __construct(
+        $username = 'default',
+        $password = '',
+        $host = 'localhost',
+        $port = 8123,
+        $database = 'default',
+        AbstractPlatform $platform
+    ) {
         $this->smi2CHClient = new Smi2CHClient([
             'host' => $host,
             'port' => $port,
@@ -59,7 +66,7 @@ public function __construct($username = 'default', $password = '', $host = 'loca
      */
     public function prepare($prepareString)
     {
-        if (! $this->smi2CHClient) {
+        if (!$this->smi2CHClient) {
             throw new \Exception('ClickHouse\Client was not initialized');
         }
 
@@ -71,7 +78,7 @@ public function prepare($prepareString)
      */
     public function query()
     {
-        $args = func_get_args();
+        $args = \func_get_args();
         $stmt = $this->prepare($args[0]);
         $stmt->execute();
 
@@ -83,7 +90,7 @@ public function query()
      */
     public function quote($input, $type = \PDO::PARAM_STR)
     {
-        if (\PDO::PARAM_INT == $type) {
+        if (\PDO::PARAM_INT === $type) {
             return $input;
         }
 
@@ -148,5 +155,4 @@ public function errorInfo()
     {
         throw new \LogicException('You need to implement ClickHouseConnection::errorInfo()');
     }
-
-}
+}

src/ClickHouseException.php

@@ -16,4 +16,6 @@
  *
  * @author Mochalygin <[email protected]>
  */
-class ClickHouseException extends \Exception {}
+class ClickHouseException extends \Exception
+{
+}