From b80a9e7aa86d7142f6bc161acc3f242b37ffd413 Mon Sep 17 00:00:00 2001 From: Alessandro Lai Date: Thu, 24 Aug 2017 12:37:58 +0200 Subject: [PATCH] Fix issue with options.error_types discovered in #72 --- CHANGELOG.md | 4 ++++ src/Sentry/SentryBundle/DependencyInjection/Configuration.php | 4 ++-- test/DependencyInjection/SentryExtensionTest.php | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7b93495f..368de8a6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## [Unreleased] +## 0.8.6 - 2017-08-24 +### Fixed + - Fix expected type of the `options.error_types` config value (scalar instead of array, discovered in #72) + ## 0.8.5 - 2017-08-22 ### Fixed - `trim()` DSN value from config, to avoid issues with .env files on BitBucket (see https://github.com/getsentry/sentry-symfony/pull/21#issuecomment-323673938) diff --git a/src/Sentry/SentryBundle/DependencyInjection/Configuration.php b/src/Sentry/SentryBundle/DependencyInjection/Configuration.php index 79baeb90..b50addb0 100644 --- a/src/Sentry/SentryBundle/DependencyInjection/Configuration.php +++ b/src/Sentry/SentryBundle/DependencyInjection/Configuration.php @@ -85,8 +85,8 @@ public function getConfigTreeBuilder() ->scalarNode('curl_ssl_version')->defaultNull()->end() ->scalarNode('trust_x_forwarded_proto')->defaultFalse()->end() ->scalarNode('mb_detect_order')->defaultNull()->end() - ->arrayNode('error_types') - ->prototype('scalar')->end() + ->scalarNode('error_types') + ->defaultNull() ->end() ->scalarNode('app_path')->defaultValue('%kernel.root_dir%/..')->end() ->arrayNode('excluded_app_paths') diff --git a/test/DependencyInjection/SentryExtensionTest.php b/test/DependencyInjection/SentryExtensionTest.php index 27fce421..2f97a629 100644 --- a/test/DependencyInjection/SentryExtensionTest.php +++ b/test/DependencyInjection/SentryExtensionTest.php @@ -557,7 +557,7 @@ public function test_that_it_sets_all_options() 'curl_ssl_version' => 'curl_ssl_version', 'trust_x_forwarded_proto' => true, 'mb_detect_order' => 'mb_detect_order', - 'error_types' => array('error_types1' => 'error_types1'), + 'error_types' => 'E_ALL & ~E_DEPRECATED & ~E_NOTICE', 'app_path' => 'app_path', 'excluded_app_paths' => array('excluded_app_path1', 'excluded_app_path2'), 'prefixes' => array('prefix1', 'prefix2'),