From 80200b116728260b105e44e327e2f13d756167fa Mon Sep 17 00:00:00 2001 From: Neil Farrington Date: Mon, 27 Jul 2015 13:18:07 -0700 Subject: [PATCH 1/3] Update composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index deb803e..0e25821 100644 --- a/composer.json +++ b/composer.json @@ -20,7 +20,7 @@ }, "require": { "php": ">=5.4.0", - "illuminate/support": "4.2.*" + "illuminate/support": "5.*" }, "autoload": { "classmap": [ From 6dbbb37e78aa84396e84d63d47abeb1354d1afa2 Mon Sep 17 00:00:00 2001 From: Neil Farrington Date: Mon, 27 Jul 2015 13:55:03 -0700 Subject: [PATCH 2/3] Update XmlServiceProvider.php --- src/Vatsim/Xml/XmlServiceProvider.php | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/Vatsim/Xml/XmlServiceProvider.php b/src/Vatsim/Xml/XmlServiceProvider.php index 3f98a3f..aa95328 100644 --- a/src/Vatsim/Xml/XmlServiceProvider.php +++ b/src/Vatsim/Xml/XmlServiceProvider.php @@ -11,16 +11,6 @@ class XmlServiceProvider extends ServiceProvider { */ protected $defer = false; - /** - * Bootstrap the application events. - * - * @return void - */ - public function boot() - { - $this->package('vatsim/xml'); - } - /** * Register the service provider. * From e6ba353b263442c6e18083cb789f6a25c5798bf2 Mon Sep 17 00:00:00 2001 From: Neil Farrington Date: Sun, 9 Aug 2015 20:21:47 -0400 Subject: [PATCH 3/3] Update XmlServiceProvider.php --- src/Vatsim/Xml/XmlServiceProvider.php | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/src/Vatsim/Xml/XmlServiceProvider.php b/src/Vatsim/Xml/XmlServiceProvider.php index aa95328..2388c0f 100644 --- a/src/Vatsim/Xml/XmlServiceProvider.php +++ b/src/Vatsim/Xml/XmlServiceProvider.php @@ -11,6 +11,18 @@ class XmlServiceProvider extends ServiceProvider { */ protected $defer = false; + /** + * Bootstrap the application events. + * + * @return void + */ + public function boot() + { + $this->publishes([ + __DIR__.'/../../config/config.php' => config_path('vatsim-xml.php') + ]); + } + /** * Register the service provider. * @@ -18,9 +30,13 @@ class XmlServiceProvider extends ServiceProvider { */ 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')); }); }