From d95d252c471915ee2a48a4d27fe5c67adb0f7ca2 Mon Sep 17 00:00:00 2001
From: Mior Muhammad Zaki <crynobone@gmail.com>
Date: Fri, 20 Mar 2020 12:37:46 +0800
Subject: [PATCH] [8.x] mergeConfigFrom() already check if app is running with
 config cached.

https://github.com/illuminate/support/blob/6.x/ServiceProvider.php#L60-L67
---
 src/PassportServiceProvider.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/PassportServiceProvider.php b/src/PassportServiceProvider.php
index 9c81acafb..1f3bd4040 100644
--- a/src/PassportServiceProvider.php
+++ b/src/PassportServiceProvider.php
@@ -87,9 +87,7 @@ protected function registerMigrations()
      */
     public function register()
     {
-        if (! $this->app->configurationIsCached()) {
-            $this->mergeConfigFrom(__DIR__.'/../config/passport.php', 'passport');
-        }
+        $this->mergeConfigFrom(__DIR__.'/../config/passport.php', 'passport');
 
         $this->registerAuthorizationServer();
         $this->registerResourceServer();