Merge pull request #36 from cmen/sf5

Compatibility with Symfony 5
cmen · Nov 26, 2019 · 350b39d · 350b39d
2 parents b07b234 + da86da3
commit 350b39d
Show file tree

Hide file tree

Showing 27 changed files with 41 additions and 56 deletions.
diff --git a/DependencyInjection/CMENGoogleChartsExtension.php b/DependencyInjection/CMENGoogleChartsExtension.php
@@ -2,10 +2,10 @@
 
 namespace CMEN\GoogleChartsBundle\DependencyInjection;
 
-use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\Config\FileLocator;
-use Symfony\Component\HttpKernel\DependencyInjection\Extension;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Loader;
+use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 
 class CMENGoogleChartsExtension extends Extension
 {

diff --git a/GoogleCharts/Events.php b/GoogleCharts/Events.php
@@ -21,8 +21,6 @@ class Events
 
     /**
      * Events constructor.
-     *
-     * @param Chart $chart
      */
     public function __construct(Chart $chart)
     {

diff --git a/GoogleCharts/Options/BarChart/BarChartOptions.php b/GoogleCharts/Options/BarChart/BarChartOptions.php
@@ -3,17 +3,17 @@
 namespace CMEN\GoogleChartsBundle\GoogleCharts\Options\BarChart;
 
 use CMEN\GoogleChartsBundle\GoogleCharts\Options\AdvancedAnimation;
+use CMEN\GoogleChartsBundle\GoogleCharts\Options\AdvancedAnnotations;
 use CMEN\GoogleChartsBundle\GoogleCharts\Options\AdvancedChartOptions;
+use CMEN\GoogleChartsBundle\GoogleCharts\Options\AdvancedLegend;
 use CMEN\GoogleChartsBundle\GoogleCharts\Options\AdvancedTooltip;
 use CMEN\GoogleChartsBundle\GoogleCharts\Options\Bar;
 use CMEN\GoogleChartsBundle\GoogleCharts\Options\DataOpacityTrait;
 use CMEN\GoogleChartsBundle\GoogleCharts\Options\Explorer;
-use CMEN\GoogleChartsBundle\GoogleCharts\Options\AdvancedLegend;
 use CMEN\GoogleChartsBundle\GoogleCharts\Options\FocusTargetTrait;
 use CMEN\GoogleChartsBundle\GoogleCharts\Options\HAxis;
 use CMEN\GoogleChartsBundle\GoogleCharts\Options\IsStackedTrait;
 use CMEN\GoogleChartsBundle\GoogleCharts\Options\MediumHAxis;
-use CMEN\GoogleChartsBundle\GoogleCharts\Options\AdvancedAnnotations;
 use CMEN\GoogleChartsBundle\GoogleCharts\Options\OrientationTrait;
 use CMEN\GoogleChartsBundle\GoogleCharts\Options\ReverseCategoriesTrait;
 use CMEN\GoogleChartsBundle\GoogleCharts\Options\Trendlines;

diff --git a/Output/AbstractChartOutput.php b/Output/AbstractChartOutput.php
@@ -59,9 +59,7 @@ public function setLanguage($language)
     protected function checkElementsId(array $charts, array $elementsID)
     {
         if (count($charts) != count($elementsID)) {
-            throw new GoogleChartsException(
-                'Array charts and array HTML elements ID do not have the same number of element.'
-            );
+            throw new GoogleChartsException('Array charts and array HTML elements ID do not have the same number of element.');
         }
 
         foreach ($elementsID as $elementId) {

diff --git a/Output/ChartOutputInterface.php b/Output/ChartOutputInterface.php
@@ -13,8 +13,6 @@ interface ChartOutputInterface
     /**
      * Returns a string to draw the beginning of the chart (Declaration, data and options).
      *
-     * @param Chart $chart
-     *
      * @return string
      *
      * @throws GoogleChartsException
@@ -24,8 +22,6 @@ public function startChart(Chart $chart);
     /**
      * Returns a string to draw the end of the chart (Events and drawing).
      *
-     * @param Chart $chart
-     *
      * @return string
      */
     public function endChart(Chart $chart);

diff --git a/Output/DataOutputInterface.php b/Output/DataOutputInterface.php
@@ -13,7 +13,6 @@ interface DataOutputInterface
     /**
      * Returns a string to draw data.
      *
-     * @param Data   $data
      * @param string $dataName Variable name who will contain the data
      *
      * @return string

diff --git a/Output/DateOutputInterface.php b/Output/DateOutputInterface.php
@@ -10,8 +10,6 @@ interface DateOutputInterface
     /**
      * Returns a string to draw a DateTimeInterface object.
      *
-     * @param \DateTimeInterface $date
-     *
      * @return string
      */
     public function draw(\DateTimeInterface $date);

diff --git a/Output/EventsOutputInterface.php b/Output/EventsOutputInterface.php
@@ -10,7 +10,6 @@ interface EventsOutputInterface
     /**
      * Returns a string to draw events of a chart.
      *
-     * @param Events $events
      * @param string $chartName
      *
      * @return string

diff --git a/Output/Javascript/ChartOutput.php b/Output/Javascript/ChartOutput.php
@@ -27,11 +27,8 @@ class ChartOutput extends AbstractChartOutput
     /**
      * ChartOutput constructor.
      *
-     * @param string                 $version
-     * @param string                 $language
-     * @param OptionsOutputInterface $optionsOutput
-     * @param DataOutputInterface    $dataOutput
-     * @param EventsOutputInterface  $eventsOutput
+     * @param string $version
+     * @param string $language
      */
     public function __construct(
         $version,

diff --git a/Output/Javascript/DataOutput.php b/Output/Javascript/DataOutput.php
@@ -17,8 +17,6 @@ class DataOutput implements DataOutputInterface
 
     /**
      * DataOutput constructor.
-     *
-     * @param DateOutputInterface $dateOutput
      */
     public function __construct(DateOutputInterface $dateOutput)
     {
@@ -33,9 +31,7 @@ public function draw(Data $data, $dataName)
         $arrayToDataTable = $data->getArrayToDataTable();
 
         if (!$arrayToDataTable) {
-            throw new GoogleChartsException(
-                'There is no data for chart. Use method setArrayToDataTable() to provide data.'
-            );
+            throw new GoogleChartsException('There is no data for chart. Use method setArrayToDataTable() to provide data.');
         }
 
         $js = "var $dataName = new google.visualization.arrayToDataTable([";

diff --git a/Output/Javascript/OptionsOutput.php b/Output/Javascript/OptionsOutput.php
@@ -16,8 +16,6 @@ class OptionsOutput extends AbstractOptionsOutput
 
     /**
      * OptionsOutput constructor.
-     *
-     * @param DateOutputInterface $dateOutput
      */
     public function __construct(DateOutputInterface $dateOutput)
     {

diff --git a/Output/OptionsOutputInterface.php b/Output/OptionsOutputInterface.php
@@ -38,8 +38,7 @@ public function renameRecursivelyKeys($options);
      * a string or an array. If an option have a null value, an empty array or an empty class, it is not returned :
      * the default value will be applied.
      *
-     * @param ChartOptionsInterface $options
-     * @param string                $optionsName Variable name who will contain the options
+     * @param string $optionsName Variable name who will contain the options
      *
      * @return string
      */

diff --git a/Tests/GoogleCharts/Charts/AnnotationChartTest.php b/Tests/GoogleCharts/Charts/AnnotationChartTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\CMEN\GoogleChartsBundle\GoogleCharts\Charts;
+namespace CMEN\GoogleChartsBundle\Tests\GoogleCharts\Charts;
 
 use CMEN\GoogleChartsBundle\GoogleCharts\Charts\AnnotationChart;
 use CMEN\GoogleChartsBundle\Output\ChartOutputInterface;

diff --git a/Tests/GoogleCharts/Charts/ColumnChartTest.php b/Tests/GoogleCharts/Charts/ColumnChartTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\CMEN\GoogleChartsBundle\GoogleCharts\Charts;
+namespace CMEN\GoogleChartsBundle\Tests\GoogleCharts\Charts;
 
 use CMEN\GoogleChartsBundle\GoogleCharts\Charts\ColumnChart;
 use CMEN\GoogleChartsBundle\GoogleCharts\Options\Trendlines;

diff --git a/Tests/GoogleCharts/Charts/GanttChartTest.php b/Tests/GoogleCharts/Charts/GanttChartTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\CMEN\GoogleChartsBundle\GoogleCharts\Charts;
+namespace CMEN\GoogleChartsBundle\Tests\GoogleCharts\Charts;
 
 use CMEN\GoogleChartsBundle\GoogleCharts\Charts\GanttChart;
 use CMEN\GoogleChartsBundle\Output\ChartOutputInterface;

diff --git a/Tests/GoogleCharts/Charts/LineChartTest.php b/Tests/GoogleCharts/Charts/LineChartTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\CMEN\GoogleChartsBundle\GoogleCharts\Charts;
+namespace CMEN\GoogleChartsBundle\Tests\GoogleCharts\Charts;
 
 use CMEN\GoogleChartsBundle\GoogleCharts\Charts\LineChart;
 use CMEN\GoogleChartsBundle\GoogleCharts\Options\Trendlines;

diff --git a/Tests/GoogleCharts/EventsTest.php b/Tests/GoogleCharts/EventsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\CMEN\GoogleChartsBundle\GoogleCharts;
+namespace CMEN\GoogleChartsBundle\Tests\GoogleCharts;
 
 use CMEN\GoogleChartsBundle\GoogleCharts\Charts\ComboChart;
 use CMEN\GoogleChartsBundle\GoogleCharts\Charts\Map;

diff --git a/Tests/GoogleCharts/ListenerTest.php b/Tests/GoogleCharts/ListenerTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\CMEN\GoogleChartsBundle\GoogleCharts;
+namespace CMEN\GoogleChartsBundle\Tests\GoogleCharts;
 
 use CMEN\GoogleChartsBundle\GoogleCharts\EventType;
 use CMEN\GoogleChartsBundle\GoogleCharts\Listener;

diff --git a/Tests/GoogleCharts/Options/AnnotationChart/AnnotationChartOptionsTest.php b/Tests/GoogleCharts/Options/AnnotationChart/AnnotationChartOptionsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\CMEN\GoogleChartsBundle\GoogleCharts\Options\AnnotationChart;
+namespace CMEN\GoogleChartsBundle\Tests\GoogleCharts\Options\AnnotationChart;
 
 use CMEN\GoogleChartsBundle\GoogleCharts\Options\AnnotationChart\AnnotationChartOptions;
 

diff --git a/Tests/GoogleCharts/Options/ColumnChart/ColumnChartOptionsTest.php b/Tests/GoogleCharts/Options/ColumnChart/ColumnChartOptionsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\CMEN\GoogleChartsBundle\GoogleCharts\Options\ColumnChart;
+namespace CMEN\GoogleChartsBundle\Tests\GoogleCharts\Options\ColumnChart;
 
 use CMEN\GoogleChartsBundle\GoogleCharts\Options\ColumnChart\ColumnChartOptions;
 

diff --git a/Tests/GoogleCharts/Options/GanttChart/GanttChartOptionsTest.php b/Tests/GoogleCharts/Options/GanttChart/GanttChartOptionsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\CMEN\GoogleChartsBundle\GoogleCharts\Options\GanttChart;
+namespace CMEN\GoogleChartsBundle\Tests\GoogleCharts\Options\GanttChart;
 
 use CMEN\GoogleChartsBundle\GoogleCharts\Options\GanttChart\GanttChartOptions;
 

diff --git a/Tests/GoogleCharts/Options/LineChart/LineChartOptionsTest.php b/Tests/GoogleCharts/Options/LineChart/LineChartOptionsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\CMEN\GoogleChartsBundle\GoogleCharts\Options\LineChart;
+namespace CMEN\GoogleChartsBundle\Tests\GoogleCharts\Options\LineChart;
 
 use CMEN\GoogleChartsBundle\GoogleCharts\Options\LineChart\LineChartOptions;
 

diff --git a/Tests/Output/Javascript/ChartOutputTest.php b/Tests/Output/Javascript/ChartOutputTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\CMEN\GoogleChartsBundle\Output\Javascript;
+namespace CMEN\GoogleChartsBundle\Tests\Output\Javascript;
 
 use CMEN\GoogleChartsBundle\GoogleCharts\Charts\ColumnChart;
 use CMEN\GoogleChartsBundle\Output\ChartOutputInterface;

diff --git a/Tests/Output/Javascript/DataOutputTest.php b/Tests/Output/Javascript/DataOutputTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\CMEN\GoogleChartsBundle\Output\Javascript;
+namespace CMEN\GoogleChartsBundle\Tests\Output\Javascript;
 
 use CMEN\GoogleChartsBundle\GoogleCharts\Data;
 use CMEN\GoogleChartsBundle\Output\Javascript\DataOutput;

diff --git a/Tests/Output/Javascript/DateOutputTest.php b/Tests/Output/Javascript/DateOutputTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\CMEN\GoogleChartsBundle\Output\Javascript;
+namespace CMEN\GoogleChartsBundle\Tests\Output\Javascript;
 
 use CMEN\GoogleChartsBundle\Output\Javascript\DateOutput;
 

diff --git a/Twig/GoogleChartsExtension.php b/Twig/GoogleChartsExtension.php
@@ -5,19 +5,19 @@
 use CMEN\GoogleChartsBundle\Exception\GoogleChartsException;
 use CMEN\GoogleChartsBundle\GoogleCharts\Chart;
 use CMEN\GoogleChartsBundle\Output\ChartOutputInterface;
+use Twig\Extension\AbstractExtension;
+use Twig\TwigFunction;
 
 /**
  * @author Christophe Meneses
  */
-class GoogleChartsExtension extends \Twig_Extension
+class GoogleChartsExtension extends AbstractExtension
 {
     /** @var ChartOutputInterface */
     private $chartOutput;
 
     /**
      * GoogleChartsExtension constructor.
-     *
-     * @param ChartOutputInterface $chartOutput
      */
     public function __construct(ChartOutputInterface $chartOutput)
     {
@@ -30,11 +30,11 @@ public function __construct(ChartOutputInterface $chartOutput)
     public function getFunctions()
     {
         return [
-            new \Twig_SimpleFunction('gc_draw', [$this, 'gcDraw'], ['is_safe' => ['html']]),
-            new \Twig_SimpleFunction('gc_start', [$this, 'gcStart'], ['is_safe' => ['html']]),
-            new \Twig_SimpleFunction('gc_end', [$this, 'gcEnd'], ['is_safe' => ['html']]),
-            new \Twig_SimpleFunction('gc_event', [$this, 'gcEvent'], ['is_safe' => ['html']]),
-            new \Twig_SimpleFunction('gc_language', [$this, 'gcLanguage']),
+            new TwigFunction('gc_draw', [$this, 'gcDraw'], ['is_safe' => ['html']]),
+            new TwigFunction('gc_start', [$this, 'gcStart'], ['is_safe' => ['html']]),
+            new TwigFunction('gc_end', [$this, 'gcEnd'], ['is_safe' => ['html']]),
+            new TwigFunction('gc_event', [$this, 'gcEvent'], ['is_safe' => ['html']]),
+            new TwigFunction('gc_language', [$this, 'gcLanguage']),
         ];
     }
 

diff --git a/composer.json b/composer.json
@@ -11,13 +11,20 @@
   ],
   "require": {
     "php": "^5.6 || ^7.0",
-    "symfony/framework-bundle": "^2.7 || ^3.0 || ^4.0"
+    "symfony/framework-bundle": "^2.7 || ^3.0 || ^4.0 || ^5.0",
+    "twig/twig": "^1.42 || ^2.12 || ^3.0"
+  },
+  "require-dev": {
+    "phpunit/phpunit": "^5.7",
+    "friendsofphp/php-cs-fixer": "^2.16"
   },
   "autoload": {
     "psr-4": { "CMEN\\GoogleChartsBundle\\": "" }
   },
-  "require-dev": {
-    "phpunit/phpunit": "^5.7",
-    "friendsofphp/php-cs-fixer": "^2.9"
+  "autoload-dev": {
+    "psr-4": { "CMEN\\GoogleChartsBundle\\Tests\\": "Tests/" }
+  },
+  "config": {
+    "sort-packages": true
   }
 }