patch laravel-clickhouse

.travis.yml

@@ -1,16 +1,30 @@
 language: php
-
 php:
-  - 7.1
+  - '7.2'
+  - '7.3'
+  - '7.4'
+  - 'nightly'
+
+services:
+  - memcached
 
-before_install:
-  - composer require php-coveralls/php-coveralls
+matrix:
+  allow_failures:
+    - php: 'nightly'
 
 before_script:
-  - composer self-update
-  - composer install --prefer-source --dev
+  - pecl install pcov
+  - phpenv config-rm xdebug.ini || echo "xdebug not available"
+  - bash <(curl -s https://raw.githubusercontent.com/php-cache/cache/master/build/php/7.2/Memcached.sh)
+  - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
+  - chmod +x ./cc-test-reporter
+  - if [ $(phpenv version-name) = "7.4" ]; then ./cc-test-reporter before-build; fi
+  - composer install
 
-script: vendor/bin/phpunit --coverage-clover ./tests/logs/clover.xml
+script:
+  - ./vendor/bin/phpunit --coverage-xml=build/coverage-xml --log-junit=build/junit.xml
+  - ./vendor/bin/infection --coverage=build --min-msi=20 -j$(nproc)
 
-after_script:
- - php vendor/bin/php-coveralls -v
+after_success:
+  - if [ $(phpenv version-name) = "7.4" ]; then ./cc-test-reporter after-build --coverage-input-type clover --exit-code $TRAVIS_TEST_RESULT; fi
+  - bash <(curl -s https://codecov.io/bash)

README.md

@@ -1,7 +1,7 @@
 # laravel-clickhouse
-[![Build Status](https://travis-ci.org/esazykin/laravel-clickhouse.svg?branch=master)](https://travis-ci.org/esazykin/laravel-clickhouse)
+[![Build Status](https://travis-ci.org/bavix/laravel-clickhouse.svg?branch=master)](https://travis-ci.org/bavix/laravel-clickhouse)
 [![StyleCI](https://styleci.io/repos/112756298/shield?branch=master)](https://styleci.io/repos/112756298)
-[![Coverage Status](https://coveralls.io/repos/github/esazykin/laravel-clickhouse/badge.svg)](https://coveralls.io/github/esazykin/laravel-clickhouse)
+[![Coverage Status](https://coveralls.io/repos/github/bavix/laravel-clickhouse/badge.svg)](https://coveralls.io/github/bavix/laravel-clickhouse)
 
 Eloquent model for ClickHouse
 
@@ -11,12 +11,12 @@ Eloquent model for ClickHouse
 
 ## Installation
 ```sh
-$ composer require esazykin/laravel-clickhouse
+$ composer require bavix/laravel-clickhouse
 ```
 
 Then add the code above into your config/app.php file providers section
 ```php
-Esazykin\LaravelClickHouse\ClickHouseServiceProvider::class,
+Bavix\LaravelClickHouse\ClickHouseServiceProvider::class,
 ```
 And add new connection into your config/database.php file. Something like this:
 ```php
@@ -72,7 +72,7 @@ Then create model
 ```php
 <?php
 
-use Esazykin\LaravelClickHouse\Database\Eloquent\Model;
+use Bavix\LaravelClickHouse\Database\Eloquent\Model;
 
 class Payment extends Model
 {

composer.json

@@ -1,5 +1,5 @@
 {
-  "name": "esazykin/laravel-clickhouse",
+  "name": "bavix/laravel-clickhouse",
   "type": "library",
   "license": "MIT",
   "keywords": [
@@ -8,23 +8,24 @@
     "eloquent"
   ],
   "require": {
-    "php": ">=7.1",
-    "laravel/framework": "5.5.*",
-    "esazykin/clickhouse-builder": "^1.1"
+    "php": ">=7.2",
+    "laravel/framework": "^6.0|^7.0",
+    "the-tinderbox/clickhouse-builder": "^3.0"
   },
   "require-dev": {
-    "phpunit/phpunit": "^6.5",
-    "mockery/mockery": "^1.0",
-    "fzaninotto/faker": "^1.7"
+    "infection/infection": "0.15.*|0.16.*",
+    "phpunit/phpunit": "^8.0|^9.0",
+    "mockery/mockery": "^1.3",
+    "fzaninotto/faker": "^1.9"
   },
   "autoload": {
     "psr-4": {
-      "Esazykin\\LaravelClickHouse\\": "src/"
+      "Bavix\\LaravelClickHouse\\": "src/"
     }
   },
   "autoload-dev": {
     "psr-4": {
-      "Esazykin\\LaravelClickHouse\\Tests\\": "tests/"
+      "Bavix\\LaravelClickHouse\\Tests\\": "tests/"
     }
   },
   "scripts": {

infection.json.dist

@@ -0,0 +1,17 @@
+{
+  "timeout": 10,
+  "source": {
+    "directories": [
+      "src"
+    ]
+  },
+  "logs": {
+    "text": "build/infection.log",
+    "badge": {
+      "branch": "master"
+    }
+  },
+  "mutators": {
+    "@default": true
+  }
+}

phpunit.xml

@@ -19,6 +19,6 @@
         </whitelist>
     </filter>
     <logging>
-        <log type="coverage-html" target="tests/coverage" charset="UTF-8"/>
+        <log type="coverage-html" target="tests/coverage" />
     </logging>
 </phpunit>

src/ClickHouseServiceProvider.php

@@ -2,12 +2,12 @@
 
 declare(strict_types=1);
 
-namespace Esazykin\LaravelClickHouse;
+namespace Bavix\LaravelClickHouse;
 
 use Illuminate\Support\ServiceProvider;
 use Illuminate\Database\DatabaseManager;
-use Esazykin\LaravelClickHouse\Database\Connection;
-use Esazykin\LaravelClickHouse\Database\Eloquent\Model;
+use Bavix\LaravelClickHouse\Database\Connection;
+use Bavix\LaravelClickHouse\Database\Eloquent\Model;
 
 class ClickHouseServiceProvider extends ServiceProvider
 {

src/Database/Connection.php

@@ -2,10 +2,10 @@
 
 declare(strict_types=1);
 
-namespace Esazykin\LaravelClickHouse\Database;
+namespace Bavix\LaravelClickHouse\Database;
 
 use Tinderbox\ClickhouseBuilder\Query\Grammar;
-use Esazykin\LaravelClickHouse\Database\Query\Builder;
+use Bavix\LaravelClickHouse\Database\Query\Builder;
 
 class Connection extends \Tinderbox\ClickhouseBuilder\Integrations\Laravel\Connection
 {

src/Database/Eloquent/Builder.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Esazykin\LaravelClickHouse\Database\Eloquent;
+namespace Bavix\LaravelClickHouse\Database\Eloquent;
 
 use Closure;
 use BadMethodCallException;
@@ -12,7 +12,7 @@
 use Illuminate\Database\Eloquent\Relations\Relation;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Database\Eloquent\RelationNotFoundException;
-use Esazykin\LaravelClickHouse\Database\Query\Builder as QueryBuilder;
+use Bavix\LaravelClickHouse\Database\Query\Builder as QueryBuilder;
 
 /**
  * @mixin QueryBuilder
@@ -24,14 +24,14 @@ class Builder
     /**
      * The base query builder instance.
      *
-     * @var \Esazykin\LaravelClickHouse\Database\Query\Builder
+     * @var \Bavix\LaravelClickHouse\Database\Query\Builder
      */
     protected $query;
 
     /**
      * The model being queried.
      *
-     * @var \Esazykin\LaravelClickHouse\Database\Eloquent\Model
+     * @var \Bavix\LaravelClickHouse\Database\Eloquent\Model
      */
     protected $model;
 

src/Database/Eloquent/Collection.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Esazykin\LaravelClickHouse\Database\Eloquent;
+namespace Bavix\LaravelClickHouse\Database\Eloquent;
 
 use Illuminate\Support\Arr;
 use Illuminate\Support\Collection as SupportCollection;

src/Database/Eloquent/Concerns/HasAttributes.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Esazykin\LaravelClickHouse\Database\Eloquent\Concerns;
+namespace Bavix\LaravelClickHouse\Database\Eloquent\Concerns;
 
 use Illuminate\Database\Eloquent\Concerns\HasAttributes as BaseHasAttributes;
 

src/Database/Eloquent/Model.php

@@ -2,15 +2,15 @@
 
 declare(strict_types=1);
 
-namespace Esazykin\LaravelClickHouse\Database\Eloquent;
+namespace Bavix\LaravelClickHouse\Database\Eloquent;
 
 use ArrayAccess;
 use JsonSerializable;
 use Illuminate\Support\Str;
 use Illuminate\Contracts\Support\Jsonable;
 use Illuminate\Contracts\Support\Arrayable;
 use Tinderbox\ClickhouseBuilder\Query\Grammar;
-use Esazykin\LaravelClickHouse\Database\Connection;
+use Bavix\LaravelClickHouse\Database\Connection;
 use Illuminate\Database\ConnectionResolverInterface;
 use Illuminate\Database\Eloquent\Concerns\HasEvents;
 use Illuminate\Database\Eloquent\JsonEncodingException;
@@ -19,7 +19,7 @@
 use Illuminate\Database\Eloquent\Concerns\GuardsAttributes;
 use Illuminate\Database\Eloquent\Concerns\HasRelationships;
 use Illuminate\Database\ConnectionResolverInterface as Resolver;
-use Esazykin\LaravelClickHouse\Database\Query\Builder as QueryBuilder;
+use Bavix\LaravelClickHouse\Database\Query\Builder as QueryBuilder;
 
 /**
  * @mixin \Eloquent

src/Database/Query/Builder.php

@@ -2,15 +2,15 @@
 
 declare(strict_types=1);
 
-namespace Esazykin\LaravelClickHouse\Database\Query;
+namespace Bavix\LaravelClickHouse\Database\Query;
 
 use Illuminate\Support\Arr;
 use Illuminate\Support\Collection;
 use Tinderbox\Clickhouse\Common\Format;
 use Illuminate\Support\Traits\Macroable;
 use Tinderbox\ClickhouseBuilder\Query\Grammar;
 use Tinderbox\ClickhouseBuilder\Query\BaseBuilder;
-use Esazykin\LaravelClickHouse\Database\Connection;
+use Bavix\LaravelClickHouse\Database\Connection;
 
 class Builder extends BaseBuilder
 {

tests/EloquentModelCastingTest.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Esazykin\LaravelClickHouse\Tests;
+namespace Bavix\LaravelClickHouse\Tests;
 
 class EloquentModelCastingTest extends EloquentModelTest
 {

tests/EloquentModelTest.php

@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-namespace Esazykin\LaravelClickHouse\Tests;
+namespace Bavix\LaravelClickHouse\Tests;
 
-use Esazykin\LaravelClickHouse\Database\Eloquent\Model;
+use Bavix\LaravelClickHouse\Database\Eloquent\Model;
 
 /**
  * @property int id

tests/EloquentModelWithTest.php

@@ -2,10 +2,10 @@
 
 declare(strict_types=1);
 
-namespace Esazykin\LaravelClickHouse\Tests;
+namespace Bavix\LaravelClickHouse\Tests;
 
 use Mockery\MockInterface;
-use Esazykin\LaravelClickHouse\Database\Eloquent\Builder;
+use Bavix\LaravelClickHouse\Database\Eloquent\Builder;
 
 class EloquentModelWithTest extends EloquentModelTest
 {

tests/Helpers.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Esazykin\LaravelClickHouse\Tests;
+namespace Bavix\LaravelClickHouse\Tests;
 
 use Mockery;
 use Faker\Factory;

tests/Unit/Database/ConnectionTest.php

@@ -2,17 +2,21 @@
 
 declare(strict_types=1);
 
-namespace Esazykin\LaravelClickHouse\Tests\Database;
+namespace Bavix\LaravelClickHouse\Tests\Database;
 
 use PHPUnit\Framework\TestCase;
-use Esazykin\LaravelClickHouse\Database\Connection;
-use Esazykin\LaravelClickHouse\Database\Query\Builder;
+use Bavix\LaravelClickHouse\Database\Connection;
+use Bavix\LaravelClickHouse\Database\Query\Builder;
 
 class ConnectionTest extends TestCase
 {
-    public function testQuery()
+    public function testQuery(): void
     {
-        $connection = new Connection(['host' => 'localhost']);
+        $connection = new Connection([
+            'host' => 'localhost',
+            'port' => '8123',
+            'database' => 'default',
+        ]);
 
         $this->assertInstanceOf(Builder::class, $connection->query());
     }