From 385d66439e131bf32ccbfe4ebd1ba93c7b8ac6a2 Mon Sep 17 00:00:00 2001 From: Mike de Vrind Date: Tue, 9 Jun 2015 13:17:26 +0200 Subject: [PATCH 1/4] Update illuminate/support to support Laravel 5 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 5e346385..a7282b61 100644 --- a/composer.json +++ b/composer.json @@ -12,7 +12,7 @@ "require": { "php": ">=5.4.0", "ext-curl": "*", - "illuminate/support": "4.2.*" + "illuminate/support": "5.*" }, "require-dev": { "phpunit/phpunit": "3.7.*" From 66b27ba06b932c0a49b64270bbaa74627f06cb7b Mon Sep 17 00:00:00 2001 From: Mike de Vrind Date: Tue, 9 Jun 2015 13:24:44 +0200 Subject: [PATCH 2/4] Rename config.php to amazon-mws Change the config file name to be more package specific --- src/config/{config.php => amazon-mws} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename src/config/{config.php => amazon-mws} (98%) diff --git a/src/config/config.php b/src/config/amazon-mws similarity index 98% rename from src/config/config.php rename to src/config/amazon-mws index 464fcf06..2f4b6dbd 100644 --- a/src/config/config.php +++ b/src/config/amazon-mws @@ -14,4 +14,4 @@ 'AMAZON_SERVICE_URL' => 'https://mws-eu.amazonservices.com/', 'muteLog' => false -]; \ No newline at end of file +]; From 7a614e75555711d8efadf93903bbb8cac03cf6d6 Mon Sep 17 00:00:00 2001 From: Mike de Vrind Date: Tue, 9 Jun 2015 13:30:32 +0200 Subject: [PATCH 3/4] Update AmazonMwsServiceProvider.php Update the SP for usage in L5 --- src/Creacoon/AmazonMws/AmazonMwsServiceProvider.php | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/Creacoon/AmazonMws/AmazonMwsServiceProvider.php b/src/Creacoon/AmazonMws/AmazonMwsServiceProvider.php index cb0f79c2..fe967901 100644 --- a/src/Creacoon/AmazonMws/AmazonMwsServiceProvider.php +++ b/src/Creacoon/AmazonMws/AmazonMwsServiceProvider.php @@ -19,15 +19,17 @@ class AmazonMwsServiceProvider extends ServiceProvider { */ public function register() { - // + $configPath = __DIR__ . '/../../config/amazon-mws.php'; + $this->mergeConfigFrom($configPath, 'amazon-mws'); + + $this->app->alias('AmazonOrderList', 'Creacoon\AmazonMws\AmazonOrderList'); + $this->app->alias('AmazonOrderItemList', 'Creacoon\AmazonMws\AmazonOrderItemList'); } public function boot() { - $this->package('creacoon/amazon-mws'); - - AliasLoader::getInstance()->alias('AmazonOrderList', 'Creacoon\AmazonMws\AmazonOrderList'); - AliasLoader::getInstance()->alias('AmazonOrderItemList', 'Creacoon\AmazonMws\AmazonOrderItemList'); + $configPath = __DIR__ . '/../../config/amazon-mws.php'; + $this->publishes([$configPath => config_path('amazon-mws.php')], 'config'); } /** From 5a8050e1b07709da515232152a09a27072390632 Mon Sep 17 00:00:00 2001 From: Mike de Vrind Date: Tue, 9 Jun 2015 13:35:18 +0200 Subject: [PATCH 4/4] Update environment.php Trigger Travis --- src/Creacoon/AmazonMws/environment.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Creacoon/AmazonMws/environment.php b/src/Creacoon/AmazonMws/environment.php index 93732d62..ac558cb2 100644 --- a/src/Creacoon/AmazonMws/environment.php +++ b/src/Creacoon/AmazonMws/environment.php @@ -84,4 +84,5 @@ //Getting a Feed $THROTTLE_LIMIT_FEEDRESULT = 15; $THROTTLE_TIME_FEEDRESULT = 60; -?> \ No newline at end of file + +?>