Add copyright things.

app/Console/Commands/Tools/ApplyRules.php

@@ -1,6 +1,27 @@
 <?php
 
 
+
+/**
+ * ApplyRules.php
+ * Copyright (c) 2019 thegrumpydictator@gmail.com
+ *
+ * This file is part of Firefly III.
+ *
+ * Firefly III is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Firefly III is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 namespace FireflyIII\Console\Commands\Tools;
 
 

app/Generator/Report/Category/MonthReportGenerator.php

@@ -28,12 +28,6 @@ use Carbon\Carbon;
 use FireflyIII\Generator\Report\ReportGeneratorInterface;
 use FireflyIII\Generator\Report\Support;
 use FireflyIII\Helpers\Collector\GroupCollectorInterface;
-use FireflyIII\Helpers\Collector\TransactionCollectorInterface;
-use FireflyIII\Helpers\Filter\NegativeAmountFilter;
-use FireflyIII\Helpers\Filter\OpposingAccountFilter;
-use FireflyIII\Helpers\Filter\PositiveAmountFilter;
-use FireflyIII\Helpers\Filter\TransferFilter;
-use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionType;
 use Illuminate\Support\Collection;
 use Log;
@@ -107,6 +101,75 @@ class MonthReportGenerator extends Support implements ReportGeneratorInterface
         return $result;
     }
 
+    /**
+     * Get the expenses for this report.
+     *
+     * @return array
+     */
+    protected function getExpenses(): array
+    {
+        if (count($this->expenses) > 0) {
+            Log::debug('Return previous set of expenses.');
+
+            return $this->expenses;
+        }
+
+        /** @var GroupCollectorInterface $collector */
+        $collector = app(GroupCollectorInterface::class);
+        $collector->setAccounts($this->accounts)->setRange($this->start, $this->end)
+                  ->setTypes([TransactionType::WITHDRAWAL, TransactionType::TRANSFER])
+                  ->setCategories($this->categories)->withAccountInformation();
+
+        $transactions   = $collector->getExtractedJournals();
+        $this->expenses = $transactions;
+
+        return $transactions;
+    }
+
+    /**
+     * Get the income for this report.
+     *
+     * @return array
+     */
+    protected function getIncome(): array
+    {
+        if (count($this->income) > 0) {
+            return $this->income;
+        }
+
+        /** @var GroupCollectorInterface $collector */
+        $collector = app(GroupCollectorInterface::class);
+
+        $collector->setAccounts($this->accounts)->setRange($this->start, $this->end)
+                  ->setTypes([TransactionType::DEPOSIT, TransactionType::TRANSFER])
+                  ->setCategories($this->categories)->withAccountInformation();
+
+        $transactions = $collector->getExtractedJournals();
+        $this->income = $transactions;
+
+        return $transactions;
+    }
+
+    /**
+     * Summarize the category.
+     *
+     * @param array $array
+     *
+     * @return array
+     */
+    private function summarizeByCategory(array $array): array
+    {
+        $result = [];
+        /** @var array $journal */
+        foreach ($array as $journal) {
+            $categoryId          = (int)$journal['category_id'];
+            $result[$categoryId] = $result[$categoryId] ?? '0';
+            $result[$categoryId] = bcadd($journal['amount'], $result[$categoryId]);
+        }
+
+        return $result;
+    }
+
     /**
      * Set the involved accounts.
      *
@@ -198,73 +261,4 @@ class MonthReportGenerator extends Support implements ReportGeneratorInterface
     {
         return $this;
     }
-
-    /**
-     * Get the expenses for this report.
-     *
-     * @return array
-     */
-    protected function getExpenses(): array
-    {
-        if (count($this->expenses) > 0) {
-            Log::debug('Return previous set of expenses.');
-
-            return $this->expenses;
-        }
-
-        /** @var GroupCollectorInterface $collector */
-        $collector = app(GroupCollectorInterface::class);
-        $collector->setAccounts($this->accounts)->setRange($this->start, $this->end)
-                  ->setTypes([TransactionType::WITHDRAWAL, TransactionType::TRANSFER])
-                  ->setCategories($this->categories)->withAccountInformation();
-
-        $transactions   = $collector->getExtractedJournals();
-        $this->expenses = $transactions;
-
-        return $transactions;
-    }
-
-    /**
-     * Get the income for this report.
-     *
-     * @return array
-     */
-    protected function getIncome(): array
-    {
-        if (count($this->income) > 0) {
-            return $this->income;
-        }
-
-        /** @var GroupCollectorInterface $collector */
-        $collector = app(GroupCollectorInterface::class);
-
-        $collector->setAccounts($this->accounts)->setRange($this->start, $this->end)
-                  ->setTypes([TransactionType::DEPOSIT, TransactionType::TRANSFER])
-                  ->setCategories($this->categories)->withAccountInformation();
-
-        $transactions = $collector->getExtractedJournals();
-        $this->income = $transactions;
-
-        return $transactions;
-    }
-
-    /**
-     * Summarize the category.
-     *
-     * @param array $array
-     *
-     * @return array
-     */
-    private function summarizeByCategory(array $array): array
-    {
-        $result = [];
-        /** @var array $journal */
-        foreach ($array as $journal) {
-            $categoryId          = (int)$journal['category_id'];
-            $result[$categoryId] = $result[$categoryId] ?? '0';
-            $result[$categoryId] = bcadd($journal['amount'], $result[$categoryId]);
-        }
-
-        return $result;
-    }
 }

app/Helpers/Report/PopupReport.php

@@ -50,7 +50,7 @@ class PopupReport implements PopupReportInterface
     }
 
     /**
-     * Collect the tranactions for one account and one budget.
+     * Collect the transactions for one account and one budget.
      *
      * @param Budget  $budget
      * @param Account $account