Merge pull request #2 from NFarrington/master

Update for L5.2
VATSIM-UK · Jan 10, 2016 · 4f5f62d · 4f5f62d
2 parents 77e9393 + e6ba353
commit 4f5f62d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/composer.json b/composer.json
@@ -20,7 +20,7 @@
     },
     "require": {
         "php": ">=5.4.0",
-        "illuminate/support": "4.2.*"
+        "illuminate/support": "5.*"
     },
     "autoload": {
         "classmap": [

diff --git a/src/Vatsim/Xml/XmlServiceProvider.php b/src/Vatsim/Xml/XmlServiceProvider.php
@@ -18,7 +18,9 @@ class XmlServiceProvider extends ServiceProvider {
 	 */
 	public function boot()
 	{
-		$this->package('vatsim/xml');
+		$this->publishes([
+			__DIR__.'/../../config/config.php' => config_path('vatsim-xml.php')
+		]);
 	}
 
 	/**
@@ -28,9 +30,13 @@ public function boot()
 	 */
 	public function register()
 	{
+		$this->mergeConfigFrom(
+			__DIR__.'/../../config/config.php', 'vatsimxml'
+		);
+
 		$this->app['vatsimxml'] = $this->app->share(function($app)
 		{
-			return new XML( $app['config']->get('xml::config') );
+			return new XML($app['config']->get('vatsimxml'));
 		});
 	}