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

Code cleanup.

Browse Source
This commit is contained in:
James Cole
2017-11-22 21:12:27 +01:00
parent 4e6b782204
commit 781ca052d8
142 changed files with 213 additions and 859 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/Http/Controllers/Account/ReconcileController.php
View File

@@ -70,11 +70,12 @@ class ReconcileController extends Controller
* @param Carbon $end
*
* @return \Illuminate\Http\JsonResponse
*
* @throws FireflyException
*/
public function overview(Request $request, Account $account, Carbon $start, Carbon $end)
{
if ($account->accountType->type !== AccountType::ASSET) {
if (AccountType::ASSET !== $account->accountType->type) {
throw new FireflyException(sprintf('Account %s is not an asset account.', $account->name));
}
$startBalance = $request->get('startBalance');
@@ -102,7 +103,7 @@ class ReconcileController extends Controller
foreach ($cleared as $transaction) {
if ($transaction->transactionJournal->date <= $end) {
$clearedAmount = bcadd($clearedAmount, $transaction->amount);
$countCleared++;
++$countCleared;
}
}
@@ -120,7 +121,7 @@ class ReconcileController extends Controller
'accounts.reconcile.overview',
compact(
'account', 'start', 'diffCompare', 'difference', 'end', 'clearedIds', 'transactionIds', 'clearedAmount', 'startBalance', 'endBalance', 'amount',
'route','countCleared'
'route', 'countCleared'
)
)->render();
@@ -212,7 +213,7 @@ class ReconcileController extends Controller
}
// create reconciliation transaction (if necessary):
if ($request->get('reconcile') === 'create') {
if ('create' === $request->get('reconcile')) {
/** @var AccountRepositoryInterface $accountRepos */
$accountRepos = app(AccountRepositoryInterface::class);
$reconciliation = $accountRepos->getReconciliation($account);
@@ -243,8 +244,6 @@ class ReconcileController extends Controller
Session::flash('success', trans('firefly.reconciliation_stored'));
return redirect(route('accounts.show', [$account->id]));
}
/**

9
app/Http/Controllers/Auth/LoginController.php
View File

@@ -74,7 +74,7 @@ class LoginController extends Controller
/**
* Handle a login request to the application.
*
* @param \Illuminate\Http\Request $request
* @param \Illuminate\Http\Request $request
*
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Http\Response|\Illuminate\Http\JsonResponse
*/
@@ -92,7 +92,6 @@ class LoginController extends Controller
}
if ($this->attemptLogin($request)) {
// user is logged in. Save in session if the user requested session to be remembered:
$request->session()->put('remember_login', $request->filled('remember'));
@@ -110,7 +109,8 @@ class LoginController extends Controller
/**
* Log the user out of the application.
*
* @param \Illuminate\Http\Request $request
* @param \Illuminate\Http\Request $request
*
* @return \Illuminate\Http\Response
*/
public function logout(Request $request, CookieJar $cookieJar)
@@ -166,7 +166,6 @@ class LoginController extends Controller
$email = $request->old('email');
$remember = $request->old('remember');
return view('auth.login', compact('allowRegistration', 'email', 'remember'));//->withCookie($cookie);
return view('auth.login', compact('allowRegistration', 'email', 'remember')); //->withCookie($cookie);
}
}

10
app/Http/Controllers/Auth/TwoFactorController.php
View File

@@ -74,9 +74,9 @@ class TwoFactorController extends Controller
*/
public function lostTwoFactor()
{
$user = auth()->user();
$user = auth()->user();
$siteOwner = env('SITE_OWNER', '');
$title = strval(trans('firefly.two_factor_forgot_title'));
$title = strval(trans('firefly.two_factor_forgot_title'));
Log::info(
'To reset the two factor authentication for user #' . $user->id .
@@ -99,10 +99,8 @@ class TwoFactorController extends Controller
// wants to remember session?
$remember = $request->session()->get('remember_login') ?? false;
$minutes = config('session.lifetime');
if ($remember === true) {
$minutes = config('session.lifetime');
if (true === $remember) {
// set cookie with a long lifetime (30 days)
$minutes = 43200;
}

1
app/Http/Middleware/AuthenticateTwoFactor.php
View File

@@ -23,7 +23,6 @@ declare(strict_types=1);
namespace FireflyIII\Http\Middleware;
use Closure;
use Cookie;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
use Log;

1
app/Http/Middleware/RedirectIfTwoFactorAuthenticated.php
View File

@@ -23,7 +23,6 @@ declare(strict_types=1);
namespace FireflyIII\Http\Middleware;
use Closure;
use Cookie;
use Illuminate\Support\Facades\Auth;
use Preferences;

3
app/Import/Converter/Amount.php
View File

@@ -88,7 +88,8 @@ class Amount implements ConverterInterface
Log::debug(sprintf('No decimal character found. Converted amount from "%s" to "%s".', $oldValue, $value));
}
$number = strval(number_format(round(floatval($value), 12), 12,'.',''));
$number = strval(number_format(round(floatval($value), 12), 12, '.', ''));
return $number;
}
}

