Automated code cleanup.

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

View File

@@ -1,6 +1,5 @@
<?php namespace FireflyIII\Http\Controllers; <?php namespace FireflyIII\Http\Controllers;
use Amount;
use Auth; use Auth;
use Carbon\Carbon; use Carbon\Carbon;
use Config; use Config;
@@ -166,7 +165,6 @@ class AccountController extends Controller
$journals->setPath('accounts/show/' . $account->id); $journals->setPath('accounts/show/' . $account->id);
return view('accounts.show', compact('account', 'what', 'subTitleIcon', 'journals', 'subTitle')); return view('accounts.show', compact('account', 'what', 'subTitleIcon', 'journals', 'subTitle'));
} }

View File

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

View File

@@ -2,12 +2,13 @@
use Auth; use Auth;
use Carbon\Carbon; use Carbon\Carbon;
use Config;
use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use Input; use Input;
use Preferences; use Preferences;
use Session;
use Redirect; use Redirect;
use Config; use Session;
/** /**
* Class HomeController * Class HomeController
* *
@@ -31,8 +32,10 @@ class HomeController extends Controller
Session::put('end', $end); Session::put('end', $end);
} }
public function flush() { public function flush()
{
Session::clear(); Session::clear();
return Redirect::route('index'); return Redirect::route('index');
} }

View File

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

View File

@@ -16,8 +16,8 @@ use Input;
use Redirect; use Redirect;
use Session; use Session;
use Steam; use Steam;
use View;
use URL; use URL;
use View;
/** /**
* Class PiggyBankController * Class PiggyBankController
@@ -326,6 +326,7 @@ class PiggyBankController extends Controller
if (intval(Input::get('create_another')) === 1) { if (intval(Input::get('create_another')) === 1) {
Session::put('piggy-banks.create.fromStore', true); Session::put('piggy-banks.create.fromStore', true);
return Redirect::route('piggy-banks.create')->withInput(); return Redirect::route('piggy-banks.create')->withInput();
} }
@@ -360,6 +361,7 @@ class PiggyBankController extends Controller
if (intval(Input::get('return_to_edit')) === 1) { if (intval(Input::get('return_to_edit')) === 1) {
Session::put('piggy-banks.edit.fromUpdate', true); Session::put('piggy-banks.edit.fromUpdate', true);
return Redirect::route('piggy-banks.edit', $piggyBank->id); return Redirect::route('piggy-banks.edit', $piggyBank->id);
} }

View File

@@ -11,7 +11,6 @@ use Preferences;
use Session; use Session;
use Steam; use Steam;
use View; use View;
use Crypt;
/** /**
* Class ReportController * Class ReportController

View File

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

View File

@@ -3,9 +3,7 @@
namespace FireflyIII\Http\Requests; namespace FireflyIII\Http\Requests;
use Auth; use Auth;
use Carbon\Carbon;
use Input; use Input;
use Navigation;
/** /**
* Class PiggyBankFormRequest * Class PiggyBankFormRequest

View File

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

View File

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

View File

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

View File

@@ -1,9 +1,10 @@
<?php namespace FireflyIII\Models; <?php namespace FireflyIII\Models;
use Carbon\Carbon; use Carbon\Carbon;
use Crypt;
use Illuminate\Database\Eloquent\Builder as EloquentBuilder; use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
use Crypt;
/** /**
* Class Reminder * Class Reminder
* *
@@ -43,6 +44,7 @@ class Reminder extends Model
if (intval($this->encrypted) == 1) { if (intval($this->encrypted) == 1) {
return json_decode(Crypt::decrypt($value)); return json_decode(Crypt::decrypt($value));
} }
return json_decode($value); return json_decode($value);
} }

View File

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

View File

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

View File

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

View File

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