IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Small code cleanup.

Browse Source
This commit is contained in:
James Cole 2017-08-11 05:42:15 +02:00
parent bc0ef11a8c
commit 04a2cd1f1f
No known key found for this signature in database
GPG Key ID: C16961E655E74B5E
8 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Auth/RegisterController.php
View File

@ -53,7 +53,7 @@ class RegisterController extends Controller
} }
/** /**
* @param Request $request * @param UserRegistrationRequest|Request $request
* *
* @return \Illuminate\Contracts\View\Factory|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector|\Illuminate\View\View * @return \Illuminate\Contracts\View\Factory|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector|\Illuminate\View\View
*/ */

2
app/Http/Controllers/CategoryController.php
View File

@ -227,8 +227,6 @@ class CategoryController extends Controller
$subTitleIcon = 'fa-bar-chart'; $subTitleIcon = 'fa-bar-chart';
$page = intval($request->get('page')); $page = intval($request->get('page'));
$pageSize = intval(Preferences::get('transactionPageSize', 50)->data); $pageSize = intval(Preferences::get('transactionPageSize', 50)->data);
$count = 0;
$loop = 0;
$range = Preferences::get('viewRange', '1M')->data; $range = Preferences::get('viewRange', '1M')->data;
$start = null; $start = null;
$end = null; $end = null;

4
app/Http/Controllers/Transaction/SingleController.php
View File

@ -199,10 +199,10 @@ class SingleController extends Controller
} }
/** /**
* @param JournalRepositoryInterface $repository * @param TransactionJournal $transactionJournal
* @param TransactionJournal $transactionJournal
* *
* @return \Illuminate\Http\RedirectResponse * @return \Illuminate\Http\RedirectResponse
* @internal param JournalRepositoryInterface $repository
*/ */
public function destroy(TransactionJournal $transactionJournal) public function destroy(TransactionJournal $transactionJournal)
{ {

2
app/Http/Controllers/TransactionController.php
View File

@ -72,8 +72,6 @@ class TransactionController extends Controller
$types = config('firefly.transactionTypesByWhat.' . $what); $types = config('firefly.transactionTypesByWhat.' . $what);
$page = intval($request->get('page')); $page = intval($request->get('page'));
$pageSize = intval(Preferences::get('transactionPageSize', 50)->data); $pageSize = intval(Preferences::get('transactionPageSize', 50)->data);
$count = 0;
$loop = 0;
$range = Preferences::get('viewRange', '1M')->data; $range = Preferences::get('viewRange', '1M')->data;
$start = null; $start = null;
$end = null; $end = null;

2
public/js/ff/charts.js
View File

@ -7,7 +7,7 @@
* *
* See the LICENSE file for details. * See the LICENSE file for details.
*/ */
/** global: Chart, defaultChartOptions, accounting, defaultPieOptions, noDataForChart, noDataForChart */ /** global: Chart, defaultChartOptions, accounting, defaultPieOptions, noDataForChart */
var allCharts = {}; var allCharts = {};
/* /*

3
public/js/ff/export/index.js
View File

@ -78,8 +78,7 @@ function showDownload() {
function showError(text) { function showError(text) {
"use strict"; "use strict";
$('#export-error').show(); $('#export-error').show().find('p').text(text);
$('#export-error').find('p').text(text);
} }
function callExport() { function callExport() {

1
tests/Feature/Controllers/TagControllerTest.php
View File

@ -83,7 +83,6 @@ class TagControllerTest extends TestCase
public function testEdit() public function testEdit()
{ {
// mock stuff // mock stuff
$repository = $this->mock(TagRepositoryInterface::class);
$journalRepos = $this->mock(JournalRepositoryInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class);
$journalRepos->shouldReceive('first')->once()->andReturn(new TransactionJournal); $journalRepos->shouldReceive('first')->once()->andReturn(new TransactionJournal);

7
tests/Unit/Helpers/MetaPieChartTest.php
View File

@ -22,9 +22,6 @@ use FireflyIII\Models\Account;
use FireflyIII\Models\Transaction; use FireflyIII\Models\Transaction;
use FireflyIII\Models\TransactionType; use FireflyIII\Models\TransactionType;
use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
use FireflyIII\Repositories\Tag\TagRepositoryInterface;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
use Tests\TestCase; use Tests\TestCase;
@ -62,7 +59,7 @@ class MetaPieChartTest extends TestCase
$collector->shouldReceive('getJournals')->andReturn($collection); $collector->shouldReceive('getJournals')->andReturn($collection);
// mock all repositories: // mock all repositories:
$accountRepos = $this->mock(AccountRepositoryInterface::class); $accountRepos = $this->mock(AccountRepositoryInterface::class);
$accountRepos->shouldReceive('setUser'); $accountRepos->shouldReceive('setUser');
$accountRepos->shouldReceive('find')->withArgs([1])->andReturn($accounts[1]); $accountRepos->shouldReceive('find')->withArgs([1])->andReturn($accounts[1]);
@ -122,7 +119,7 @@ class MetaPieChartTest extends TestCase
$collector->shouldReceive('getJournals')->andReturn($others)->once(); $collector->shouldReceive('getJournals')->andReturn($others)->once();
// mock all repositories: // mock all repositories:
$accountRepos = $this->mock(AccountRepositoryInterface::class); $accountRepos = $this->mock(AccountRepositoryInterface::class);
$accountRepos->shouldReceive('setUser'); $accountRepos->shouldReceive('setUser');
$accountRepos->shouldReceive('find')->withArgs([1])->andReturn($accounts[1]); $accountRepos->shouldReceive('find')->withArgs([1])->andReturn($accounts[1]);