Merge pull request #1205 from crynobone/patch-2

[8.x] mergeConfigFrom() already check if app is running with config cached.
laravel · Mar 20, 2020 · efae7be · efae7be
2 parents 4088cdf + d95d252
commit efae7be
Showing 1 changed file with 1 addition and 3 deletions.
diff --git 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();