From 5b9f2c89609d9ce76a80680fe46f7a9b6627533b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20R=C3=B6hrig?= Date: Tue, 2 Nov 2021 16:43:07 +0100 Subject: [PATCH 1/3] GH-543-backport: Add missing transformer config option Cherry-picked: 4d5c18a819f6fa444b70a57579c92c51fcceefe9 634b55414d566fce10eb8f198c491035c386ed6b --- src/Config.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Config.php b/src/Config.php index f8e890df..39a3fc9a 100644 --- a/src/Config.php +++ b/src/Config.php @@ -65,7 +65,8 @@ class Config 'minimum_level', 'verbose', 'verbose_logger', - 'raise_on_error' + 'raise_on_error', + 'transformer', ); private $accessToken; From 1de44c0779a3945bad94333d356460637015c402 Mon Sep 17 00:00:00 2001 From: Bart Skowron Date: Wed, 3 Nov 2021 01:08:10 +0100 Subject: [PATCH 2/3] Skip `transformer` for defaults (cherry picked from commit 4128f8ed74b5efaec9ee5517cff84849b8e5d0b2) --- tests/DefaultsTest.php | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/DefaultsTest.php b/tests/DefaultsTest.php index 484360a1..b279c015 100644 --- a/tests/DefaultsTest.php +++ b/tests/DefaultsTest.php @@ -275,6 +275,7 @@ public function testDefaultsForConfigOptions() $option == 'person' || $option == 'person_fn' || $option == 'scrub_whitelist' || + $option == 'transformer' || $option == 'proxy' || $option == 'include_raw_request_body' || $option == 'verbose_logger' || From 6b6a1f74586b2fafc11546ea6d92450212c3b8dc Mon Sep 17 00:00:00 2001 From: Bart Skowron Date: Wed, 3 Nov 2021 01:10:25 +0100 Subject: [PATCH 3/3] Keep the options in alphabetical order (cherry picked from commit 92fc44a3d789901a73de2b7b6b3d4aa76f223176) --- tests/DefaultsTest.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/DefaultsTest.php b/tests/DefaultsTest.php index b279c015..d61e3936 100644 --- a/tests/DefaultsTest.php +++ b/tests/DefaultsTest.php @@ -271,15 +271,15 @@ public function testDefaultsForConfigOptions() { foreach (\Rollbar\Config::listOptions() as $option) { if ($option == 'access_token' || + $option == 'include_raw_request_body' || + $option == 'log_payload_logger' || $option == 'logger' || $option == 'person' || $option == 'person_fn' || + $option == 'proxy' || $option == 'scrub_whitelist' || $option == 'transformer' || - $option == 'proxy' || - $option == 'include_raw_request_body' || - $option == 'verbose_logger' || - $option == 'log_payload_logger') { + $option == 'verbose_logger') { continue; } elseif ($option == 'base_api_url') { $option = 'endpoint';