New library loader

cmen · Nov 13, 2016 · 465e8ca · 465e8ca
1 parent 1b0c614
commit 465e8ca
Show file tree

Hide file tree

Showing 31 changed files with 33 additions and 248 deletions.
diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -22,7 +22,7 @@ public function getConfigTreeBuilder()
 
         $rootNode
             ->children()
-                ->scalarNode('version')->defaultValue('1')->end()
+                ->scalarNode('version')->defaultValue('current')->end()
                 ->scalarNode('language')->defaultValue('')->end()
             ->end()
         ;

diff --git a/GoogleCharts/Chart.php b/GoogleCharts/Chart.php
@@ -76,13 +76,6 @@ public function getOptionsName()
      */
     abstract protected function getType();
 
-    /**
-     * Returns library used by chart.
-     *
-     * @return string
-     */
-    abstract protected function getLibrary();
-
     /**
      * Returns the chart package.
      *
@@ -117,7 +110,7 @@ public function startDraw()
             throw new GoogleChartsException('Container is not defined.');
         }
 
-        $js = 'var ' . $this->getName() . ' = new google.' . $this->getLibrary() . '.' . $this->getType() .
+        $js = 'var ' . $this->getName() . ' = new google.visualization.' . $this->getType() .
             '(document.getElementById("' . $this->elementID . '"));';
 
         if (!$this instanceof DiffChart) {

diff --git a/GoogleCharts/Charts/AnnotationChart.php b/GoogleCharts/Charts/AnnotationChart.php
@@ -32,14 +32,6 @@ protected function getType()
         return 'AnnotationChart';
     }
 
-    /**
-     * @inheritdoc
-     */
-    protected function getLibrary()
-    {
-        return 'visualization';
-    }
-
     /**
      * @inheritdoc
      */

diff --git a/GoogleCharts/Charts/AreaChart.php b/GoogleCharts/Charts/AreaChart.php
@@ -34,16 +34,6 @@ protected function getType()
         return 'AreaChart';
     }
 
-    /**
-     * Returns library used by chart.
-     *
-     * @return string
-     */
-    protected function getLibrary()
-    {
-        return 'visualization';
-    }
-
     /**
      * Returns the chart package.
      *

diff --git a/GoogleCharts/Charts/BarChart.php b/GoogleCharts/Charts/BarChart.php
@@ -32,14 +32,6 @@ protected function getType()
         return 'BarChart';
     }
 
-    /**
-     * @inheritdoc
-     */
-    protected function getLibrary()
-    {
-        return 'visualization';
-    }
-
     /**
      * @inheritdoc
      */

diff --git a/GoogleCharts/Charts/BubbleChart.php b/GoogleCharts/Charts/BubbleChart.php
@@ -32,14 +32,6 @@ protected function getType()
         return 'BubbleChart';
     }
 
-    /**
-     * @inheritdoc
-     */
-    protected function getLibrary()
-    {
-        return 'visualization';
-    }
-
     /**
      * @inheritdoc
      */

diff --git a/GoogleCharts/Charts/CalendarChart.php b/GoogleCharts/Charts/CalendarChart.php
@@ -32,14 +32,6 @@ protected function getType()
         return 'Calendar';
     }
 
-    /**
-     * @inheritdoc
-     */
-    protected function getLibrary()
-    {
-        return 'visualization';
-    }
-
     /**
      * @inheritdoc
      */

diff --git a/GoogleCharts/Charts/CandlestickChart.php b/GoogleCharts/Charts/CandlestickChart.php
@@ -32,14 +32,6 @@ protected function getType()
         return 'CandlestickChart';
     }
 
-    /**
-     * @inheritdoc
-     */
-    protected function getLibrary()
-    {
-        return 'visualization';
-    }
-
     /**
      * @inheritdoc
      */

diff --git a/GoogleCharts/Charts/ColumnChart.php b/GoogleCharts/Charts/ColumnChart.php
@@ -32,14 +32,6 @@ protected function getType()
         return 'ColumnChart';
     }
 
-    /**
-     * @inheritdoc
-     */
-    protected function getLibrary()
-    {
-        return 'visualization';
-    }
-
     /**
      * @inheritdoc
      */

diff --git a/GoogleCharts/Charts/ComboChart.php b/GoogleCharts/Charts/ComboChart.php
@@ -32,14 +32,6 @@ protected function getType()
         return 'ComboChart';
     }
 
-    /**
-     * @inheritdoc
-     */
-    protected function getLibrary()
-    {
-        return 'visualization';
-    }
-
     /**
      * @inheritdoc
      */

diff --git a/GoogleCharts/Charts/GanttChart.php b/GoogleCharts/Charts/GanttChart.php
@@ -29,15 +29,7 @@ public function __construct()
      */
     protected function getType()
     {
-        return 'GanttChart';
-    }
-
-    /**
-     * @inheritdoc
-     */
-    protected function getLibrary()
-    {
-        return 'visualization';
+        return 'Gantt';
     }
 
     /**

diff --git a/GoogleCharts/Charts/GaugeChart.php b/GoogleCharts/Charts/GaugeChart.php
@@ -32,14 +32,6 @@ protected function getType()
         return 'Gauge';
     }
 
-    /**
-     * @inheritdoc
-     */
-    protected function getLibrary()
-    {
-        return 'visualization';
-    }
-
     /**
      * @inheritdoc
      */

