formating and updated service provider to match laravel documentation

Author: pulkitjalan

src/Console/UpdateCommand.php

@@ -40,14 +40,12 @@ public function __construct(array $config)
 
     /**
      * Execute the console command.
-     *
-     * @return void
      */
     public function fire()
     {
         $result = $this->geoIPUpdater->update();
 
-        if (! $result) {
+        if (!$result) {
             $this->error('Update failed!');
 
             return;

src/Drivers/AbstractGeoIPDriver.php

@@ -37,16 +37,16 @@ abstract public function get($ip);
 
     /**
      * Get the raw GeoIP info from the driver.
-     * 
-     * @param  string $ip
-     * 
+     *
+     * @param string $ip
+     *
      * @return mixed
      */
     abstract public function getRaw($ip);
 
     /**
-     * Get the default values (all null)
-     * 
+     * Get the default values (all null).
+     *
      * @return array
      */
     protected function getDefault()

src/Drivers/FreeGeoIPDriver.php

@@ -34,9 +34,9 @@ public function get($ip)
 
     /**
      * Get the raw GeoIP info using freegeoip.
-     * 
-     * @param  string $ip
-     * 
+     *
+     * @param string $ip
+     *
      * @return array
      */
     public function getRaw($ip)
@@ -45,7 +45,7 @@ public function getRaw($ip)
     }
 
     /**
-     * Get the freegeoip url
+     * Get the freegeoip url.
      *
      * @param string $ip
      *

src/Drivers/IPApiDriver.php

@@ -34,9 +34,9 @@ public function get($ip)
 
     /**
      * Get the raw GeoIP info using ip-api.
-     * 
-     * @param  string $ip
-     * 
+     *
+     * @param string $ip
+     *
      * @return array
      */
     public function getRaw($ip)

src/Drivers/MaxmindDriver.php

@@ -55,9 +55,9 @@ public function get($ip)
 
     /**
      * Get the raw GeoIP info using Maxmind.
-     * 
-     * @param  string $ip
-     * 
+     *
+     * @param string $ip
+     *
      * @return mixed
      */
     public function getRaw($ip)
@@ -106,7 +106,7 @@ protected function createWebClient()
         $licenseKey = array_get($this->config, 'license_key', false);
 
         // check and make sure they are set
-        if (! $userId || ! $licenseKey) {
+        if (!$userId || !$licenseKey) {
             throw new InvalidCredentialsException();
         }
 
@@ -125,7 +125,7 @@ protected function createDatabase()
         $database = array_get($this->config, 'database', false);
 
         // check if file exists first
-        if (! $database || ! file_exists($database)) {
+        if (!$database || !file_exists($database)) {
             throw new InvalidCredentialsException();
         }
 

src/Drivers/TelizeDriver.php

@@ -14,7 +14,7 @@ public function __construct(array $config)
     {
         parent::__construct($config);
 
-        if (! array_get($this->config, 'key')) {
+        if (!array_get($this->config, 'key')) {
             throw new InvalidCredentialsException();
         }
     }
@@ -49,9 +49,9 @@ public function get($ip)
 
     /**
      * Get the raw GeoIP info using telize.
-     * 
-     * @param  string $ip
-     * 
+     *
+     * @param string $ip
+     *
      * @return array
      */
     public function getRaw($ip)

src/GeoIP.php

@@ -56,6 +56,7 @@ public function getDriver()
      * @var string
      *
      * @param string $ip
+     *
      * @return GeoIP
      */
     public function setIp($ip)
@@ -72,7 +73,7 @@ public function setIp($ip)
      */
     public function getIp()
     {
-        if (! $this->ip) {
+        if (!$this->ip) {
             if ($this->random) {
                 $this->ip = long2ip(mt_rand());
             } else {
@@ -100,7 +101,7 @@ public function get($property = '')
     {
         $data = $this->getData();
 
-        if (! $property) {
+        if (!$property) {
             return $data;
         }
 
@@ -122,7 +123,7 @@ public function getRaw()
         // check ip in memory
         $data = array_get($this->storeRaw, $ip);
 
-        if (! $data) {
+        if (!$data) {
             try {
                 $data = $this->getDriver()->getRaw($ip);
             } catch (\Exception $e) {
@@ -151,7 +152,7 @@ protected function getData()
         // check ip in memory
         $data = array_get($this->store, $ip);
 
-        if (! $data) {
+        if (!$data) {
             try {
                 $data = $this->getDriver()->get($ip);
             } catch (\Exception $e) {

src/GeoIPManager.php

@@ -34,7 +34,7 @@ public function getDriver($driver = null)
 
         $method = 'create'.ucfirst(camel_case($driver)).'Driver';
 
-        if (! method_exists($this, $method)) {
+        if (!method_exists($this, $method)) {
             throw new InvalidDriverException(sprintf('Driver [%s] not supported.', $driver));
         }
 

src/GeoIPServiceProvider.php

@@ -19,10 +19,14 @@ class GeoIPServiceProvider extends ServiceProvider
      */
     public function boot()
     {
-        $this->app['PulkitJalan\GeoIP\GeoIP'] = function ($app) {
-            return $app['geoip'];
+        $this->app['geoip'] = function ($app) {
+            return $app['PulkitJalan\GeoIP\GeoIP'];
         };
 
+        if ($this->app->runningInConsole()) {
+            $this->commands(['PulkitJalan\GeoIP\Console\UpdateCommand']);
+        }
+
         if (function_exists('config_path')) {
             $this->publishes([
                 __DIR__.'/config/config.php' => config_path('geoip.php'),
@@ -32,8 +36,6 @@ public function boot()
 
     /**
      * Register the service provider.
-     *
-     * @return void
      */
     public function register()
     {
@@ -46,28 +48,22 @@ public function register()
 
     /**
      * Register the main geoip wrapper.
-     *
-     * @return void
      */
     protected function registerGeoIP()
     {
-        $this->app->singleton('geoip', function() {
-            return new GeoIP(config('geoip'));
+        $this->app->singleton('PulkitJalan\GeoIP\GeoIP', function ($app) {
+            return new GeoIP($app['config']['geoip']);
         });
     }
 
     /**
      * Register the geoip update console command.
-     *
-     * @return void
      */
     protected function registerUpdateCommand()
     {
-        $this->app->singleton('geoip', function() {
-            return new UpdateCommand(config('geoip'));
+        $this->app->singleton('PulkitJalan\GeoIP\Console\UpdateCommand', function ($app) {
+            return new UpdateCommand($app['config']['geoip']);
         });
-
-        $this->commands(['command.geoip.update']);
     }
 
     /**
@@ -77,6 +73,10 @@ protected function registerUpdateCommand()
      */
     public function provides()
     {
-        return ['geoip', 'command.geoip.update', 'PulkitJalan\GeoIP\GeoIP'];
+        return [
+            'PulkitJalan\GeoIP\GeoIP',
+            'PulkitJalan\GeoIP\Console\UpdateCommand',
+            'geoip',
+        ];
     }
 }

src/GeoIPUpdater.php

@@ -52,7 +52,7 @@ protected function updateMaxmindDatabase()
 
         $database = array_get($this->config, 'maxmind.database', false);
 
-        if (! file_exists($dir = pathinfo($database, PATHINFO_DIRNAME))) {
+        if (!file_exists($dir = pathinfo($database, PATHINFO_DIRNAME))) {
             mkdir($dir, 0777, true);
         }