added logic to utilize passed vs assigned chart element ids

src/Symfony/Bundle/Twig/LavachartsExtension.php

@@ -7,13 +7,6 @@
 
 class LavachartsExtension extends \Twig_Extension
 {
-    /**
-     * Twig Extension Name
-     *
-     * @var string
-     */
-    const NAME = 'lavacharts_twig_extension';
-
     /**
      * The Lavacharts object passed in from the service container.
      *
@@ -32,9 +25,16 @@ public function __construct(Lavacharts $lava)
     }
 
     /**
-     * Add Twig functions as short-cut methods to the rendering methods.
+     * Add Twig functions to utilize Lavacharts from the container.
+     *
+     * To render, just use the lowercase name of the chart:
+     * and pass through the raw filter.
+     *
+     * Example:
+     *  {{ linechart('Stocks")|raw }}
+     *
      *
-     * @return array
+     * @return array Array of twig functions
      */
     public function getFunctions()
     {
@@ -44,33 +44,28 @@ public function getFunctions()
 
         foreach ($renderables as $renderable) {
             $renderFunctions[] = new \Twig_SimpleFunction(strtolower($renderable),
-                function($label, $elementId) use ($renderable) {
-                    return $this->renderChart($renderable, $label, $elementId);
+                function($label) use ($renderable) {
+                    try {
+                        $elementId = func_get_arg(1);
+
+                        return $this->lava->render($renderable, $label, $elementId);
+                    } catch (\Exception $e) {
+                        return $this->lava->render($renderable, $label);
+                    }
                 }
             );
         }
 
         return $renderFunctions;
     }
 
-    /**
-     * @param string $type
-     * @param string $label
-     * @param string $elementId
-     * @return string
-     */
-    public function renderChart($type, $label, $elementId)
-    {
-        return $this->lava->render($type, $label, $elementId);
-    }
-
     /**
      * Returns the name of the Lavacharts Twig Extension
      *
      * @return string
      */
     public function getName()
     {
-        return self::NAME;
+        return 'lavacharts_twig_extension';
     }
 }