diff --git a/GoogleCharts/Charts/GeoChart.php b/GoogleCharts/Charts/GeoChart.php
@@ -32,14 +32,6 @@ protected function getType()
         return 'GeoChart';
     }
 
-    /**
-     * @inheritdoc
-     */
-    protected function getLibrary()
-    {
-        return 'visualization';
-    }
-
     /**
      * @inheritdoc
      */

diff --git a/GoogleCharts/Charts/Histogram.php b/GoogleCharts/Charts/Histogram.php
@@ -32,14 +32,6 @@ protected function getType()
         return 'Histogram';
     }
 
-    /**
-     * @inheritdoc
-     */
-    protected function getLibrary()
-    {
-        return 'visualization';
-    }
-
     /**
      * @inheritdoc
      */

diff --git a/GoogleCharts/Charts/LineChart.php b/GoogleCharts/Charts/LineChart.php
@@ -32,14 +32,6 @@ protected function getType()
         return 'LineChart';
     }
 
-    /**
-     * @inheritdoc
-     */
-    protected function getLibrary()
-    {
-        return 'visualization';
-    }
-
     /**
      * @inheritdoc
      */

diff --git a/GoogleCharts/Charts/Map.php b/GoogleCharts/Charts/Map.php
@@ -34,16 +34,6 @@ protected function getType()
         return 'Map';
     }
 
-    /**
-     * Returns library used by chart.
-     *
-     * @return string
-     */
-    protected function getLibrary()
-    {
-        return 'visualization';
-    }
-
     /**
      * Returns the chart package.
      *

diff --git a/GoogleCharts/Charts/OrgChart.php b/GoogleCharts/Charts/OrgChart.php
@@ -34,16 +34,6 @@ protected function getType()
         return 'OrgChart';
     }
 
-    /**
-     * Returns library used by chart.
-     *
-     * @return string
-     */
-    protected function getLibrary()
-    {
-        return 'visualization';
-    }
-
     /**
      * Returns the chart package.
      *

diff --git a/GoogleCharts/Charts/PieChart.php b/GoogleCharts/Charts/PieChart.php
@@ -32,14 +32,6 @@ protected function getType()
         return 'PieChart';
     }
 
-    /**
-     * @inheritdoc
-     */
-    protected function getLibrary()
-    {
-        return 'visualization';
-    }
-
     /**
      * @inheritdoc
      */

diff --git a/GoogleCharts/Charts/SankeyDiagram.php b/GoogleCharts/Charts/SankeyDiagram.php
@@ -34,16 +34,6 @@ protected function getType()
         return 'Sankey';
     }
 
-    /**
-     * Returns library used by chart.
-     *
-     * @return string
-     */
-    protected function getLibrary()
-    {
-        return 'visualization';
-    }
-
     /**
      * Returns the chart package.
      *

diff --git a/GoogleCharts/Charts/ScatterChart.php b/GoogleCharts/Charts/ScatterChart.php
@@ -32,14 +32,6 @@ protected function getType()
         return 'ScatterChart';
     }
 
-    /**
-     * @inheritdoc
-     */
-    protected function getLibrary()
-    {
-        return 'visualization';
-    }
-
     /**
      * @inheritdoc
      */

diff --git a/GoogleCharts/Charts/SteppedAreaChart.php b/GoogleCharts/Charts/SteppedAreaChart.php
@@ -34,16 +34,6 @@ protected function getType()
         return 'SteppedAreaChart';
     }
 
-    /**
-     * Returns library used by chart.
-     *
-     * @return string
-     */
-    protected function getLibrary()
-    {
-        return 'visualization';
-    }
-
     /**
      * Returns the chart package.
      *

diff --git a/GoogleCharts/Charts/TableChart.php b/GoogleCharts/Charts/TableChart.php
@@ -32,14 +32,6 @@ protected function getType()
         return 'Table';
     }
 
-    /**
-     * @inheritdoc
-     */
-    protected function getLibrary()
-    {
-        return 'visualization';
-    }
-
     /**
      * @inheritdoc
      */

diff --git a/GoogleCharts/Charts/Timeline.php b/GoogleCharts/Charts/Timeline.php
@@ -32,14 +32,6 @@ protected function getType()
         return 'Timeline';
     }
 
-    /**
-     * @inheritdoc
-     */
-    protected function getLibrary()
-    {
-        return 'visualization';
-    }
-
     /**
      * @inheritdoc
      */

diff --git a/GoogleCharts/Charts/TreeMapChart.php b/GoogleCharts/Charts/TreeMapChart.php
@@ -32,14 +32,6 @@ protected function getType()
         return 'TreeMap';
     }
 
-    /**
-     * @inheritdoc
-     */
-    protected function getLibrary()
-    {
-        return 'visualization';
-    }
-
     /**
      * @inheritdoc
      */

diff --git a/GoogleCharts/Charts/WordTree.php b/GoogleCharts/Charts/WordTree.php
@@ -32,14 +32,6 @@ protected function getType()
         return 'WordTree';
     }
 
-    /**
-     * @inheritdoc
-     */
-    protected function getLibrary()
-    {
-        return 'visualization';
-    }
-
     /**
      * @inheritdoc
      */