Merge pull request aws#74 from GrahamCampbell/patch-1

jeremeamia · jeremeamia · commit 9a966b37d72b · 2015-06-10T12:12:37.000-07:00
Fix lumen support and cleanup config
diff --git a/config/aws.php b/config/aws.php
@@ -1,4 +1,6 @@
-<?php return [
+<?php
+
+return [
 
     /*
     |--------------------------------------------------------------------------
diff --git a/src/AwsServiceProvider.php b/src/AwsServiceProvider.php
@@ -22,13 +22,13 @@ class AwsServiceProvider extends ServiceProvider {
      */
     public function boot()
     {
-        $config = realpath(__DIR__ . '/../config/config.php');
+        $source = realpath(__DIR__ . '/../config/aws.php');
 
-        $this->mergeConfigFrom($config, 'aws');
+        if (class_exists('Illuminate\Foundation\Application', false)) {
+            $this->publishes([$source => config_path('aws.php')]);
+        }
 
-        $this->publishes([
-            $config => $this->app->make('path.config') . DIRECTORY_SEPARATOR . 'aws.php'
-        ], 'config');
+        $this->mergeConfigFrom($source, 'aws');
     }
 
     /**
@@ -39,7 +39,6 @@ public function boot()
     public function register()
     {
         $this->app->singleton('aws', function ($app) {
-            // Retrieve config.
             $config = $app['config']->get('aws');
             if (isset($config['config_file'])) {
                 $config = $config['config_file'];
