update: twig extension

Author: OxCom

Tests/SymfonyRollbarBundle/Twig/RollbarExtensionTest.php

@@ -41,11 +41,12 @@ public function testRollbarJs($env, $isDisabled)
             $this->assertNotEmpty($list);
 
             $function = $list[0];
-            $this->assertInstanceOf(\Twig_Function::class, $function);
+            $this->assertInstanceOf(\Twig_SimpleFunction::class, $function);
 
             $output = $rollbarTwig->rollbarJs();
             $this->assertContains('_rollbarConfig', $output);
             $this->assertContains('SOME_ROLLBAR_ACCESS_TOKEN_654321', $output);
+            $this->assertContains('_rollbarConfig.rollbarJsUrl', $output);
         }
     }
 
@@ -57,7 +58,7 @@ public function generatorRollbarEnv()
         return [
             // env, is-empty-functions
             ['test', false],
-//            ['test_drb', true],
+            ['test_drb', true],
         ];
     }
 }

Twig/RollbarExtension.php

@@ -2,6 +2,7 @@
 
 namespace SymfonyRollbarBundle\Twig;
 
+use Rollbar\RollbarJsHelper;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use SymfonyRollbarBundle\DependencyInjection\SymfonyRollbarExtension;
 
@@ -43,7 +44,7 @@ public function getFunctions()
         }
 
         return [
-            new \Twig_Function('rollbarJs', [$this, 'rollbarJs']),
+            new \Twig_SimpleFunction('rollbarJs', [$this, 'rollbarJs']),
         ];
     }
 
@@ -52,13 +53,12 @@ public function getFunctions()
      */
     public function rollbarJs()
     {
-        $js = ''; // /vendor/rollbar/rollbar/data/rollbar.snippet.js
-        $script = "<script>var _rollbarConfig = {{config}};\n{{rollbar-snippet}}</script>";
-        $config = $this->config['rollbar_js'];
+        $helper = new RollbarJsHelper($this->config['rollbar_js']);
 
+        $script = "<script>var _rollbarConfig = {{config}};\n{{rollbar-snippet}}</script>";
         $script = strtr($script, [
-            '{{config}}'          => json_encode($config),
-            '{{rollbar-snippet}}' => $js,
+            '{{config}}'          => $helper->configJsTag(),
+            '{{rollbar-snippet}}' => $helper->jsSnippet(),
         ]);
 
         return $script;