Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
magnusboye committed Aug 25, 2020
2 parents a6dbce0 + 0a4cde6 commit 5c3a317
Showing 1 changed file with 10 additions and 8 deletions.
18 changes: 10 additions & 8 deletions src/WeatherServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,19 @@
class WeatherServiceProvider extends ServiceProvider {

public function boot() {

$this->publishes(
[
__DIR__ . '/../config/weather.php' => config_path('weather.php')
],
'weather-config'
);
if ($this->app->runningInConsole()) {
$this->publishes(
[
__DIR__ . '/../config/weather.php' => config_path('weather.php')
],
'weather-config'
);
}
}

public function register() {
$this->mergeConfigFrom(__DIR__ . '/../config/weather.php', 'weather');
$this->registerFacades();
}

/**
Expand All @@ -32,4 +34,4 @@ function ($app) {
return new Weather();
});
}
}
}

0 comments on commit 5c3a317

Please sign in to comment.