From 76d29bbc5d1e516f43ac8be5f8c551fb86633b3d Mon Sep 17 00:00:00 2001 From: MichaelWise Date: Tue, 19 Jul 2022 19:13:37 +0500 Subject: [PATCH 01/13] Update composer.json --- composer.json | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/composer.json b/composer.json index 7c115ad..e7fca41 100644 --- a/composer.json +++ b/composer.json @@ -8,14 +8,17 @@ "eloquent" ], "require": { - "php": ">=7.1", - "laravel/framework": "5.5.*", - "esazykin/clickhouse-builder": "^1.1" + "php": "^7.2|^8.0", + "laravel/framework": "^9.0", + "the-tinderbox/clickhouse-builder": "^4.0", }, "require-dev": { - "phpunit/phpunit": "^6.5", - "mockery/mockery": "^1.0", - "fzaninotto/faker": "^1.7" + "infection/infection": "~0.15", + "phpunit/phpunit": "^8.0|^9.0", + "mockery/mockery": "^1.3", + "fakerphp/faker": "^1.9", + "bavix/clickhouse-php-client": "^3.0", + "bavix/clickhouse-builder": "^4.0" }, "autoload": { "psr-4": { From 742cf45b95e8502de79ec3ee4d0e25ac2cc8684f Mon Sep 17 00:00:00 2001 From: MichaelWise Date: Tue, 19 Jul 2022 19:14:14 +0500 Subject: [PATCH 02/13] Update composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index e7fca41..5fef9d7 100644 --- a/composer.json +++ b/composer.json @@ -1,5 +1,5 @@ { - "name": "esazykin/laravel-clickhouse", + "name": "michaelwise/laravel-clickhouse", "type": "library", "license": "MIT", "keywords": [ From ab059ec6f767629ba22e9edac0318c41e607d6fe Mon Sep 17 00:00:00 2001 From: MichaelWise Date: Tue, 19 Jul 2022 19:16:54 +0500 Subject: [PATCH 03/13] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9194de7..c64ae90 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ Eloquent model for ClickHouse ## Installation ```sh -$ composer require esazykin/laravel-clickhouse +$ composer require michaelwise/laravel-clickhouse ``` Then add the code above into your config/app.php file providers section From 92d530b7ae3e5e0cd3af88e2036e5a27bc754dbf Mon Sep 17 00:00:00 2001 From: MichaelWise Date: Tue, 19 Jul 2022 20:37:11 +0500 Subject: [PATCH 04/13] Update composer.json --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 5fef9d7..15f818c 100644 --- a/composer.json +++ b/composer.json @@ -10,7 +10,7 @@ "require": { "php": "^7.2|^8.0", "laravel/framework": "^9.0", - "the-tinderbox/clickhouse-builder": "^4.0", + "the-tinderbox/clickhouse-builder": "3.0", }, "require-dev": { "infection/infection": "~0.15", @@ -18,7 +18,7 @@ "mockery/mockery": "^1.3", "fakerphp/faker": "^1.9", "bavix/clickhouse-php-client": "^3.0", - "bavix/clickhouse-builder": "^4.0" + "bavix/clickhouse-builder": "^3.0" }, "autoload": { "psr-4": { From d735a4d5198e4ec8e9f24a9b1e5939583dea1c8c Mon Sep 17 00:00:00 2001 From: MichaelWise Date: Tue, 19 Jul 2022 20:41:45 +0500 Subject: [PATCH 05/13] Update composer.json --- composer.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 15f818c..4473aa4 100644 --- a/composer.json +++ b/composer.json @@ -32,5 +32,7 @@ }, "scripts": { "test": "vendor/bin/phpunit --stop-on-failure tests/" - } + }, + "minimum-stability": "dev", + "prefer-stable" : true } From 1172ee24c472f0f206a1ad7ce5a32d4d92acd7e9 Mon Sep 17 00:00:00 2001 From: makushkin Date: Tue, 19 Jul 2022 20:44:07 +0500 Subject: [PATCH 06/13] asd --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 4473aa4..fac64a2 100644 --- a/composer.json +++ b/composer.json @@ -1,5 +1,5 @@ { - "name": "michaelwise/laravel-clickhouse", + "name": "michaelWise/laravel-clickhouse", "type": "library", "license": "MIT", "keywords": [ From 7a9a40f4f74899de4948544f80b0f52b6493aef0 Mon Sep 17 00:00:00 2001 From: makushkin Date: Tue, 19 Jul 2022 20:45:46 +0500 Subject: [PATCH 07/13] asd --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index fac64a2..7d96cf9 100644 --- a/composer.json +++ b/composer.json @@ -10,7 +10,7 @@ "require": { "php": "^7.2|^8.0", "laravel/framework": "^9.0", - "the-tinderbox/clickhouse-builder": "3.0", + "the-tinderbox/clickhouse-builder": "3.0@dev", }, "require-dev": { "infection/infection": "~0.15", From ea3ec6b28b0458a8cc7a8441538cf34c96924c05 Mon Sep 17 00:00:00 2001 From: makushkin Date: Tue, 19 Jul 2022 21:04:10 +0500 Subject: [PATCH 08/13] asd --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 7d96cf9..2280f93 100644 --- a/composer.json +++ b/composer.json @@ -1,5 +1,5 @@ { - "name": "michaelWise/laravel-clickhouse", + "name": "michaelwise/laravel-clickhouse", "type": "library", "license": "MIT", "keywords": [ @@ -10,7 +10,7 @@ "require": { "php": "^7.2|^8.0", "laravel/framework": "^9.0", - "the-tinderbox/clickhouse-builder": "3.0@dev", + "the-tinderbox/clickhouse-builder": "3.0" }, "require-dev": { "infection/infection": "~0.15", From 6eb5adfc38dc583c6ad8edd776570b4ff2299925 Mon Sep 17 00:00:00 2001 From: MichaelWise Date: Wed, 20 Jul 2022 12:11:10 +0500 Subject: [PATCH 09/13] Update composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 2280f93..005c80e 100644 --- a/composer.json +++ b/composer.json @@ -10,7 +10,7 @@ "require": { "php": "^7.2|^8.0", "laravel/framework": "^9.0", - "the-tinderbox/clickhouse-builder": "3.0" + "the-tinderbox/clickhouse-builder": "5.*" }, "require-dev": { "infection/infection": "~0.15", From 6a222f5b3b08b60fca8ea12bf9a238d2830fdaef Mon Sep 17 00:00:00 2001 From: MichaelWise Date: Wed, 20 Jul 2022 12:19:39 +0500 Subject: [PATCH 10/13] Update composer.json --- composer.json | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 005c80e..7fafd05 100644 --- a/composer.json +++ b/composer.json @@ -7,10 +7,24 @@ "clickhouse", "eloquent" ], + "repositories": [ + { + "type":"package", + "package": { + "name": "michaelwise/clickhouse-builder", + "version":"master", + "source": { + "url": "https://github.com/MichaelWise/clickhouse-builder.git", + "type": "git", + "reference":"master" + } + } + } + ], "require": { "php": "^7.2|^8.0", "laravel/framework": "^9.0", - "the-tinderbox/clickhouse-builder": "5.*" + "michaelwise/clickhouse-builder": "master" }, "require-dev": { "infection/infection": "~0.15", From 56c06aed64c340718239cb15db5576ce44fc39b9 Mon Sep 17 00:00:00 2001 From: MichaelWise Date: Wed, 20 Jul 2022 12:20:18 +0500 Subject: [PATCH 11/13] Update composer.json --- composer.json | 82 +++++++++++++++++++++++++-------------------------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/composer.json b/composer.json index 7fafd05..f968f87 100644 --- a/composer.json +++ b/composer.json @@ -1,52 +1,52 @@ { - "name": "michaelwise/laravel-clickhouse", - "type": "library", - "license": "MIT", - "keywords": [ - "laravel", - "clickhouse", - "eloquent" - ], - "repositories": [ + "name": "michaelwise/laravel-clickhouse", + "type": "library", + "license": "MIT", + "keywords": [ + "laravel", + "clickhouse", + "eloquent" + ], + "repositories": [ { - "type":"package", + "type": "package", "package": { "name": "michaelwise/clickhouse-builder", - "version":"master", + "version": "master", "source": { "url": "https://github.com/MichaelWise/clickhouse-builder.git", "type": "git", - "reference":"master" + "reference": "master" } } } - ], - "require": { - "php": "^7.2|^8.0", - "laravel/framework": "^9.0", - "michaelwise/clickhouse-builder": "master" - }, - "require-dev": { - "infection/infection": "~0.15", - "phpunit/phpunit": "^8.0|^9.0", - "mockery/mockery": "^1.3", - "fakerphp/faker": "^1.9", - "bavix/clickhouse-php-client": "^3.0", - "bavix/clickhouse-builder": "^3.0" - }, - "autoload": { - "psr-4": { - "Esazykin\\LaravelClickHouse\\": "src/" - } - }, - "autoload-dev": { - "psr-4": { - "Esazykin\\LaravelClickHouse\\Tests\\": "tests/" - } - }, - "scripts": { - "test": "vendor/bin/phpunit --stop-on-failure tests/" - }, - "minimum-stability": "dev", - "prefer-stable" : true + ], + "require": { + "php": "^7.2|^8.0", + "laravel/framework": "^9.0", + "michaelwise/clickhouse-builder": "master" + }, + "require-dev": { + "infection/infection": "~0.15", + "phpunit/phpunit": "^8.0|^9.0", + "mockery/mockery": "^1.3", + "fakerphp/faker": "^1.9", + "bavix/clickhouse-php-client": "^3.0", + "bavix/clickhouse-builder": "^3.0" + }, + "autoload": { + "psr-4": { + "Esazykin\\LaravelClickHouse\\": "src/" + } + }, + "autoload-dev": { + "psr-4": { + "Esazykin\\LaravelClickHouse\\Tests\\": "tests/" + } + }, + "scripts": { + "test": "vendor/bin/phpunit --stop-on-failure tests/" + }, + "minimum-stability": "dev", + "prefer-stable": true } From 21d964771a74160c3ec9c025838767fa189d872c Mon Sep 17 00:00:00 2001 From: makushkin Date: Wed, 20 Jul 2022 12:31:08 +0500 Subject: [PATCH 12/13] asd --- composer.json | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/composer.json b/composer.json index f968f87..c14f00f 100644 --- a/composer.json +++ b/composer.json @@ -7,24 +7,10 @@ "clickhouse", "eloquent" ], - "repositories": [ - { - "type": "package", - "package": { - "name": "michaelwise/clickhouse-builder", - "version": "master", - "source": { - "url": "https://github.com/MichaelWise/clickhouse-builder.git", - "type": "git", - "reference": "master" - } - } - } - ], "require": { "php": "^7.2|^8.0", "laravel/framework": "^9.0", - "michaelwise/clickhouse-builder": "master" + "the-tinderbox/clickhouse-builder": "5.*" }, "require-dev": { "infection/infection": "~0.15", From 49892c2cbefc08f7ec743ec232972f9f69b4ea96 Mon Sep 17 00:00:00 2001 From: MichaelWise Date: Wed, 20 Jul 2022 12:38:21 +0500 Subject: [PATCH 13/13] Update composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index c14f00f..5805c51 100644 --- a/composer.json +++ b/composer.json @@ -10,7 +10,7 @@ "require": { "php": "^7.2|^8.0", "laravel/framework": "^9.0", - "the-tinderbox/clickhouse-builder": "5.*" + "the-tinderbox/clickhouse-builder": "^5.3" }, "require-dev": { "infection/infection": "~0.15",