From 264dec610bd4d98b0db0d3ca5f611a1b8a62f76d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristoffer=20H=C3=B6gberg?= Date: Wed, 25 Jan 2017 12:37:31 +0100 Subject: [PATCH 1/2] Allow Laravel 5.4.* in composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 972e0f8..b1038c7 100644 --- a/composer.json +++ b/composer.json @@ -11,7 +11,7 @@ "minimum-stability": "dev", "require": { "php": ">=5.6.4", - "laravel/framework": "5.3.*", + "laravel/framework": "5.3.*|5.4.*", "laravel/scout": "^2.0" }, "autoload": { From 3b97a3b5685cb4b0339fd7e9ad8ea948b500d4f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristoffer=20H=C3=B6gberg?= Date: Sun, 29 Jan 2017 15:24:42 +0100 Subject: [PATCH 2/2] Use DetectsApplicationNamespace, that only exists in Laravel 5.4 --- composer.json | 2 +- src/Services/IndexService.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index b1038c7..95ed7bb 100644 --- a/composer.json +++ b/composer.json @@ -11,7 +11,7 @@ "minimum-stability": "dev", "require": { "php": ">=5.6.4", - "laravel/framework": "5.3.*|5.4.*", + "laravel/framework": "5.4.*", "laravel/scout": "^2.0" }, "autoload": { diff --git a/src/Services/IndexService.php b/src/Services/IndexService.php index 87bf98b..fa625cc 100644 --- a/src/Services/IndexService.php +++ b/src/Services/IndexService.php @@ -2,14 +2,14 @@ namespace DamianTW\MySQLScout\Services; +use Illuminate\Console\DetectsApplicationNamespace; use Laravel\Scout\Searchable; -use Illuminate\Console\AppNamespaceDetectorTrait; use Illuminate\Support\Facades\DB; use DamianTW\MySQLScout\Events; class IndexService { - use AppNamespaceDetectorTrait; + use DetectsApplicationNamespace; protected $modelService;