From 391303b88311eb01c64d5d13553b38fdab15d83a Mon Sep 17 00:00:00 2001 From: Matan Yadaev Date: Thu, 15 Jul 2021 15:55:11 +0300 Subject: [PATCH 1/4] support php 8 --- .github/workflows/tests.yml | 10 ++-------- composer.json | 8 ++++---- tests/ServiceProviderTest.php | 2 +- 3 files changed, 7 insertions(+), 13 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index dbeeb6c..4b03a21 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -11,15 +11,9 @@ jobs: strategy: matrix: - php: ['7.1', '7.2', '7.3', '7.4'] - laravel: ['5.5', '5.6', '5.7', '5.8', '6', '7', '8'] + php: ['7.2', '7.3', '7.4', '8.0'] + laravel: ['6', '7', '8'] exclude: - - php: '7.1' - laravel: '6' - - php: '7.1' - laravel: '7' - - php: '7.1' - laravel: '8' - php: '7.2' laravel: '8' diff --git a/composer.json b/composer.json index d2ba5a9..37c1a8b 100644 --- a/composer.json +++ b/composer.json @@ -10,10 +10,10 @@ } ], "require": { - "php": "^7.1.3", - "illuminate/config": "^5.5 || ^6.0 || ^7.0 || ^8.0", - "illuminate/support": "^5.5 || ^6.0 || ^7.0 || ^8.0", - "segmentio/analytics-php": "~1.5.2" + "php": ">=7.2", + "illuminate/config": "^6.0 || ^7.0 || ^8.0", + "illuminate/support": "^6.0 || ^7.0 || ^8.0", + "segmentio/analytics-php": "~1.8.0" }, "require-dev": { "graham-campbell/analyzer": "^2.4 || ^3.0", diff --git a/tests/ServiceProviderTest.php b/tests/ServiceProviderTest.php index d01c009..7171bd3 100644 --- a/tests/ServiceProviderTest.php +++ b/tests/ServiceProviderTest.php @@ -26,7 +26,7 @@ class ServiceProviderTest extends AbstractPackageTestCase { use ServiceProviderTrait; - protected function getServiceProviderClass($app) + protected function getServiceProviderClass() { return SegmentServiceProvider::class; } From 2b9b97b0a5dcbe28f1c3057668696692dc1b58e7 Mon Sep 17 00:00:00 2001 From: Matan Yadaev Date: Thu, 22 Jul 2021 11:58:00 +0300 Subject: [PATCH 2/4] Update composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 37c1a8b..fcb24d0 100644 --- a/composer.json +++ b/composer.json @@ -13,7 +13,7 @@ "php": ">=7.2", "illuminate/config": "^6.0 || ^7.0 || ^8.0", "illuminate/support": "^6.0 || ^7.0 || ^8.0", - "segmentio/analytics-php": "~1.8.0" + "segmentio/analytics-php": "~2.0.0" }, "require-dev": { "graham-campbell/analyzer": "^2.4 || ^3.0", From ff1ed0dcee21e157cf985c9833330ff31005f149 Mon Sep 17 00:00:00 2001 From: Matan Yadaev Date: Tue, 27 Jul 2021 20:43:32 +0300 Subject: [PATCH 3/4] fix import namespace --- src/SegmentServiceProvider.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SegmentServiceProvider.php b/src/SegmentServiceProvider.php index 7adaf00..867b050 100644 --- a/src/SegmentServiceProvider.php +++ b/src/SegmentServiceProvider.php @@ -16,7 +16,7 @@ use Illuminate\Foundation\Application as LaravelApplication; use Illuminate\Support\ServiceProvider; use Laravel\Lumen\Application as LumenApplication; -use Segment; +use Segment\Segment; /** * This is the segment service provider class. From 784c0eac87d0a5bb9e158b2c62638e2d33a2ca2e Mon Sep 17 00:00:00 2001 From: Matan Yadaev Date: Thu, 5 Aug 2021 11:02:21 +0300 Subject: [PATCH 4/4] support only php >=7.4 --- .github/workflows/tests.yml | 2 +- composer.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 4b03a21..da0b114 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -11,7 +11,7 @@ jobs: strategy: matrix: - php: ['7.2', '7.3', '7.4', '8.0'] + php: ['7.4', '8.0'] laravel: ['6', '7', '8'] exclude: - php: '7.2' diff --git a/composer.json b/composer.json index fcb24d0..b14ed91 100644 --- a/composer.json +++ b/composer.json @@ -10,7 +10,7 @@ } ], "require": { - "php": ">=7.2", + "php": ">=7.4", "illuminate/config": "^6.0 || ^7.0 || ^8.0", "illuminate/support": "^6.0 || ^7.0 || ^8.0", "segmentio/analytics-php": "~2.0.0"