composer/php-json-rpc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

fix bug

Browse Source
This commit is contained in:
dongwei 2019-03-18 18:08:23 +08:00
parent 4daf42ffd4
commit ee2cdf45a3
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/Providers/BaseServiceProvider.php
View File

@ -29,14 +29,16 @@ class BaseServiceProvider extends ServiceProvider
protected function setupConfig()
{
$source = realpath(__DIR__ . '/../../config/rpc.php');
if ($this->app instanceof LaravelApplication && $this->app->runningInConsole()) {
$this->publishes([$source => config_path('rpc.php')], 'rpc');
} elseif ($this->app instanceof LumenApplication) {
$this->app->configure('rpc');
}
$this->app->configure('rpc');
// if ($this->app instanceof LaravelApplication && $this->app->runningInConsole()) {
// $this->publishes([$source => config_path('rpc.php')], 'rpc');
// } elseif ($this->app instanceof LumenApplication) {
// $this->app->configure('rpc');
// }
// var_dump($this->app instanceof LumenApplication); // false
// exit();
$this->mergeConfigFrom($source, 'rpc');
}
public function register()