3
app/Import/Object/ImportJournal.php
View File

@@ -24,7 +24,6 @@ namespace FireflyIII\Import\Object;
use Carbon\Carbon;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Import\Converter\Amount;
use FireflyIII\Import\Converter\ConverterInterface;
use FireflyIII\Import\MapperPreProcess\PreProcessorInterface;
use FireflyIII\User;
@@ -131,7 +130,7 @@ class ImportJournal
$converterClass = sprintf('FireflyIII\Import\Converter\%s', config(sprintf('csv.import_roles.%s.converter', $this->amountCredit['role'])));
$info = $this->amountCredit;
}
if (count($info) === 0) {
if (0 === count($info)) {
throw new FireflyException('No amount information for this row.');
}

3
app/Repositories/Account/FindAccountsTrait.php
View File

@@ -228,11 +228,12 @@ trait FindAccountsTrait
* @param Account $account
*
* @return Account|null
*
* @throws FireflyException
*/
public function getReconciliation(Account $account): ?Account
{
if ($account->accountType->type !== AccountType::ASSET) {
if (AccountType::ASSET !== $account->accountType->type) {
throw new FireflyException(sprintf('%s is not an asset account.', $account->name));
}
$name = $account->name . ' reconciliation';

2
app/Repositories/Journal/JournalRepository.php
View File

@@ -189,7 +189,7 @@ class JournalRepository implements JournalRepositoryInterface
->where('transaction_journals.user_id', $this->user->id)
->whereNull('transaction_journals.deleted_at')
->whereNull('transactions.deleted_at')
->get( ['transactions.*']);
->get(['transactions.*']);
return $set;
}

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

@@ -35,15 +35,6 @@ use Illuminate\Support\MessageBag;
*/
interface JournalRepositoryInterface
{
/**
* @param array $transactionIds
*
* @return Collection
*/
public function getTransactionsById(array $transactionIds): Collection;
/**
* @param TransactionJournal $journal
* @param TransactionType $type
@@ -105,6 +96,13 @@ interface JournalRepositoryInterface
*/
public function getTransactionTypes(): Collection;
/**
* @param array $transactionIds
*
* @return Collection
*/
public function getTransactionsById(array $transactionIds): Collection;
/**
* @param TransactionJournal $journal
*

2
app/Support/Import/Configuration/Csv/Roles.php
View File

@@ -258,7 +258,7 @@ class Roles implements ConfigurationInterface
if ('_ignore' !== $role) {
++$assigned;
}
if (in_array($role, ['amount','amount_credit','amount_debet'])) {
if (in_array($role, ['amount', 'amount_credit', 'amount_debet'])) {
$hasAmount = true;
}
}

1
app/Support/Preferences.php
View File

@@ -127,7 +127,6 @@ class Preferences
{
$fullName = sprintf('preference%s%s', $user->id, $name);
if (Cache::has($fullName)) {
return Cache::get($fullName);
}

6
app/Support/Twig/Extension/Transaction.php
View File

@@ -58,7 +58,7 @@ class Transaction extends Twig_Extension
$coloured = true;
// at this point amount is always negative.
if ($transaction->transaction_type_type === TransactionType::RECONCILIATION && bccomp(strval($transaction->transaction_amount),'0') === 1) {
if (TransactionType::RECONCILIATION === $transaction->transaction_type_type && 1 === bccomp(strval($transaction->transaction_amount), '0')) {
$amount = bcmul($amount, '-1');
}
@@ -290,7 +290,7 @@ class Transaction extends Twig_Extension
return $cache->get();
}
if($transaction->transaction_type_type === TransactionType::RECONCILIATION) {
if (TransactionType::RECONCILIATION === $transaction->transaction_type_type) {
return '&mdash;';
}
@@ -476,7 +476,7 @@ class Transaction extends Twig_Extension
if ($cache->has()) {
return $cache->get();
}
if($transaction->transaction_type_type === TransactionType::RECONCILIATION) {
if (TransactionType::RECONCILIATION === $transaction->transaction_type_type) {
return '&mdash;';
}

31
app/Support/Twig/General.php
View File

@@ -148,21 +148,6 @@ class General extends Twig_Extension
);
}
/**
* @return Twig_SimpleFilter
*/
protected function markdown(): Twig_SimpleFilter
{
return new Twig_SimpleFilter(
'markdown',
function (string $text): string {
$converter = new CommonMarkConverter;
return $converter->convertToHtml($text);
},['is_safe' => ['html']]
);
}
/**
* @return Twig_SimpleFilter
*/
@@ -181,7 +166,6 @@ class General extends Twig_Extension
);
}
/**
* @return Twig_SimpleFunction
*/
@@ -244,6 +228,21 @@ class General extends Twig_Extension
);
}
/**
* @return Twig_SimpleFilter
*/
protected function markdown(): Twig_SimpleFilter
{
return new Twig_SimpleFilter(
'markdown',
function (string $text): string {
$converter = new CommonMarkConverter;
return $converter->convertToHtml($text);
}, ['is_safe' => ['html']]
);
}
/**
* @return Twig_SimpleFilter
*/