Rearrange code [skip ci]

app/Generator/Chart/Basic/GeneratorInterface.php

@@ -21,17 +21,6 @@ namespace FireflyIII\Generator\Chart\Basic;
 interface GeneratorInterface
 {
 
-    /**
-     * Expects data as:
-     *
-     * key => value
-     *
-     * @param array $data
-     *
-     * @return array
-     */
-    public function pieChart(array $data): array;
-
     /**
      * Will generate a (ChartJS) compatible array from the given input. Expects this format:
      *
@@ -57,6 +46,17 @@ interface GeneratorInterface
      */
     public function multiSet(array $data): array;
 
+    /**
+     * Expects data as:
+     *
+     * key => value
+     *
+     * @param array $data
+     *
+     * @return array
+     */
+    public function pieChart(array $data): array;
+
     /**
      * Will generate a (ChartJS) compatible array from the given input. Expects this format:
      *

app/Generator/Chart/Category/ChartJsCategoryChartGenerator.php

@@ -142,6 +142,35 @@ class ChartJsCategoryChartGenerator implements CategoryChartGeneratorInterface
 
     }
 
+    /**
+     * @param array $entries
+     *
+     * @return array
+     */
+    public function pieChart(array $entries): array
+    {
+        $data  = [
+            'datasets' => [
+                0 => [],
+            ],
+            'labels'   => [],
+        ];
+        $index = 0;
+        foreach ($entries as $entry) {
+
+            if (bccomp($entry['amount'], '0') === -1) {
+                $entry['amount'] = bcmul($entry['amount'], '-1');
+            }
+
+            $data['datasets'][0]['data'][]            = round($entry['amount'], 2);
+            $data['datasets'][0]['backgroundColor'][] = ChartColour::getColour($index);
+            $data['labels'][]                         = $entry['name'];
+            $index++;
+        }
+
+        return $data;
+    }
+
     /**
      * @param array $entries
      *
@@ -177,33 +206,4 @@ class ChartJsCategoryChartGenerator implements CategoryChartGeneratorInterface
 
     }
 
-    /**
-     * @param array $entries
-     *
-     * @return array
-     */
-    public function pieChart(array $entries): array
-    {
-        $data  = [
-            'datasets' => [
-                0 => [],
-            ],
-            'labels'   => [],
-        ];
-        $index = 0;
-        foreach ($entries as $entry) {
-
-            if (bccomp($entry['amount'], '0') === -1) {
-                $entry['amount'] = bcmul($entry['amount'], '-1');
-            }
-
-            $data['datasets'][0]['data'][]            = round($entry['amount'], 2);
-            $data['datasets'][0]['backgroundColor'][] = ChartColour::getColour($index);
-            $data['labels'][]                         = $entry['name'];
-            $index++;
-        }
-
-        return $data;
-    }
-
 }

app/Generator/Chart/Report/ChartJsReportChartGenerator.php

@@ -91,7 +91,7 @@ class ChartJsReportChartGenerator implements ReportChartGeneratorInterface
      *
      * @return array
      */
-    public function netWorth(Collection $entries) : array
+    public function netWorth(Collection $entries): array
     {
         $format = (string)trans('config.month_and_day');
         $data   = [

app/Generator/Chart/Report/ReportChartGeneratorInterface.php

@@ -44,7 +44,7 @@ interface ReportChartGeneratorInterface
      *
      * @return array
      */
-    public function netWorth(Collection $entries) : array;
+    public function netWorth(Collection $entries): array;
 
     /**
      * @param Collection $entries