From 7343304284d9f86a676ef7e6c234af30fd49b51b Mon Sep 17 00:00:00 2001 From: James Cole Date: Thu, 4 Feb 2016 07:28:39 +0100 Subject: [PATCH] Code cleanup. --- .../Csv/Specifix/SpecifixInterface.php | 1 + app/Helpers/Report/BalanceReportHelper.php | 1 - app/Http/Controllers/Auth/AuthController.php | 1 - .../Controllers/Chart/PiggyBankController.php | 2 +- .../Controllers/Chart/ReportController.php | 4 +- .../Controllers/PreferencesController.php | 2 +- app/Http/Controllers/ReportController.php | 163 +++++++++--------- app/Http/Middleware/Authenticate.php | 3 +- app/Http/Requests/AccountFormRequest.php | 2 +- app/Http/Requests/AttachmentFormRequest.php | 2 +- app/Http/Requests/BillFormRequest.php | 2 +- app/Http/Requests/BudgetFormRequest.php | 2 +- app/Http/Requests/CategoryFormRequest.php | 2 +- app/Http/Requests/CurrencyFormRequest.php | 2 +- .../Requests/DeleteAccountFormRequest.php | 2 +- app/Http/Requests/JournalFormRequest.php | 2 +- app/Http/Requests/NewUserFormRequest.php | 2 +- app/Http/Requests/PiggyBankFormRequest.php | 2 +- app/Http/Requests/ProfileFormRequest.php | 2 +- app/Http/Requests/RuleFormRequest.php | 2 +- app/Http/Requests/RuleGroupFormRequest.php | 2 +- app/Http/Requests/TagFormRequest.php | 2 +- app/Models/Component.php | 10 +- app/Models/TransactionJournal.php | 4 +- app/Support/Binder/Date.php | 2 +- 25 files changed, 113 insertions(+), 108 deletions(-) diff --git a/app/Helpers/Csv/Specifix/SpecifixInterface.php b/app/Helpers/Csv/Specifix/SpecifixInterface.php index 34e9a3e833..805df80083 100644 --- a/app/Helpers/Csv/Specifix/SpecifixInterface.php +++ b/app/Helpers/Csv/Specifix/SpecifixInterface.php @@ -10,6 +10,7 @@ interface SpecifixInterface { const PRE_PROCESSOR = 1; const POST_PROCESSOR = 2; + /** * Implement bank and locale related fixes. */ diff --git a/app/Helpers/Report/BalanceReportHelper.php b/app/Helpers/Report/BalanceReportHelper.php index 85d5dc1ef2..ca1451d1a2 100644 --- a/app/Helpers/Report/BalanceReportHelper.php +++ b/app/Helpers/Report/BalanceReportHelper.php @@ -78,7 +78,6 @@ class BalanceReportHelper implements BalanceReportHelperInterface $balance->addBalanceLine($this->createEmptyBalanceLine($accounts, $spentData)); $balance->addBalanceLine($this->createTagsBalanceLine($accounts, $start, $end)); $balance->addBalanceLine($this->createDifferenceBalanceLine($accounts, $spentData, $start, $end)); - $balance->setBalanceHeader($header); return $balance; diff --git a/app/Http/Controllers/Auth/AuthController.php b/app/Http/Controllers/Auth/AuthController.php index 79c24d30c2..9d430846bb 100644 --- a/app/Http/Controllers/Auth/AuthController.php +++ b/app/Http/Controllers/Auth/AuthController.php @@ -150,7 +150,6 @@ class AuthController extends Controller return redirect($this->redirectPath()); } - // @codeCoverageIgnoreStart abort(500, 'Not a user!'); diff --git a/app/Http/Controllers/Chart/PiggyBankController.php b/app/Http/Controllers/Chart/PiggyBankController.php index b21153bfa9..45f3cf3cd0 100644 --- a/app/Http/Controllers/Chart/PiggyBankController.php +++ b/app/Http/Controllers/Chart/PiggyBankController.php @@ -22,7 +22,7 @@ class PiggyBankController extends Controller protected $generator; /** - * @codeCoverageIgnore + * */ public function __construct() { diff --git a/app/Http/Controllers/Chart/ReportController.php b/app/Http/Controllers/Chart/ReportController.php index c5aba22ad1..43e0928f90 100644 --- a/app/Http/Controllers/Chart/ReportController.php +++ b/app/Http/Controllers/Chart/ReportController.php @@ -22,7 +22,7 @@ class ReportController extends Controller protected $generator; /** - * @codeCoverageIgnore + * */ public function __construct() { @@ -127,6 +127,7 @@ class ReportController extends Controller */ protected function singleYearInOutSummarized(array $earned, array $spent, Carbon $start, Carbon $end) { + bcscale(2); $income = '0'; $expense = '0'; $count = 0; @@ -156,6 +157,7 @@ class ReportController extends Controller */ protected function multiYearInOutSummarized(array $earned, array $spent, Carbon $start, Carbon $end) { + bcscale(2); $income = '0'; $expense = '0'; $count = 0; diff --git a/app/Http/Controllers/PreferencesController.php b/app/Http/Controllers/PreferencesController.php index 5ef8f38630..799facd837 100644 --- a/app/Http/Controllers/PreferencesController.php +++ b/app/Http/Controllers/PreferencesController.php @@ -16,7 +16,7 @@ class PreferencesController extends Controller { /** - * @codeCoverageIgnore + * */ public function __construct() { diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php index c917fef16c..c5640d0b5a 100644 --- a/app/Http/Controllers/ReportController.php +++ b/app/Http/Controllers/ReportController.php @@ -5,6 +5,7 @@ use FireflyIII\Helpers\Report\ReportHelperInterface; use FireflyIII\Models\Account; use FireflyIII\Repositories\Account\AccountRepositoryInterface as ARI; use Illuminate\Support\Collection; +use Log; use Preferences; use Session; use View; @@ -25,7 +26,7 @@ class ReportController extends Controller protected $helper; /** - * @codeCoverageIgnore + * * * @param ReportHelperInterface $helper */ @@ -43,6 +44,32 @@ class ReportController extends Controller } + /** + * @param ARI $repository + * + * @return View + * @internal param ReportHelperInterface $helper + */ + public function index(ARI $repository) + { + $start = session('first'); + $months = $this->helper->listOfMonths($start); + $customFiscalYear = Preferences::get('customFiscalYear', 0)->data; + + // does the user have shared accounts? + $accounts = $repository->getAccounts(['Default account', 'Asset account']); + // get id's for quick links: + $accountIds = []; + /** @var Account $account */ + foreach ($accounts as $account) { + $accountIds [] = $account->id; + } + $accountList = join(',', $accountIds); + + + return view('reports.index', compact('months', 'accounts', 'start', 'accountList', 'customFiscalYear')); + } + /** * @param $reportType * @param Carbon $start @@ -51,7 +78,59 @@ class ReportController extends Controller * * @return View */ - public function defaultMonth($reportType, Carbon $start, Carbon $end, Collection $accounts) + public function report($reportType, Carbon $start, Carbon $end, Collection $accounts) + { + // throw an error if necessary. + if ($end < $start) { + + return view('error')->with('message', 'End date cannot be before start date, silly!'); + } + + // lower threshold + if ($start < session('first')) { + Log::debug('Start is ' . $start . ' but sessionfirst is ' . session('first')); + $start = session('first'); + } + + switch ($reportType) { + default: + case 'default': + + View::share( + 'subTitle', trans( + 'firefly.report_default', + [ + 'start' => $start->formatLocalized($this->monthFormat), + 'end' => $end->formatLocalized($this->monthFormat), + ] + ) + ); + View::share('subTitleIcon', 'fa-calendar'); + + // more than one year date difference means year report. + if ($start->diffInMonths($end) > 12) { + return $this->defaultMultiYear($reportType, $start, $end, $accounts); + } + // more than two months date difference means year report. + if ($start->diffInMonths($end) > 1) { + return $this->defaultYear($reportType, $start, $end, $accounts); + } + + return $this->defaultMonth($reportType, $start, $end, $accounts); + } + + + } + + /** + * @param $reportType + * @param Carbon $start + * @param Carbon $end + * @param Collection $accounts + * + * @return View + */ + private function defaultMonth($reportType, Carbon $start, Carbon $end, Collection $accounts) { $incomeTopLength = 8; $expenseTopLength = 8; @@ -92,7 +171,7 @@ class ReportController extends Controller * * @return View */ - public function defaultMultiYear($reportType, $start, $end, $accounts) + private function defaultMultiYear($reportType, $start, $end, $accounts) { $incomeTopLength = 8; @@ -129,7 +208,7 @@ class ReportController extends Controller * * @return View */ - public function defaultYear($reportType, Carbon $start, Carbon $end, Collection $accounts) + private function defaultYear($reportType, Carbon $start, Carbon $end, Collection $accounts) { $incomeTopLength = 8; $expenseTopLength = 8; @@ -159,81 +238,5 @@ class ReportController extends Controller ); } - /** - * @param ARI $repository - * - * @return View - * @internal param ReportHelperInterface $helper - */ - public function index(ARI $repository) - { - $start = Session::get('first'); - $months = $this->helper->listOfMonths($start); - $customFiscalYear = Preferences::get('customFiscalYear', 0)->data; - - // does the user have shared accounts? - $accounts = $repository->getAccounts(['Default account', 'Asset account']); - // get id's for quick links: - $accountIds = []; - /** @var Account $account */ - foreach ($accounts as $account) { - $accountIds [] = $account->id; - } - $accountList = join(',', $accountIds); - - - return view('reports.index', compact('months', 'accounts', 'start', 'accountList','customFiscalYear')); - } - - /** - * @param $reportType - * @param Carbon $start - * @param Carbon $end - * @param Collection $accounts - * - * @return View - */ - public function report($reportType, Carbon $start, Carbon $end, Collection $accounts) - { - // throw an error if necessary. - if ($end < $start) { - return view('error')->with('message', 'End date cannot be before start date, silly!'); - } - - // lower threshold - if ($start < Session::get('first')) { - $start = Session::get('first'); - } - - switch ($reportType) { - default: - case 'default': - - View::share( - 'subTitle', trans( - 'firefly.report_default', - [ - 'start' => $start->formatLocalized($this->monthFormat), - 'end' => $end->formatLocalized($this->monthFormat), - ] - ) - ); - View::share('subTitleIcon', 'fa-calendar'); - - // more than one year date difference means year report. - if ($start->diffInMonths($end) > 12) { - return $this->defaultMultiYear($reportType, $start, $end, $accounts); - } - // more than two months date difference means year report. - if ($start->diffInMonths($end) > 1) { - return $this->defaultYear($reportType, $start, $end, $accounts); - } - - return $this->defaultMonth($reportType, $start, $end, $accounts); - } - - - } - } diff --git a/app/Http/Middleware/Authenticate.php b/app/Http/Middleware/Authenticate.php index b67cee9d53..16ddd2e939 100644 --- a/app/Http/Middleware/Authenticate.php +++ b/app/Http/Middleware/Authenticate.php @@ -3,8 +3,9 @@ namespace FireflyIII\Http\Middleware; use Closure; -use Illuminate\Support\Facades\Auth; use Illuminate\Http\Request; +use Illuminate\Support\Facades\Auth; + /** * Class Authenticate * diff --git a/app/Http/Requests/AccountFormRequest.php b/app/Http/Requests/AccountFormRequest.php index 004336e184..cd2f71e86b 100644 --- a/app/Http/Requests/AccountFormRequest.php +++ b/app/Http/Requests/AccountFormRequest.php @@ -10,7 +10,7 @@ use Input; /** * Class AccountFormRequest * - * @codeCoverageIgnore + * * @package FireflyIII\Http\Requests */ class AccountFormRequest extends Request diff --git a/app/Http/Requests/AttachmentFormRequest.php b/app/Http/Requests/AttachmentFormRequest.php index 50a6665591..0dc97519bd 100644 --- a/app/Http/Requests/AttachmentFormRequest.php +++ b/app/Http/Requests/AttachmentFormRequest.php @@ -7,7 +7,7 @@ use Auth; /** * Class AttachmentFormRequest * - * @codeCoverageIgnore + * * @package FireflyIII\Http\Requests */ class AttachmentFormRequest extends Request diff --git a/app/Http/Requests/BillFormRequest.php b/app/Http/Requests/BillFormRequest.php index 45de345a75..786997e445 100644 --- a/app/Http/Requests/BillFormRequest.php +++ b/app/Http/Requests/BillFormRequest.php @@ -9,7 +9,7 @@ use Input; /** * Class BillFormRequest * - * @codeCoverageIgnore + * * @package FireflyIII\Http\Requests */ class BillFormRequest extends Request diff --git a/app/Http/Requests/BudgetFormRequest.php b/app/Http/Requests/BudgetFormRequest.php index 8d99f5f52a..17330ca7b6 100644 --- a/app/Http/Requests/BudgetFormRequest.php +++ b/app/Http/Requests/BudgetFormRequest.php @@ -9,7 +9,7 @@ use Input; /** * Class BudgetFormRequest * - * @codeCoverageIgnore + * * @package FireflyIII\Http\Requests */ class BudgetFormRequest extends Request diff --git a/app/Http/Requests/CategoryFormRequest.php b/app/Http/Requests/CategoryFormRequest.php index 04a16ce9b6..48dfe409b9 100644 --- a/app/Http/Requests/CategoryFormRequest.php +++ b/app/Http/Requests/CategoryFormRequest.php @@ -9,7 +9,7 @@ use Input; /** * Class CategoryFormRequest * - * @codeCoverageIgnore + * * @package FireflyIII\Http\Requests */ class CategoryFormRequest extends Request diff --git a/app/Http/Requests/CurrencyFormRequest.php b/app/Http/Requests/CurrencyFormRequest.php index d2de6cfad1..4944df3dee 100644 --- a/app/Http/Requests/CurrencyFormRequest.php +++ b/app/Http/Requests/CurrencyFormRequest.php @@ -8,7 +8,7 @@ use Input; /** * Class BillFormRequest * - * @codeCoverageIgnore + * * @package FireflyIII\Http\Requests */ class CurrencyFormRequest extends Request diff --git a/app/Http/Requests/DeleteAccountFormRequest.php b/app/Http/Requests/DeleteAccountFormRequest.php index 895c3d4183..b493095984 100644 --- a/app/Http/Requests/DeleteAccountFormRequest.php +++ b/app/Http/Requests/DeleteAccountFormRequest.php @@ -7,7 +7,7 @@ use Auth; /** * Class DeleteAccountFormRequest * - * @codeCoverageIgnore + * * @package FireflyIII\Http\Requests */ class DeleteAccountFormRequest extends Request diff --git a/app/Http/Requests/JournalFormRequest.php b/app/Http/Requests/JournalFormRequest.php index b3377b4a47..0fe499a2a4 100644 --- a/app/Http/Requests/JournalFormRequest.php +++ b/app/Http/Requests/JournalFormRequest.php @@ -11,7 +11,7 @@ use Input; /** * Class JournalFormRequest * - * @codeCoverageIgnore + * * @package FireflyIII\Http\Requests */ class JournalFormRequest extends Request diff --git a/app/Http/Requests/NewUserFormRequest.php b/app/Http/Requests/NewUserFormRequest.php index a7fa888e43..6135f4c6f1 100644 --- a/app/Http/Requests/NewUserFormRequest.php +++ b/app/Http/Requests/NewUserFormRequest.php @@ -7,7 +7,7 @@ use Auth; /** * Class NewUserFormRequest * - * @codeCoverageIgnore + * * @package FireflyIII\Http\Requests */ class NewUserFormRequest extends Request diff --git a/app/Http/Requests/PiggyBankFormRequest.php b/app/Http/Requests/PiggyBankFormRequest.php index f601fa45f5..b67ee14502 100644 --- a/app/Http/Requests/PiggyBankFormRequest.php +++ b/app/Http/Requests/PiggyBankFormRequest.php @@ -8,7 +8,7 @@ use Input; /** * Class PiggyBankFormRequest * - * @codeCoverageIgnore + * * @package FireflyIII\Http\Requests */ class PiggyBankFormRequest extends Request diff --git a/app/Http/Requests/ProfileFormRequest.php b/app/Http/Requests/ProfileFormRequest.php index 932873318b..092f355724 100644 --- a/app/Http/Requests/ProfileFormRequest.php +++ b/app/Http/Requests/ProfileFormRequest.php @@ -7,7 +7,7 @@ use Auth; /** * Class ProfileFormRequest * - * @codeCoverageIgnore + * * @package FireflyIII\Http\Requests */ class ProfileFormRequest extends Request diff --git a/app/Http/Requests/RuleFormRequest.php b/app/Http/Requests/RuleFormRequest.php index be60f0e06a..cee59baa52 100644 --- a/app/Http/Requests/RuleFormRequest.php +++ b/app/Http/Requests/RuleFormRequest.php @@ -17,7 +17,7 @@ use Input; /** * Class RuleFormRequest * - * @codeCoverageIgnore + * * @package FireflyIII\Http\Requests */ class RuleFormRequest extends Request diff --git a/app/Http/Requests/RuleGroupFormRequest.php b/app/Http/Requests/RuleGroupFormRequest.php index 112a1dcca6..34f9e2a9c7 100644 --- a/app/Http/Requests/RuleGroupFormRequest.php +++ b/app/Http/Requests/RuleGroupFormRequest.php @@ -16,7 +16,7 @@ use Input; /** * Class RuleGroupFormRequest * - * @codeCoverageIgnore + * * @package FireflyIII\Http\Requests */ class RuleGroupFormRequest extends Request diff --git a/app/Http/Requests/TagFormRequest.php b/app/Http/Requests/TagFormRequest.php index a4f5da9021..17e46bec51 100644 --- a/app/Http/Requests/TagFormRequest.php +++ b/app/Http/Requests/TagFormRequest.php @@ -8,7 +8,7 @@ use Input; /** * Class TagFormRequest * - * @codeCoverageIgnore + * * @package FireflyIII\Http\Requests */ class TagFormRequest extends Request diff --git a/app/Models/Component.php b/app/Models/Component.php index 52f4dc4ba8..fca471f070 100644 --- a/app/Models/Component.php +++ b/app/Models/Component.php @@ -5,15 +5,15 @@ use Illuminate\Database\Eloquent\Model; /** * Class Component * - * @property int $transaction_journal_id + * @property int $transaction_journal_id * @package FireflyIII\Models - * @property integer $id + * @property integer $id * @property \Carbon\Carbon $created_at * @property \Carbon\Carbon $updated_at * @property \Carbon\Carbon $deleted_at - * @property string $name - * @property integer $user_id - * @property string $class + * @property string $name + * @property integer $user_id + * @property string $class */ class Component extends Model { diff --git a/app/Models/TransactionJournal.php b/app/Models/TransactionJournal.php index dcfd4ab316..25728ed5e3 100644 --- a/app/Models/TransactionJournal.php +++ b/app/Models/TransactionJournal.php @@ -54,8 +54,8 @@ use Watson\Validating\ValidatingTrait; * @method static \Illuminate\Database\Query\Builder|TransactionJournal transactionTypes($types) * @method static \Illuminate\Database\Query\Builder|TransactionJournal withRelevantData() * @property string $type - * @property \Carbon\Carbon $interest_date - * @property \Carbon\Carbon $book_date + * @property \Carbon\Carbon $interest_date + * @property \Carbon\Carbon $book_date */ class TransactionJournal extends Model { diff --git a/app/Support/Binder/Date.php b/app/Support/Binder/Date.php index d2db45ef9e..a6c637500b 100644 --- a/app/Support/Binder/Date.php +++ b/app/Support/Binder/Date.php @@ -11,8 +11,8 @@ namespace FireflyIII\Support\Binder; use Auth; use Carbon\Carbon; -use FireflyIII\Helpers\FiscalHelper; use Exception; +use FireflyIII\Helpers\FiscalHelper; use Log; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;