Skip to content

Commit 948617d

Browse files
authored
Merge pull request #119 from acidjazz/master
Allows for default package configuration
2 parents b2ed170 + 8118fda commit 948617d

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

src/GeoIPServiceProvider.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@ public function register()
1919
$this->registerResources();
2020
$this->registerGeoIpCommands();
2121
}
22+
23+
if ($this->isLumen() === false) {
24+
$this->mergeConfigFrom(__DIR__ . '/../config/geoip.php', 'geoip');
25+
}
2226
}
2327

2428
/**
@@ -72,4 +76,4 @@ protected function isLumen()
7276
{
7377
return str_contains($this->app->version(), 'Lumen') === true;
7478
}
75-
}
79+
}

0 commit comments

Comments
 (0)