Fix CS; update CHANGELOG.md

Author: Jean85

Diff for: CHANGELOG.md

@@ -6,9 +6,13 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## 0.8.4 - 2017-08-08
+### Fixed
+ - Fix exception being thrown when both deprecated and new options are used.
+
 ## 0.8.3 - 2017-08-07
 ### Changed
- - Migrate all the options from the config root to `sentry.options` (#68); the affected options are still usable in the old form, but they will generate deprecation notices. They will be dropped in the 1.0 release.
+ - Migrate all the opions from the config root to `sentry.options` (#68); the affected options are still usable in the old form, but they will generate deprecation notices. They will be dropped in the 1.0 release.
 
 Before:
 ```yaml

Diff for: src/Sentry/SentryBundle/DependencyInjection/SentryExtension.php

@@ -72,7 +72,7 @@ private function checkConfigurationOnForInvalidSettings(array $config, Container
 
             // both are used
             if (
-                $config[$option] !== $default 
+                $config[$option] !== $default
                 && $config['options'][$option] !== $default
                 && $config['options'][$option] !== $config[$option]
             ) {