IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2024-12-25 16:31:15 -06:00
Code Issues Packages 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
Show Stats 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'));
}

1
app/Models/Account.php
View File

@ -54,6 +54,7 @@ class Account extends Model
App::abort(500, 'Could not create new account with data: ' . json_encode($fields));
}
return $account;
}

4
app/Models/Category.php
View File

@ -1,8 +1,9 @@
<?php namespace FireflyIII\Models;
use Crypt;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\SoftDeletes;
use Crypt;
/**
* Class Category
*
@ -46,6 +47,7 @@ class Category extends Model
$this->attributes['name'] = Crypt::encrypt($value);
$this->attributes['encrypted'] = true;
}
/**
* @param $value
*

4
app/Models/PiggyBank.php
View File

@ -1,8 +1,9 @@
<?php namespace FireflyIII\Models;
use Crypt;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\SoftDeletes;
use Crypt;
/**
* Class PiggyBank
*
@ -92,6 +93,7 @@ class PiggyBank extends Model
$this->attributes['name'] = Crypt::encrypt($value);
$this->attributes['encrypted'] = true;
}
/**
* @param $value
*

6
app/Models/Reminder.php
View File

@ -1,9 +1,10 @@
<?php namespace FireflyIII\Models;
use Carbon\Carbon;
use Crypt;
use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
use Illuminate\Database\Eloquent\Model;
use Crypt;
/**
* Class Reminder
*
@ -43,6 +44,7 @@ class Reminder extends Model
if (intval($this->encrypted) == 1) {
return json_decode(Crypt::decrypt($value));
}
return json_decode($value);
}
@ -90,7 +92,7 @@ class Reminder extends Model
public function setMetadataAttribute($value)
{
$this->attributes['encrypted'] = true;
$this->attributes['metadata'] = Crypt::encrypt(json_encode($value));
$this->attributes['metadata'] = Crypt::encrypt(json_encode($value));
}
/**

5
app/Models/Transaction.php
View File

@ -1,10 +1,11 @@
<?php namespace FireflyIII\Models;
use Carbon\Carbon;
use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\SoftDeletes;
use Watson\Validating\ValidatingTrait;
use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
use Carbon\Carbon;
/**
* Class Transaction
*

15
app/Providers/EventServiceProvider.php
View File

@ -13,6 +13,7 @@ use Illuminate\Database\QueryException;
use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider;
use Log;
use Reminder;
/**
* Class EventServiceProvider
*
@ -60,13 +61,15 @@ class EventServiceProvider extends ServiceProvider
);
PiggyBank::deleting(function(PiggyBank $piggyBank) {
$reminders = $piggyBank->reminders()->get();
/** @var Reminder $reminder */
foreach($reminders as $reminder) {
$reminder->delete();
PiggyBank::deleting(
function (PiggyBank $piggyBank) {
$reminders = $piggyBank->reminders()->get();
/** @var Reminder $reminder */
foreach ($reminders as $reminder) {
$reminder->delete();
}
}
});
);
Account::deleted(

1
app/Repositories/Bill/BillRepositoryInterface.php
View File

@ -89,7 +89,6 @@ interface BillRepositoryInterface
public function lastFoundMatch(Bill $bill);
/**
* @param Bill $bill
*

3
app/Repositories/Journal/JournalRepositoryInterface.php
View File

@ -2,8 +2,8 @@
namespace FireflyIII\Repositories\Journal;
use FireflyIII\Models\TransactionJournal;
use FireflyIII\Models\Transaction;
use FireflyIII\Models\TransactionJournal;
use Illuminate\Support\Collection;
/**
@ -48,6 +48,7 @@ interface JournalRepositoryInterface
/**
* Get users first transaction journal
*
* @return TransactionJournal
*/
public function first();

6
app/Validation/FireflyValidator.php
View File

@ -223,10 +223,10 @@ class FireflyValidator extends Validator
}
$set = $query->get(['piggy_banks.*']);
foreach($set as $entry) {
foreach ($set as $entry) {
$isEncrypted = intval($entry->encrypted) == 1 ? true : false;
$checkValue = $isEncrypted ? Crypt::decrypt($entry->name) : $entry->name;
if($checkValue == $value) {
$checkValue = $isEncrypted ? Crypt::decrypt($entry->name) : $entry->name;
if ($checkValue == $value) {
return false;
}
}