kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 15:35:15 +00:00
Code Issues Projects Releases Wiki Activity

Automated code cleanup.

Browse Source
This commit is contained in:
James Cole
2015-04-07 18:26:14 +02:00
parent bf354275b3
commit 0d336727e8
20 changed files with 48 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/AccountController.php
View File

@@ -1,6 +1,5 @@
<?php namespace FireflyIII\Http\Controllers;
use Amount;
use Auth;
use Carbon\Carbon;
use Config;
@@ -166,7 +165,6 @@ class AccountController extends Controller
$journals->setPath('accounts/show/' . $account->id);
return view('accounts.show', compact('account', 'what', 'subTitleIcon', 'journals', 'subTitle'));
}
@@ -192,7 +190,7 @@ class AccountController extends Controller
];
$account = $repository->store($accountData);
Session::flash('success', 'New account "' . $account->name . '" stored!');
Session::flash('success', 'New account "' . $account->name . '" stored!');
if (intval(Input::get('create_another')) === 1) {
return Redirect::route('accounts.create', $request->input('what'))->withInput();

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

@@ -173,7 +173,7 @@ class BillController extends Controller
*/
public function show(Bill $bill, BillRepositoryInterface $repository)
{
$journals = $repository->getJournals($bill);
$journals = $repository->getJournals($bill);
$bill->nextExpectedMatch = $repository->nextExpectedMatch($bill);
$hideBill = true;

3
app/Http/Controllers/HelpController.php
View File

@@ -3,9 +3,10 @@
use Cache;
use ErrorException;
use League\CommonMark\CommonMarkConverter;
use Log;
use Response;
use Route;
use Log;
/**
* Class HelpController
*

11
app/Http/Controllers/HomeController.php
View File

@@ -2,12 +2,13 @@
use Auth;
use Carbon\Carbon;
use Config;
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use Input;
use Preferences;
use Session;
use Redirect;
use Config;
use Session;
/**
* Class HomeController
*
@@ -31,8 +32,10 @@ class HomeController extends Controller
Session::put('end', $end);
}
public function flush() {
public function flush()
{
Session::clear();
return Redirect::route('index');
}
@@ -42,7 +45,7 @@ class HomeController extends Controller
public function index(AccountRepositoryInterface $repository)
{
$types = Config::get('firefly.accountTypesByIdentifier.asset');
$types = Config::get('firefly.accountTypesByIdentifier.asset');
$count = $repository->countAccounts($types);
$title = 'Firefly';
$subTitle = 'What\'s playing?';

1
app/Http/Controllers/JsonController.php
View File

@@ -2,7 +2,6 @@
use Amount;
use Auth;
use Carbon\Carbon;
use DB;
use FireflyIII\Models\Account;
use FireflyIII\Models\Bill;

6
app/Http/Controllers/PiggyBankController.php
View File

@@ -16,8 +16,8 @@ use Input;
use Redirect;
use Session;
use Steam;
use View;
use URL;
use View;
/**
* Class PiggyBankController
@@ -170,7 +170,7 @@ class PiggyBankController extends Controller
if (!isset($accounts[$account->id])) {
$accounts[$account->id] = [
'name' => $account->name,
'balance' => Steam::balance($account,null,true),
'balance' => Steam::balance($account, null, true),
'leftForPiggyBanks' => $repository->leftOnAccount($account),
'sumOfSaved' => $piggyBank->savedSoFar,
'sumOfTargets' => floatval($piggyBank->targetamount),
@@ -326,6 +326,7 @@ class PiggyBankController extends Controller
if (intval(Input::get('create_another')) === 1) {
Session::put('piggy-banks.create.fromStore', true);
return Redirect::route('piggy-banks.create')->withInput();
}
@@ -360,6 +361,7 @@ class PiggyBankController extends Controller
if (intval(Input::get('return_to_edit')) === 1) {
Session::put('piggy-banks.edit.fromUpdate', true);
return Redirect::route('piggy-banks.edit', $piggyBank->id);
}

3
app/Http/Controllers/ReportController.php
View File

@@ -11,7 +11,6 @@ use Preferences;
use Session;
use Steam;
use View;
use Crypt;
/**
* Class ReportController
@@ -246,7 +245,7 @@ class ReportController extends Controller
/**
* Start getExpenseGroupedForMonth DONE
*/
$set = $this->query->journalsByExpenseAccount($start, $end, $showSharedReports);
$set = $this->query->journalsByExpenseAccount($start, $end, $showSharedReports);
$expenses = Steam::makeArray($set);
$expenses = Steam::sortArray($expenses);

6
app/Http/Middleware/PiggyBanks.php
View File

@@ -3,17 +3,13 @@
namespace FireflyIII\Http\Middleware;
use Carbon\Carbon;
use App;
use Closure;
use FireflyIII\Models\PiggyBank;
use FireflyIII\Models\PiggyBankRepetition;
use Illuminate\Contracts\Auth\Guard;
use Illuminate\Database\Query\JoinClause;
use Illuminate\Http\Request;
use Illuminate\Support\Collection;
use Navigation;
use Session;
use App;
/**
* Class PiggyBanks

2
app/Http/Requests/BudgetFormRequest.php
View File

@@ -30,7 +30,7 @@ class BudgetFormRequest extends Request
$nameRule = 'required|between:1,100|uniqueObjectForUser:budgets,name,encrypted';
if (Budget::find(Input::get('id'))) {
$nameRule = 'required|between:1,100|uniqueObjectForUser:budgets,name,encrypted,'.intval(Input::get('id'));
$nameRule = 'required|between:1,100|uniqueObjectForUser:budgets,name,encrypted,' . intval(Input::get('id'));
}
return [

2
app/Http/Requests/CategoryFormRequest.php
View File

@@ -30,7 +30,7 @@ class CategoryFormRequest extends Request
$nameRule = 'required|between:1,100|uniqueObjectForUser:categories,name,encrypted';
if (Category::find(Input::get('id'))) {
$nameRule = 'required|between:1,100|uniqueObjectForUser:categories,name,encrypted,'.intval(Input::get('id'));
$nameRule = 'required|between:1,100|uniqueObjectForUser:categories,name,encrypted,' . intval(Input::get('id'));
}
return [

4
app/Http/Requests/PiggyBankFormRequest.php
View File

@@ -3,9 +3,7 @@
namespace FireflyIII\Http\Requests;
use Auth;
use Carbon\Carbon;
use Input;
use Navigation;
/**
* Class PiggyBankFormRequest
@@ -32,7 +30,7 @@ class PiggyBankFormRequest extends Request
$nameRule = 'required|between:1,255|uniquePiggyBankForUser';
$targetDateRule = 'date';
if (intval(Input::get('id'))) {
$nameRule = 'required|between:1,255|uniquePiggyBankForUser:'.intval(Input::get('id'));
$nameRule = 'required|between:1,255|uniquePiggyBankForUser:' . intval(Input::get('id'));
}