kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-11-16 22:58:09 +00:00
Code Issues Projects Releases Wiki Activity

Code cleanup.

Browse Source
This commit is contained in:
James Cole
2016-05-02 20:49:19 +02:00
parent 5e1167b8ae
commit 3344bb7263
21 changed files with 105 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/Http/Controllers/Chart/AccountController.php
View File

@@ -4,6 +4,7 @@ declare(strict_types = 1);
namespace FireflyIII\Http\Controllers\Chart;
use Carbon\Carbon;
use FireflyIII\Generator\Chart\Account\AccountChartGeneratorInterface;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Models\Account;
use FireflyIII\Repositories\Account\AccountRepositoryInterface as ARI;
@@ -30,7 +31,7 @@ class AccountController extends Controller
{
parent::__construct();
// create chart generator:
$this->generator = app('FireflyIII\Generator\Chart\Account\AccountChartGeneratorInterface');
$this->generator = app(AccountChartGeneratorInterface::class);
}

3
app/Http/Controllers/Chart/BillController.php
View File

@@ -4,6 +4,7 @@ declare(strict_types = 1);
namespace FireflyIII\Http\Controllers\Chart;
use Carbon\Carbon;
use FireflyIII\Generator\Chart\Bill\BillChartGeneratorInterface;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Models\Bill;
use FireflyIII\Models\TransactionJournal;
@@ -29,7 +30,7 @@ class BillController extends Controller
{
parent::__construct();
// create chart generator:
$this->generator = app('FireflyIII\Generator\Chart\Bill\BillChartGeneratorInterface');
$this->generator = app(BillChartGeneratorInterface::class);
}
/**

5
app/Http/Controllers/Chart/BudgetController.php
View File

@@ -4,6 +4,7 @@ declare(strict_types = 1);
namespace FireflyIII\Http\Controllers\Chart;
use Carbon\Carbon;
use FireflyIII\Generator\Chart\Budget\BudgetChartGeneratorInterface;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Models\Budget;
use FireflyIII\Models\LimitRepetition;
@@ -34,7 +35,7 @@ class BudgetController extends Controller
{
parent::__construct();
// create chart generator:
$this->generator = app('FireflyIII\Generator\Chart\Budget\BudgetChartGeneratorInterface');
$this->generator = app(BudgetChartGeneratorInterface::class);
}
/**
@@ -331,7 +332,7 @@ class BudgetController extends Controller
}
/** @var BudgetRepositoryInterface $repository */
$repository = app('FireflyIII\Repositories\Budget\BudgetRepositoryInterface');
$repository = app(BudgetRepositoryInterface::class);
// loop over period, add by users range:
$current = clone $start;
$viewRange = Preferences::get('viewRange', '1M')->data;

9
app/Http/Controllers/Chart/CategoryController.php
View File

@@ -5,6 +5,7 @@ namespace FireflyIII\Http\Controllers\Chart;
use Carbon\Carbon;
use FireflyIII\Generator\Chart\Category\CategoryChartGeneratorInterface;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Models\Category;
use FireflyIII\Repositories\Account\AccountRepositoryInterface as ARI;
@@ -29,7 +30,7 @@ class CategoryController extends Controller
const KEEP_POSITIVE = 1;
/** @var \FireflyIII\Generator\Chart\Category\CategoryChartGeneratorInterface */
/** @var CategoryChartGeneratorInterface */
protected $generator;
/**
@@ -39,7 +40,7 @@ class CategoryController extends Controller
{
parent::__construct();
// create chart generator:
$this->generator = app('FireflyIII\Generator\Chart\Category\CategoryChartGeneratorInterface');
$this->generator = app(CategoryChartGeneratorInterface::class);
}
@@ -198,7 +199,7 @@ class CategoryController extends Controller
public function multiYear(string $reportType, Carbon $start, Carbon $end, Collection $accounts, Collection $categories)
{
/** @var CRI $repository */
$repository = app('FireflyIII\Repositories\Category\CategoryRepositoryInterface');
$repository = app(CRI::class);
// chart properties for cache:
$cache = new CacheProperties();
@@ -295,7 +296,7 @@ class CategoryController extends Controller
}
/** @var SingleCategoryRepositoryInterface $repository */
$repository = app('FireflyIII\Repositories\Category\SingleCategoryRepositoryInterface');
$repository = app(SingleCategoryRepositoryInterface::class);
// loop over period, add by users range:
$current = clone $start;
$viewRange = Preferences::get('viewRange', '1M')->data;

5
app/Http/Controllers/Chart/PiggyBankController.php
View File

@@ -3,6 +3,7 @@ declare(strict_types = 1);
namespace FireflyIII\Http\Controllers\Chart;
use FireflyIII\Generator\Chart\PiggyBank\PiggyBankChartGeneratorInterface;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Models\PiggyBank;
use FireflyIII\Models\PiggyBankEvent;
@@ -20,7 +21,7 @@ use Response;
class PiggyBankController extends Controller
{
/** @var \FireflyIII\Generator\Chart\PiggyBank\PiggyBankChartGeneratorInterface */
/** @var PiggyBankChartGeneratorInterface */
protected $generator;
/**
@@ -30,7 +31,7 @@ class PiggyBankController extends Controller
{
parent::__construct();
// create chart generator:
$this->generator = app('FireflyIII\Generator\Chart\PiggyBank\PiggyBankChartGeneratorInterface');
$this->generator = app(PiggyBankChartGeneratorInterface::class);
}
/**

5
app/Http/Controllers/Chart/ReportController.php
View File

@@ -5,6 +5,7 @@ namespace FireflyIII\Http\Controllers\Chart;
use Carbon\Carbon;
use FireflyIII\Generator\Chart\Report\ReportChartGeneratorInterface;
use FireflyIII\Helpers\Report\ReportQueryInterface;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Support\CacheProperties;
@@ -20,7 +21,7 @@ use Steam;
class ReportController extends Controller
{
/** @var \FireflyIII\Generator\Chart\Report\ReportChartGeneratorInterface */
/** @var ReportChartGeneratorInterface */
protected $generator;
/**
@@ -30,7 +31,7 @@ class ReportController extends Controller
{
parent::__construct();
// create chart generator:
$this->generator = app('FireflyIII\Generator\Chart\Report\ReportChartGeneratorInterface');
$this->generator = app(ReportChartGeneratorInterface::class);
}
/**