Skip to content

Fixed lumen support #91

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 18, 2016
Merged

Fixed lumen support #91

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6643e8e
Fixed lumen support
GrahamCampbell Jan 16, 2016
11fd1a7
Fixed typos
GrahamCampbell Jan 16, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions src/AwsServiceProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
<?php namespace Aws\Laravel;

use Aws\Sdk;
use Illuminate\Foundation\Application as LaravelApplication;
use Illuminate\Support\ServiceProvider;
use Laravel\Lumen\Application as LumenApplication;

/**
* AWS SDK for PHP service provider for Laravel applications
Expand All @@ -26,8 +28,10 @@ public function boot()
{
$source = realpath(__DIR__ . '/../config/aws.php');

if (class_exists('Illuminate\Foundation\Application', false)) {
if ($this->app instanceof LaravelApplication && $this->app->runningInConsole()) {
$this->publishes([$source => config_path('aws.php')]);
} elseif ($this->app instanceof LumenApplication) {
$this->app->configure('aws');
}

$this->mergeConfigFrom($source, 'aws');
Expand All @@ -41,7 +45,8 @@ public function boot()
public function register()
{
$this->app->singleton('aws', function ($app) {
$config = $app['config']->get('aws');
$config = $app->make('config')->get('aws');

return new Sdk($config);
});

Expand Down