@@ -2,8 +2,8 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace CMEN\GoogleChartsBundle\GoogleCharts; |
| 4 | 4 | |
| 5 | -use CMEN\GoogleChartsBundle\Exception\GoogleChartsException; |
|
| 6 | -use CMEN\GoogleChartsBundle\GoogleCharts\Charts\Diff\DiffChart; |
|
| 5 | +use CMEN\GoogleChartsBundle\Exception\GoogleChartsException; |
|
| 6 | +use CMEN\GoogleChartsBundle\GoogleCharts\Charts\Diff\DiffChart; |
|
| 7 | 7 | use CMEN\GoogleChartsBundle\GoogleCharts\Options\ChartOptionsDraw; |
| 8 | 8 | |
| 9 | 9 | /** |
@@ -46,7 +46,7 @@ discard block |
||
| 46 | 46 | */ |
| 47 | 47 | public function getName() |
| 48 | 48 | {
|
| 49 | - return 'chart' . ucfirst($this->elementID); |
|
| 49 | + return 'chart'.ucfirst($this->elementID); |
|
| 50 | 50 | } |
| 51 | 51 | |
| 52 | 52 | /** |
@@ -56,7 +56,7 @@ discard block |
||
| 56 | 56 | */ |
| 57 | 57 | public function getDataName() |
| 58 | 58 | {
|
| 59 | - return 'data'. ucfirst($this->getName()); |
|
| 59 | + return 'data'.ucfirst($this->getName()); |
|
| 60 | 60 | } |
| 61 | 61 | |
| 62 | 62 | /** |
@@ -66,7 +66,7 @@ discard block |
||
| 66 | 66 | */ |
| 67 | 67 | public function getOptionsName() |
| 68 | 68 | {
|
| 69 | - return 'options'. ucfirst($this->getName()); |
|
| 69 | + return 'options'.ucfirst($this->getName()); |
|
| 70 | 70 | } |
| 71 | 71 | |
| 72 | 72 | /** |
@@ -117,18 +117,18 @@ discard block |
||
| 117 | 117 | throw new GoogleChartsException('Container is not defined.');
|
| 118 | 118 | } |
| 119 | 119 | |
| 120 | - $js = 'var ' . $this->getName() . ' = new google.' . $this->getLibrary() . '.' . $this->getType() . |
|
| 121 | - '(document.getElementById("' . $this->elementID . '"));';
|
|
| 120 | + $js = 'var '.$this->getName().' = new google.'.$this->getLibrary().'.'.$this->getType(). |
|
| 121 | + '(document.getElementById("'.$this->elementID.'"));';
|
|
| 122 | 122 | |
| 123 | 123 | if (!$this instanceof DiffChart) {
|
| 124 | 124 | $js .= $this->data->draw($this->getDataName()); |
| 125 | 125 | |
| 126 | 126 | } else {
|
| 127 | - $js .= $this->getOldChart()->getData()->draw('old_' . $this->getDataName()) .
|
|
| 128 | - $this->getNewChart()->getData()->draw('new_' . $this->getDataName()) .
|
|
| 129 | - 'var ' . $this->getDataName() . ' = ' . $this->getName() . |
|
| 130 | - '.computeDiff(old_' . $this->getDataName() . ', |
|
| 131 | - new_' . $this->getDataName() . ');'; |
|
| 127 | + $js .= $this->getOldChart()->getData()->draw('old_'.$this->getDataName()).
|
|
| 128 | + $this->getNewChart()->getData()->draw('new_'.$this->getDataName()).
|
|
| 129 | + 'var '.$this->getDataName().' = '.$this->getName(). |
|
| 130 | + '.computeDiff(old_'.$this->getDataName().', |
|
| 131 | + new_' . $this->getDataName().');'; |
|
| 132 | 132 | } |
| 133 | 133 | |
| 134 | 134 | $js .= $this->options->draw($this->getOptionsName()); |
@@ -143,8 +143,8 @@ discard block |
||
| 143 | 143 | */ |
| 144 | 144 | public function endDraw() |
| 145 | 145 | {
|
| 146 | - return $this->events->draw(). $this->getName() . |
|
| 147 | - '.draw('. $this->getDataName() . ', '. $this->getOptionsName() .');';
|
|
| 146 | + return $this->events->draw().$this->getName(). |
|
| 147 | + '.draw('.$this->getDataName().', '.$this->getOptionsName().');';
|
|
| 148 | 148 | } |
| 149 | 149 | |
| 150 | 150 | /** |
@@ -55,8 +55,8 @@ |
||
| 55 | 55 | $lastKeyValue = key($row); |
| 56 | 56 | foreach ($row as $key => $value) {
|
| 57 | 57 | if ($value instanceof \DateTime) {
|
| 58 | - $js .= 'new Date(' . $value->format('Y') . ', ' . ($value->format('n')-1) . ', ' .
|
|
| 59 | - $value->format('d') . ')';
|
|
| 58 | + $js .= 'new Date('.$value->format('Y').', '.($value->format('n')-1).', '.
|
|
| 59 | + $value->format('d').')';
|
|
| 60 | 60 | } else {
|
| 61 | 61 | $js .= json_encode($value); |
| 62 | 62 | } |
@@ -46,8 +46,8 @@ |
||
| 46 | 46 | $js = ''; |
| 47 | 47 | |
| 48 | 48 | foreach ($this->listeners as $listener) { |
| 49 | - $js .= "google.visualization.events.addListener(" . $this->chart->getName() . ", '" . $listener->getType() . |
|
| 50 | - "', " . $listener->getFunction() . ");"; |
|
| 49 | + $js .= "google.visualization.events.addListener(".$this->chart->getName().", '".$listener->getType(). |
|
| 50 | + "', ".$listener->getFunction().");"; |
|
| 51 | 51 | } |
| 52 | 52 | |
| 53 | 53 | return $js; |
@@ -40,6 +40,6 @@ |
||
| 40 | 40 | |
| 41 | 41 | $options = $this->optionsFormat->renameRecursivelyKeys($options); |
| 42 | 42 | |
| 43 | - return "var $optionsName = " . json_encode($options) . ";\n"; |
|
| 43 | + return "var $optionsName = ".json_encode($options).";\n"; |
|
| 44 | 44 | } |
| 45 | 45 | } |
@@ -50,7 +50,7 @@ |
||
| 50 | 50 | parent::__construct(); |
| 51 | 51 | |
| 52 | 52 | $this->timeline = new Timeline(); |
| 53 | - $this->tooltip = new BasicTooltip(); |
|
| 53 | + $this->tooltip = new BasicTooltip(); |
|
| 54 | 54 | } |
| 55 | 55 | |
| 56 | 56 | |
@@ -16,7 +16,7 @@ |
||
| 16 | 16 | */ |
| 17 | 17 | public function removeRecursivelyNullValue(&$options) |
| 18 | 18 | { |
| 19 | - $options = array_filter((array)$options, function ($val) { |
|
| 19 | + $options = array_filter((array)$options, function($val) { |
|
| 20 | 20 | return !is_null($val); |
| 21 | 21 | }); |
| 22 | 22 | |
@@ -159,7 +159,7 @@ discard block |
||
| 159 | 159 | ); |
| 160 | 160 | } |
| 161 | 161 | |
| 162 | - $callback = function ($item) { |
|
| 162 | + $callback = function($item) { |
|
| 163 | 163 | if (!is_string($item)) { |
| 164 | 164 | throw new GoogleChartsException('A string is expected for HTML element ID.'); |
| 165 | 165 | } |
@@ -185,7 +185,7 @@ discard block |
||
| 185 | 185 | */ |
| 186 | 186 | private function checkChartType($charts) |
| 187 | 187 | { |
| 188 | - $callback = function ($item) { |
|
| 188 | + $callback = function($item) { |
|
| 189 | 189 | if (!$item instanceof Chart) { |
| 190 | 190 | throw new GoogleChartsException('An instance of Chart or an array of Chart is expected.'); |
| 191 | 191 | } |
@@ -202,19 +202,19 @@ discard block |
||
| 202 | 202 | */ |
| 203 | 203 | private function loadLibraries($packages) |
| 204 | 204 | { |
| 205 | - array_walk($packages, function (&$item) { |
|
| 206 | - $item = '"' . $item . '"'; |
|
| 205 | + array_walk($packages, function(&$item) { |
|
| 206 | + $item = '"'.$item.'"'; |
|
| 207 | 207 | }); |
| 208 | 208 | |
| 209 | - ($this->language) ? $language = ', language: "' . $this->language . '"' : $language = ''; |
|
| 209 | + ($this->language) ? $language = ', language: "'.$this->language.'"' : $language = ''; |
|
| 210 | 210 | |
| 211 | - $load = '"' . $this->version . '", {packages:[' . implode(',', $packages) . ']' . $language . '}'; |
|
| 211 | + $load = '"'.$this->version.'", {packages:['.implode(',', $packages).']'.$language.'}'; |
|
| 212 | 212 | |
| 213 | 213 | if ($this->version == '1' || $this->version == '1.1') { |
| 214 | - return 'google.load("visualization", ' . $load . ');'; |
|
| 214 | + return 'google.load("visualization", '.$load.');'; |
|
| 215 | 215 | |
| 216 | 216 | } else { |
| 217 | - return 'google.charts.load(' . $load . ');'; |
|
| 217 | + return 'google.charts.load('.$load.');'; |
|
| 218 | 218 | } |
| 219 | 219 | } |
| 220 | 220 | |
@@ -266,7 +266,7 @@ discard block |
||
| 266 | 266 | |
| 267 | 267 | $js = $this->loadLibraries($packages); |
| 268 | 268 | |
| 269 | - $js .= $this->startCallback('drawChart' . ucfirst(md5($drawChartName))); |
|
| 269 | + $js .= $this->startCallback('drawChart'.ucfirst(md5($drawChartName))); |
|
| 270 | 270 | |
| 271 | 271 | foreach ($charts as $chart) { |
| 272 | 272 | $js .= $chart->startDraw(); |
@@ -305,7 +305,7 @@ discard block |
||
| 305 | 305 | */ |
| 306 | 306 | public function drawCharts($charts, $elementsID = null) |
| 307 | 307 | { |
| 308 | - return $this->startCharts($charts, $elementsID) . $this->endCharts($charts); |
|
| 308 | + return $this->startCharts($charts, $elementsID).$this->endCharts($charts); |
|
| 309 | 309 | } |
| 310 | 310 | |
| 311 | 311 | /** |