cmen / CMENGoogleChartsBundle

GoogleCharts/Options/ChartArea.php

Doc Comments +4 added lines, -4 removed lines

@@ -69,7 +69,7 @@ 
     }
 
     /**
-     * @param int|string $height
+     * @param string $height
      *
      * @return $this
      */
@@ -81,7 +81,7 @@ 
     }
 
     /**
-     * @param int|string $left
+     * @param string $left
      *
      * @return $this
      */
@@ -93,7 +93,7 @@ 
     }
 
     /**
-     * @param int|string $top
+     * @param string $top
      *
      * @return $this
      */
@@ -105,7 +105,7 @@ 
     }
 
     /**
-     * @param int|string $width
+     * @param string $width
      *
      * @return $this
      */

GoogleCharts/Data.php

Spacing +3 added lines, -3 removed lines

@@ -65,9 +65,9 @@
             $lastKeyValue = key($row);

             foreach ($row as $key => $value) {

                 if ($value instanceof \DateTime) {

-                    $js .= 'new Date(' . $value->format('Y') . ', ' . ($value->format('n') - 1) . ', ' .

-                        $value->format('d') . ', ' . $value->format('H') . ', ' . $value->format('i') . ', ' .

-                        $value->format('s') . ')';

+                    $js .= 'new Date('.$value->format('Y').', '.($value->format('n')-1).', '.

+                        $value->format('d').', '.$value->format('H').', '.$value->format('i').', '.

+                        $value->format('s').')';

                 } else {

                     $js .= json_encode($value);

                 }

Tests/Charts/ColumnChartTest.php

Spacing +14 added lines, -14 removed lines

@@ -27,16 +27,16 @@ 
         $this->chart->setElementID('div-chart')
             ->getData()->setArrayToDataTable([
                 ['Time of Day', 'Motivation Level', ['role' => 'annotation'], 'Energy Level', ['role' => 'annotation']],
-                [['v' => [8, 0, 0], 'f' => '8 am'],  1, '1', 0.25, '0.2'],
-                [['v' => [9, 0, 0], 'f' => '9 am'],  2, '2',  0.5, '0.5'],
-                [['v' => [10, 0, 0], 'f' => '10 am'], 3, '3',    1,  '1'],
-                [['v' => [11, 0, 0], 'f' => '11 am'], 4, '4', 2.25,  '2'],
-                [['v' => [12, 0, 0], 'f' => '12 am'], 5, '5', 2.25,  '2'],
-                [['v' => [13, 0, 0], 'f' => '1 pm'],  6, '6',    3,  '3'],
-                [['v' => [14, 0, 0], 'f' => '2 pm'],  7, '7', 3.25,  '3'],
-                [['v' => [15, 0, 0], 'f' => '3 pm'],  8, '8',    5,  '5'],
-                [['v' => [16, 0, 0], 'f' => '4 pm'],  9, '9',  6.5,  '6'],
-                [['v' => [17, 0, 0], 'f' => '5 pm'], 10, '10',  10, '10']
+                [['v' => [8, 0, 0], 'f' => '8 am'], 1, '1', 0.25, '0.2'],
+                [['v' => [9, 0, 0], 'f' => '9 am'], 2, '2', 0.5, '0.5'],
+                [['v' => [10, 0, 0], 'f' => '10 am'], 3, '3', 1, '1'],
+                [['v' => [11, 0, 0], 'f' => '11 am'], 4, '4', 2.25, '2'],
+                [['v' => [12, 0, 0], 'f' => '12 am'], 5, '5', 2.25, '2'],
+                [['v' => [13, 0, 0], 'f' => '1 pm'], 6, '6', 3, '3'],
+                [['v' => [14, 0, 0], 'f' => '2 pm'], 7, '7', 3.25, '3'],
+                [['v' => [15, 0, 0], 'f' => '3 pm'], 8, '8', 5, '5'],
+                [['v' => [16, 0, 0], 'f' => '4 pm'], 9, '9', 6.5, '6'],
+                [['v' => [17, 0, 0], 'f' => '5 pm'], 10, '10', 10, '10']
             ]);
 
         $this->chart->getOptions()->getAnimation()
@@ -102,7 +102,7 @@ 
             ->setWidth('auto')
             ->setHeight('auto');
 
-        $this->chart->getOptions()->setColors(['red','#004411']);
+        $this->chart->getOptions()->setColors(['red', '#004411']);
 
         $this->chart->getOptions()->setDataOpacity(1.0);
 
@@ -174,7 +174,7 @@ 
                 ->setItalic(true)
                 ->setColor('black');
         $this->chart->getOptions()->getHAxis()
-            ->setTicks([5,10,15,20])
+            ->setTicks([5, 10, 15, 20])
             ->setTitle('title')
             ->getTitleTextStyle()
                 ->setColor('black')
@@ -304,7 +304,7 @@ 
                 ->setItalic(true)
                 ->setColor('black');
         $this->chart->getOptions()->getVAxis()
-            ->setTicks([5,10,15,20])
+            ->setTicks([5, 10, 15, 20])
             ->setTitle('title')
             ->getTitleTextStyle()
                 ->setColor('black')
@@ -326,7 +326,7 @@ 
 
     public function testJsColumnChart()
     {
-        $js = $this->chart->startDraw() . $this->chart->endDraw();
+        $js = $this->chart->startDraw().$this->chart->endDraw();
 
         $this->assertContains('{"animation":{"startup":true,"duration":1000,"easing":"in"},"annotations":{"alwaysOutside":true,"boxStyle":{"stroke":"#888","strokeWidth":1,"rx":10,"ry":10},"datum":{"stem":{"color":"black","length":12},"style":"point"},"domain":{"stem":{"color":"black","length":5},"style":"point"},"highContrast":true,"stem":{"color":"black","length":5},"style":"point","textStyle":{"auraColor":"#d799ae","opacity":0.8,"bold":true,"italic":true,"color":"#871b47","fontName":"Times-Roman","fontSize":18}},"bar":{"groupWidth":"61.8%"},"dataOpacity":1,"explorer":{"actions":["dragToPan","rightClickToReset"],"axis":"vertical","keepInBounds":false,"maxZoomIn":0.25,"maxZoomOut":4,"zoomDelta":1.5},"focusTarget":"datum","hAxis":{"allowContainerBoundaryTextCufoff":false,"slantedText":false,"slantedTextAngle":30,"maxAlternation":2,"maxTextLines":5,"minTextSpacing":5,"showTextEvery":1,"baseline":5,"baselineColor":"black","direction":1,"format":"decimal","logScale":false,"scaleType":"log","maxValue":100,"minValue":1,"ticks":[5,10,15,20],"gridlines":{"color":"#CCC","count":5,"units":{"years":{"format":"yyyy"},"months":{"format":"M"},"days":{"format":"d"},"hours":{"format":"H"},"minutes":{"format":"i"},"seconds":{"format":"s"},"milliseconds":{"format":"u"}}},"minorGridlines":{"color":"black","count":0,"units":{"years":{"format":"yyyy"},"months":{"format":"M"},"days":{"format":"d"},"hours":{"format":"H"},"minutes":{"format":"i"},"seconds":{"format":"s"},"milliseconds":{"format":"u"}}},"textPosition":"out","textStyle":{"bold":true,"italic":true,"color":"black","fontName":"Times-Roman","fontSize":12},"title":"title","titleTextStyle":{"color":"black","fontName":"Arial","fontSize":18,"bold":true,"italic":true},"viewWindow":{"max":100,"min":1},"viewWindowMode":"pretty"},"isStacked":false,"legend":{"alignment":"start","position":"right","textStyle":{"bold":false,"italic":false,"color":"black","fontName":"Arial","fontSize":10}},"orientation":"horizontal","reverseCategories":false,"tooltip":{"ignoreBounds":false,"showColorCode":false,"textStyle":{"bold":false,"italic":false,"color":"black","fontName":"Arial","fontSize":10},"trigger":"focus","isHtml":false},"vAxes":[{"title":"v1"},{"title":"v2"}],"axisTitlesPosition":"out","series":{"0":{"color":"black","visibleInLegend":false},"3":{"color":"red","visibleInLegend":false}},"theme":"maximized","titlePosition":"out","vAxis":{"baseline":5,"baselineColor":"black","direction":1,"format":"decimal","gridlines":{"color":"#CCC","count":5,"units":{"years":{"format":"yyyy"},"months":{"format":"M"},"days":{"format":"d"},"hours":{"format":"H"},"minutes":{"format":"i"},"seconds":{"format":"s"},"milliseconds":{"format":"u"}}},"minorGridlines":{"color":"black","count":0,"units":{"years":{"format":"yyyy"},"months":{"format":"M"},"days":{"format":"d"},"hours":{"format":"H"},"minutes":{"format":"i"},"seconds":{"format":"s"},"milliseconds":{"format":"u"}}},"logScale":false,"scaleType":"log","textPosition":"out","textStyle":{"bold":true,"italic":true,"color":"black","fontName":"Times-Roman","fontSize":12},"ticks":[5,10,15,20],"title":"title","titleTextStyle":{"color":"black","fontName":"Arial","fontSize":18,"bold":true,"italic":true},"maxValue":100,"minValue":1,"viewWindowMode":"pretty","viewWindow":{"max":100,"min":1}},"backgroundColor":{"fill":"white","stroke":"#666","strokeWidth":0},"chartArea":{"backgroundColor":{"stroke":"black","strokeWidth":1},"height":"auto","left":"auto","top":"auto","width":"auto"},"colors":["red","#004411"],"fontSize":12,"fontName":"Arial","title":"Title","titleTextStyle":{"color":"black","fontName":"Arial","fontSize":18,"bold":false,"italic":false},"enableInteractivity":true,"forceIFrame":false,"height":500,"width":700}', $js);
     }

Tests/ChartTest.php

Spacing +10 added lines, -10 removed lines

@@ -16,16 +16,16 @@
         $chart->getOptions()->setTitle('title')->setTitlePosition('in');
         $chart->getData()->setArrayToDataTable([
             ['Time of Day', 'Motivation Level', ['role' => 'annotation'], 'Energy Level', ['role' => 'annotation']],
-            [['v' => [8, 0, 0], 'f' => '8 am'],  1, '1', 0.25, '0.2'],
-            [['v' => [9, 0, 0], 'f' => '9 am'],  2, '2',  0.5, '0.5'],
-            [['v' => [10, 0, 0], 'f' => '10 am'], 3, '3',    1,  '1'],
-            [['v' => [11, 0, 0], 'f' => '11 am'], 4, '4', 2.25,  '2'],
-            [['v' => [12, 0, 0], 'f' => '12 am'], 5, '5', 2.25,  '2'],
-            [['v' => [13, 0, 0], 'f' => '1 pm'],  6, '6',    3,  '3'],
-            [['v' => [14, 0, 0], 'f' => '2 pm'],  7, '7', 3.25,  '3'],
-            [['v' => [15, 0, 0], 'f' => '3 pm'],  8, '8',    5,  '5'],
-            [['v' => [16, 0, 0], 'f' => '4 pm'],  9, '9',  6.5,  '6'],
-            [['v' => [17, 0, 0], 'f' => '5 pm'], 10, '10',  10, '10']
+            [['v' => [8, 0, 0], 'f' => '8 am'], 1, '1', 0.25, '0.2'],
+            [['v' => [9, 0, 0], 'f' => '9 am'], 2, '2', 0.5, '0.5'],
+            [['v' => [10, 0, 0], 'f' => '10 am'], 3, '3', 1, '1'],
+            [['v' => [11, 0, 0], 'f' => '11 am'], 4, '4', 2.25, '2'],
+            [['v' => [12, 0, 0], 'f' => '12 am'], 5, '5', 2.25, '2'],
+            [['v' => [13, 0, 0], 'f' => '1 pm'], 6, '6', 3, '3'],
+            [['v' => [14, 0, 0], 'f' => '2 pm'], 7, '7', 3.25, '3'],
+            [['v' => [15, 0, 0], 'f' => '3 pm'], 8, '8', 5, '5'],
+            [['v' => [16, 0, 0], 'f' => '4 pm'], 9, '9', 6.5, '6'],
+            [['v' => [17, 0, 0], 'f' => '5 pm'], 10, '10', 10, '10']
         ]);
 
         $chart->startDraw();