From ae30ca30a421d2839798b326bde261cab1712538 Mon Sep 17 00:00:00 2001
From: David Cramer <dcramer@gmail.com>
Date: Mon, 9 May 2016 09:32:53 -0700
Subject: [PATCH] Expand configuration

- Add release
- Add environment (default to kernel.environment)
- Add app_path
- Add prefixes
---
 composer.json                                  |  2 +-
 examples/symfony-3/Makefile                    |  7 +++++++
 examples/symfony-3/app/config/config.yml       |  1 +
 .../DependencyInjection/Configuration.php      | 18 ++++++++++++++++--
 .../SentryBundle/Resources/config/services.yml |  5 +++++
 5 files changed, 30 insertions(+), 3 deletions(-)
 create mode 100644 examples/symfony-3/Makefile

diff --git a/composer.json b/composer.json
index 954d5cba..ded16ca5 100644
--- a/composer.json
+++ b/composer.json
@@ -13,7 +13,7 @@
     ],
     "require": {
         "php": ">=5.3.3",
-        "sentry/sentry": "0.*",
+        "sentry/sentry": ">=0.17.0",
         "symfony/symfony": ">=2.2.0"
     },
     "require-dev": {
diff --git a/examples/symfony-3/Makefile b/examples/symfony-3/Makefile
new file mode 100644
index 00000000..b486573c
--- /dev/null
+++ b/examples/symfony-3/Makefile
@@ -0,0 +1,7 @@
+symlink-sdk:
+	mkdir -p vendor/sentry
+	rm -rf vendor/sentry/sentry-symfony
+	cd vendor/sentry && ln -sf ../../../.. sentry-symfony
+
+	rm -rf vendor/sentry/sentry
+	cd vendor/sentry && ln -sf ../../../../../sentry-php sentry
diff --git a/examples/symfony-3/app/config/config.yml b/examples/symfony-3/app/config/config.yml
index eb40e546..2072167a 100644
--- a/examples/symfony-3/app/config/config.yml
+++ b/examples/symfony-3/app/config/config.yml
@@ -69,3 +69,4 @@ swiftmailer:
 
 sentry:
     dsn: "https://e9ebbd88548a441288393c457ec90441:399aaee02d454e2ca91351f29bdc3a07@app.getsentry.com/3235"
+    release: "12345678910"
diff --git a/src/Sentry/SentryBundle/DependencyInjection/Configuration.php b/src/Sentry/SentryBundle/DependencyInjection/Configuration.php
index 4b3c77d9..dc55f694 100644
--- a/src/Sentry/SentryBundle/DependencyInjection/Configuration.php
+++ b/src/Sentry/SentryBundle/DependencyInjection/Configuration.php
@@ -22,15 +22,29 @@ public function getConfigTreeBuilder()
 
         $rootNode
             ->children()
-                ->scalarNode('dsn')
-                    ->defaultValue(null)
+                ->scalarNode('app_path')
+                    ->defaultNull()
                 ->end()
                 ->scalarNode('client')
                     ->defaultValue('Raven_Client')
                 ->end()
+                ->scalarNode('environment')
+                    ->defaultValue('%kernel.environment%')
+                ->end()
+                ->scalarNode('dsn')
+                    ->defaultNull()
+                ->end()
                 ->scalarNode('exception_listener')
                     ->defaultValue('Sentry\SentryBundle\EventListener\ExceptionListener')
                 ->end()
+                ->scalarNode('release')
+                    ->defaultNull()
+                ->end()
+                ->arrayNode('prefixes')
+                    ->prototype('scalar')->end()
+                    ->treatNullLike(array())
+                    ->defaultValue(array())
+                ->end()
             ->end()
         ;
 
diff --git a/src/Sentry/SentryBundle/Resources/config/services.yml b/src/Sentry/SentryBundle/Resources/config/services.yml
index 7174c502..1a295d56 100644
--- a/src/Sentry/SentryBundle/Resources/config/services.yml
+++ b/src/Sentry/SentryBundle/Resources/config/services.yml
@@ -2,6 +2,11 @@ services:
     sentry.client:
         class: '%sentry.client%'
         arguments: ['%sentry.dsn%']
+        calls:
+            - [setRelease, ['%sentry.release%']]
+            - [setEnvironment, ['%sentry.environment%']]
+            - [setAppPath, ['%sentry.app_path%']]
+            - [setPrefixes, ['%sentry.prefixes%']]
 
     sentry.exception_listener:
         class: '%sentry.exception_listener%'