Skip to content

Allow overriding abstract type Sentry is bound to in service container. #39

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
Dec 9, 2016
Merged

Allow overriding abstract type Sentry is bound to in service container. #39

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b2a8604
Allow overriding abstract type Sentry is bound to in service container.
Nov 30, 2016
c87af10
Also use custom abstract type as config file name (and L4 package nam…
Nov 30, 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
28 changes: 17 additions & 11 deletions src/Sentry/SentryLaravel/SentryLaravelServiceProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,17 @@

namespace Sentry\SentryLaravel;

use Log;
use Illuminate\Support\ServiceProvider;

class SentryLaravelServiceProvider extends ServiceProvider
{
/**
* Abstract type to bind Sentry as in the Service Container.
*
* @var string
*/
public static $abstract = 'sentry';

/**
* Indicates if loading of the provider is deferred.
*
Expand All @@ -25,21 +31,21 @@ public function boot()

// Laravel 4.x compatibility
if (version_compare($app::VERSION, '5.0') < 0) {
$this->package('sentry/sentry-laravel', 'sentry');
$this->package('sentry/sentry-laravel', static::$abstract);

$app->error(function (\Exception $e) use ($app) {
$app['sentry']->captureException($e);
$app[static::$abstract]->captureException($e);
});

$app->fatal(function ($e) use ($app) {
$app['sentry']->captureException($e);
$app[static::$abstract]->captureException($e);
});

$this->bindEvents($app);
} else {
// the default configuration file
$this->publishes(array(
__DIR__ . '/config.php' => config_path('sentry.php'),
__DIR__ . '/config.php' => config_path(static::$abstract . '.php'),
), 'config');

$this->bindEvents($app);
Expand All @@ -48,7 +54,7 @@ public function boot()

protected function bindEvents($app)
{
$handler = new SentryLaravelEventHandler($app['sentry'], $app['sentry.config']);
$handler = new SentryLaravelEventHandler($app[static::$abstract], $app[static::$abstract . '.config']);
$handler->subscribe($app->events);
}

Expand All @@ -59,9 +65,9 @@ protected function bindEvents($app)
*/
public function register()
{
$this->app->singleton('sentry.config', function ($app) {
$this->app->singleton(static::$abstract . '.config', function ($app) {
// sentry::config is Laravel 4.x
$user_config = $app['config']['sentry'] ?: $app['config']['sentry::config'];
$user_config = $app['config'][static::$abstract] ?: $app['config'][static::$abstract . '::config'];

// Make sure we don't crash when we did not publish the config file
if (is_null($user_config)) {
Expand All @@ -71,8 +77,8 @@ public function register()
return $user_config;
});

$this->app->singleton('sentry', function ($app) {
$user_config = $app['sentry.config'];
$this->app->singleton(static::$abstract, function ($app) {
$user_config = $app[static::$abstract . '.config'];

$client = SentryLaravel::getClient(array_merge(array(
'environment' => $app->environment(),
Expand Down Expand Up @@ -102,6 +108,6 @@ public function register()
*/
public function provides()
{
return array('sentry');
return array(static::$abstract);
}
}