config bug fixed

add a empty config array to test app
aws · Mar 11, 2013 · 5f6f5ff · 5f6f5ff
1 parent 37dc939
commit 5f6f5ff
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/Aws/Laravel/AwsServiceProvider.php b/src/Aws/Laravel/AwsServiceProvider.php
@@ -35,7 +35,7 @@ public function register()
     {
         $this->app['aws'] = $this->app->share(function ($app) {
             // Instantiate the AWS service builder
-            $config = (isset($app['config']) && isset($app['config']['aws'])) ? $app['config']['aws'] : array();
+            $config = !empty($app['config']['aws']) ? $app['config']['aws'] : array();
             $aws = Aws::factory($config);
 
             // Attach an event listener that will append the Laravel version number in the user agent string

diff --git a/tests/Aws/Laravel/Tests/AwsServiceProviderTest.php b/tests/Aws/Laravel/Tests/AwsServiceProviderTest.php
@@ -64,6 +64,7 @@ public function testNoConfigProvided()
     {
         // Setup the Laravel app and AWS service provider
         $app = new Application();
+		$app['config'] = array();
         $provider = new AwsServiceProvider($app);
         $app->register($provider);
         $provider->boot();