composer update

2018-12-05 10:50:52 +05:30
parent 9eabcacfa7
commit 4addd1e9c6
3328 changed files with 156676 additions and 138988 deletions
--- a/vendor/torann/geoip/src/GeoIPServiceProvider.php
+++ b/vendor/torann/geoip/src/GeoIPServiceProvider.php
@@ -19,6 +19,10 @@ class GeoIPServiceProvider extends ServiceProvider
            $this->registerResources();
            $this->registerGeoIpCommands();
        }
+
+        if ($this->isLumen() === false) {
+            $this->mergeConfigFrom(__DIR__ . '/../config/geoip.php', 'geoip');
+        }
    }

    /**
@@ -72,4 +76,4 @@ class GeoIPServiceProvider extends ServiceProvider
    {
        return str_contains($this->app->version(), 'Lumen') === true;
    }
-}
+}