Merge pull request #459 from vilius-g/js-config-encode

Fix incorrect array encoding in config produced by RollbarJsHelper
rollbar · Jan 17, 2023 · 4897fa2 · 4897fa2
2 parents 21b1754 + 12fd960
commit 4897fa2
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 7 deletions.
diff --git a/src/RollbarJsHelper.php b/src/RollbarJsHelper.php
@@ -61,7 +61,7 @@ public function addJs($headers = null, $nonce = null, $customJs = "")
      */
     public function configJsTag()
     {
-        return "var _rollbarConfig = " . json_encode($this->config, JSON_FORCE_OBJECT) . ";";
+        return "var _rollbarConfig = " . json_encode((object)$this->config) . ";";
     }
 
     /**

diff --git a/tests/JsHelperTest.php b/tests/JsHelperTest.php
@@ -226,13 +226,11 @@ public function scriptTagProvider()
         );
     }
 
-    public function testConfigJsTag()
+    /**
+     * @dataProvider configJsTagProvider
+     */
+    public function testConfigJsTag($config, $expectedJson)
     {
-        $config = array(
-            'config1' => 'value 1'
-        );
-
-        $expectedJson = json_encode($config);
         $expected = "var _rollbarConfig = $expectedJson;";
 
         $helper = new RollbarJsHelper($config);
@@ -241,6 +239,18 @@ public function testConfigJsTag()
         $this->assertEquals($expected, $result);
     }
 
+    public function configJsTagProvider()
+    {
+        return array(
+            array(array(), '{}'),
+            array(array('config1' => 'value 1'), '{"config1":"value 1"}'),
+            array(
+                array('hostBlackList' => array('example.com', 'badhost.com')),
+                '{"hostBlackList":["example.com","badhost.com"]}'
+            ),
+        );
+    }
+
     /**
      * @dataProvider addJsProvider
      */
-Original file line number
+Diff line change
@@ Expand Up @@
          */
         public function configJsTag()
         {
-            return "var _rollbarConfig = " . json_encode($this->config, JSON_FORCE_OBJECT) . ";";
+            return "var _rollbarConfig = " . json_encode((object)$this->config) . ";";
         }
         /**
@@ Expand Down @@