diff --git a/composer.json b/composer.json index 16fc839..2737a04 100644 --- a/composer.json +++ b/composer.json @@ -2,11 +2,15 @@ "name": "scriptixru/sypexgeo", "description": "Supports GeoIP services (sypexgeo.net).", "keywords": ["laravel", "laravel 5", "geoip", "location", "geolocation"], - "license": "BSD 2-Clause", + "license": "BSD-2-Clause", "authors": [ { "name": "Varchak Valery", "email": "scriptixru@gmail.com" + }, + { + "name": "Vitaly Baev", + "email": "hello@vitalybaev.ru" } ], "require": { @@ -16,10 +20,5 @@ "psr-4": { "Scriptixru\\SypexGeo\\": "src/Scriptixru/SypexGeo" } - }, - "extra": { - "branch-alias": { - "dev-master": "0.2-dev" - } } } \ No newline at end of file diff --git a/src/Scriptixru/SypexGeo/SypexGeoServiceProvider.php b/src/Scriptixru/SypexGeo/SypexGeoServiceProvider.php index 5fe6cf9..a8717fc 100644 --- a/src/Scriptixru/SypexGeo/SypexGeoServiceProvider.php +++ b/src/Scriptixru/SypexGeo/SypexGeoServiceProvider.php @@ -31,13 +31,12 @@ public function boot() public function register() { // Register providers. - $this->app['sypexgeo'] = $this->app->share(function($app) - { + $this->app->singleton('sypexgeo', function ($app) { $sypexConfig = $app['config']; $sypexConfigType = $sypexConfig->get('sypexgeo.sypexgeo.type', array()); $sypexConfigPath = $sypexConfig->get('sypexgeo.sypexgeo.path', array()); - switch ($sypexConfigType){ + switch ($sypexConfigType){ case ('database'): $sypexConfigFile = $sypexConfig->get('sypexgeo.sypexgeo.file', array()); $sxgeo = new SxGeo(base_path().$sypexConfigPath.$sypexConfigFile); @@ -51,11 +50,8 @@ public function register() $sxgeo = new SxGeo(base_path().$sypexConfigPath.$sypexConfigFile); } - //return new GeoIP($app['config'], $app["session.store"]); - - return new SypexGeo($sxgeo, $app['config']); - }); + }); } /**