kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-05 04:03:26 +00:00
Code Issues Projects Releases Wiki Activity

Various code cleanup.

Browse Source
This commit is contained in:
James Cole
2021-04-06 17:00:16 +02:00
parent 8572280b7b
commit 38d0f0427f
61 changed files with 419 additions and 369 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/Http/Controllers/Account/DeleteController.php
View File

@@ -26,7 +26,6 @@ namespace FireflyIII\Http\Controllers\Account;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Models\Account;
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Support\Http\Controllers\UserNavigation;
use Illuminate\Contracts\View\Factory;
use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Request;
@@ -38,8 +37,6 @@ use Illuminate\View\View;
*/
class DeleteController extends Controller
{
use UserNavigation;
/** @var AccountRepositoryInterface The account repository */
private $repository;

3
app/Http/Controllers/Account/EditController.php
View File

@@ -30,7 +30,6 @@ use FireflyIII\Models\Account;
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
use FireflyIII\Support\Http\Controllers\ModelInformation;
use FireflyIII\Support\Http\Controllers\UserNavigation;
use Illuminate\Contracts\View\Factory;
use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Request;
@@ -43,7 +42,7 @@ use Illuminate\View\View;
*/
class EditController extends Controller
{
use ModelInformation, UserNavigation;
use ModelInformation;
private AttachmentHelperInterface $attachments;
/** @var CurrencyRepositoryInterface The currency repository */

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

@@ -36,7 +36,6 @@ use FireflyIII\Models\TransactionType;
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
use FireflyIII\Support\Http\Controllers\UserNavigation;
use FireflyIII\User;
use Illuminate\Contracts\View\Factory;
use Illuminate\Http\RedirectResponse;
@@ -49,8 +48,6 @@ use Log;
*/
class ReconcileController extends Controller
{
use UserNavigation;
/** @var AccountRepositoryInterface The account repository */
private $accountRepos;
/** @var CurrencyRepositoryInterface The currency repository */

3
app/Http/Controllers/Account/ShowController.php
View File

@@ -31,7 +31,6 @@ use FireflyIII\Models\Account;
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
use FireflyIII\Support\Http\Controllers\PeriodOverview;
use FireflyIII\Support\Http\Controllers\UserNavigation;
use Illuminate\Contracts\View\Factory;
use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Request;
@@ -45,7 +44,7 @@ use Illuminate\View\View;
*/
class ShowController extends Controller
{
use UserNavigation, PeriodOverview;
use PeriodOverview;
private CurrencyRepositoryInterface $currencyRepos;
private AccountRepositoryInterface $repository;

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

@@ -39,6 +39,7 @@ use Illuminate\View\View;
*/
class AttachmentController extends Controller
{
/** @var AttachmentRepositoryInterface Attachment repository */
private $repository;

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

@@ -27,7 +27,6 @@ use FireflyIII\Events\RegisteredUser;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Support\Http\Controllers\CreateStuff;
use FireflyIII\Support\Http\Controllers\RequestInformation;
use FireflyIII\User;
use Illuminate\Contracts\View\Factory;
use Illuminate\Foundation\Auth\RegistersUsers;
@@ -48,7 +47,7 @@ use Log;
*/
class RegisterController extends Controller
{
use RegistersUsers, RequestInformation, CreateStuff;
use RegistersUsers, CreateStuff;
/**
* Where to redirect users after registration.

2
app/Http/Controllers/Budget/ShowController.php
View File

@@ -46,7 +46,7 @@ class ShowController extends Controller
{
use PeriodOverview, AugumentData;
private JournalRepositoryInterface $journalRepos;
protected JournalRepositoryInterface $journalRepos;
private BudgetRepositoryInterface $repository;
/**

3
app/Http/Controllers/Category/NoCategoryController.php
View File

@@ -43,8 +43,7 @@ class NoCategoryController extends Controller
{
use PeriodOverview;
/** @var JournalRepositoryInterface Journals and transactions overview */
private $journalRepos;
protected JournalRepositoryInterface $journalRepos;
/**
* CategoryController constructor.

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

@@ -36,15 +36,11 @@ use Route;
*/
abstract class Controller extends BaseController
{
use AuthorizesRequests, DispatchesJobs, ValidatesRequests, UserNavigation, RequestInformation;
use AuthorizesRequests, DispatchesJobs, ValidatesRequests, RequestInformation, UserNavigation;
/** @var string Format for date and time. */
protected string $dateTimeFormat;
/** @var string Format for "23 Feb, 2016". */
protected string $monthAndDayFormat;
/** @var string Format for "March 2018" */
protected string $monthFormat;
/** @var string Redirect user */
protected string $redirectUri = '/';
/**

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

@@ -22,7 +22,6 @@ declare(strict_types=1);
namespace FireflyIII\Http\Controllers;
use FireflyIII\Support\Http\Controllers\RequestInformation;
use Illuminate\Http\JsonResponse;
/**
@@ -30,8 +29,6 @@ use Illuminate\Http\JsonResponse;
*/
class HelpController extends Controller
{
use RequestInformation;
/**
* Show help for a route.
*

3
app/Http/Controllers/Json/BoxController.php
View File

@@ -36,7 +36,6 @@ use FireflyIII\Repositories\Budget\AvailableBudgetRepositoryInterface;
use FireflyIII\Repositories\Budget\OperationsRepositoryInterface;
use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
use FireflyIII\Support\CacheProperties;
use FireflyIII\Support\Http\Controllers\RequestInformation;
use Illuminate\Http\JsonResponse;
use Log;
@@ -45,8 +44,6 @@ use Log;
*/
class BoxController extends Controller
{
use RequestInformation;
/**
* This box has three types of info to display:
* 0) If the user has available amount this period and has overspent: overspent box.

3
app/Http/Controllers/Json/IntroController.php
View File

@@ -22,6 +22,7 @@ declare(strict_types=1);
namespace FireflyIII\Http\Controllers\Json;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Support\Http\Controllers\GetConfigurationData;
use Illuminate\Http\JsonResponse;
use Log;
@@ -29,7 +30,7 @@ use Log;
/**
* Class IntroController.
*/
class IntroController
class IntroController extends Controller
{
use GetConfigurationData;

3
app/Http/Controllers/Json/ReconcileController.php
View File

@@ -32,7 +32,6 @@ use FireflyIII\Models\TransactionType;
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
use FireflyIII\Support\Http\Controllers\UserNavigation;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
use Illuminate\Support\Collection;
@@ -45,8 +44,6 @@ use Throwable;
*/
class ReconcileController extends Controller
{
use UserNavigation;
private AccountRepositoryInterface $accountRepos;
private CurrencyRepositoryInterface $currencyRepos;
private JournalRepositoryInterface $repository;

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

@@ -24,7 +24,6 @@ namespace FireflyIII\Http\Controllers\Popup;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Support\Http\Controllers\RenderPartialViews;
use FireflyIII\Support\Http\Controllers\RequestInformation;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
@@ -34,7 +33,7 @@ use Illuminate\Http\Request;
*/
class ReportController extends Controller
{
use RequestInformation, RenderPartialViews;
use RenderPartialViews;
/**
* Generate popup view.

52
app/Http/Controllers/ProfileController.php
View File

@@ -35,7 +35,6 @@ use FireflyIII\Http\Requests\TokenFormRequest;
use FireflyIII\Models\Preference;
use FireflyIII\Repositories\User\UserRepositoryInterface;
use FireflyIII\Support\Http\Controllers\CreateStuff;
use FireflyIII\Support\Http\Controllers\RequestInformation;
use FireflyIII\User;
use Google2FA;
use Hash;
@@ -58,7 +57,7 @@ use PragmaRX\Recovery\Recovery;
*/
class ProfileController extends Controller
{
use RequestInformation, CreateStuff;
use CreateStuff;
protected bool $internalAuth;
protected bool $internalIdentity;
@@ -74,7 +73,7 @@ class ProfileController extends Controller
$this->middleware(
static function ($request, $next) {
app('view')->share('title', (string) trans('firefly.profile'));
app('view')->share('title', (string)trans('firefly.profile'));
app('view')->share('mainTitleIcon', 'fa-user');
return $next($request);
@@ -95,9 +94,11 @@ class ProfileController extends Controller
public function logoutOtherSessions()
{
if (!$this->internalAuth) {
session()->flash('info', (string) trans('firefly.external_auth_disabled'));
session()->flash('info', (string)trans('firefly.external_auth_disabled'));
return redirect(route('profile.index'));
}
return prefixView('profile.logout-other-sessions');
}
@@ -109,7 +110,8 @@ class ProfileController extends Controller
public function postLogoutOtherSessions(Request $request)
{
if (!$this->internalAuth) {
session()->flash('info', (string) trans('firefly.external_auth_disabled'));
session()->flash('info', (string)trans('firefly.external_auth_disabled'));
return redirect(route('profile.index'));
}
$creds = [
@@ -118,11 +120,11 @@ class ProfileController extends Controller
];
if (Auth::once($creds)) {
Auth::logoutOtherDevices($request->get('password'));
session()->flash('info', (string) trans('firefly.other_sessions_logged_out'));
session()->flash('info', (string)trans('firefly.other_sessions_logged_out'));
return redirect(route('profile.index'));
}
session()->flash('error', (string) trans('auth.failed'));
session()->flash('error', (string)trans('auth.failed'));
return redirect(route('profile.index'));
@@ -145,7 +147,7 @@ class ProfileController extends Controller
$title = auth()->user()->email;
$email = auth()->user()->email;
$subTitle = (string) trans('firefly.change_your_email');
$subTitle = (string)trans('firefly.change_your_email');
$subTitleIcon = 'fa-envelope';
return prefixView('profile.change-email', compact('title', 'subTitle', 'subTitleIcon', 'email'));
@@ -167,7 +169,7 @@ class ProfileController extends Controller
}
$title = auth()->user()->email;
$subTitle = (string) trans('firefly.change_your_password');
$subTitle = (string)trans('firefly.change_your_password');
$subTitleIcon = 'fa-key';
return prefixView('profile.change-password', compact('title', 'subTitle', 'subTitleIcon'));
@@ -260,7 +262,7 @@ class ProfileController extends Controller
$repository->unblockUser($user);
// return to login.
session()->flash('success', (string) trans('firefly.login_with_new_email'));
session()->flash('success', (string)trans('firefly.login_with_new_email'));
return redirect(route('login'));
}
@@ -280,7 +282,7 @@ class ProfileController extends Controller
return redirect(route('profile.index'));
}
$title = auth()->user()->email;
$subTitle = (string) trans('firefly.delete_account');
$subTitle = (string)trans('firefly.delete_account');
$subTitleIcon = 'fa-trash';
return prefixView('profile.delete-account', compact('title', 'subTitle', 'subTitleIcon'));
@@ -305,8 +307,8 @@ class ProfileController extends Controller
$user = auth()->user();
$repository->setMFACode($user, null);
session()->flash('success', (string) trans('firefly.pref_two_factor_auth_disabled'));
session()->flash('info', (string) trans('firefly.pref_two_factor_auth_remove_it'));
session()->flash('success', (string)trans('firefly.pref_two_factor_auth_disabled'));
session()->flash('info', (string)trans('firefly.pref_two_factor_auth_remove_it'));
return redirect(route('profile.index'));
}
@@ -335,7 +337,7 @@ class ProfileController extends Controller
// If FF3 already has a secret, just set the two factor auth enabled to 1,
// and let the user continue with the existing secret.
session()->flash('info', (string) trans('firefly.2fa_already_enabled'));
session()->flash('info', (string)trans('firefly.2fa_already_enabled'));
return redirect(route('profile.index'));
}
@@ -370,7 +372,9 @@ class ProfileController extends Controller
$accessToken = app('preferences')->set('access_token', $token);
}
return prefixView('profile.index', compact('subTitle', 'mfaBackupCount', 'userId', 'accessToken', 'enabled2FA', 'isInternalAuth','isInternalIdentity'));
return prefixView(
'profile.index', compact('subTitle', 'mfaBackupCount', 'userId', 'accessToken', 'enabled2FA', 'isInternalAuth', 'isInternalIdentity')
);
}
/**
@@ -420,7 +424,7 @@ class ProfileController extends Controller
$newEmail = $request->string('email');
$oldEmail = $user->email;
if ($newEmail === $user->email) {
session()->flash('error', (string) trans('firefly.email_not_changed'));
session()->flash('error', (string)trans('firefly.email_not_changed'));
return redirect(route('profile.change-email'))->withInput();
}
@@ -430,7 +434,7 @@ class ProfileController extends Controller
Auth::guard()->logout();
$request->session()->invalidate();
session()->flash('success', (string) trans('firefly.email_changed'));
session()->flash('success', (string)trans('firefly.email_changed'));
return redirect(route('index'));
}
@@ -445,7 +449,7 @@ class ProfileController extends Controller
// force user logout.
Auth::guard()->logout();
$request->session()->invalidate();
session()->flash('success', (string) trans('firefly.email_changed'));
session()->flash('success', (string)trans('firefly.email_changed'));
return redirect(route('index'));
}
@@ -480,7 +484,7 @@ class ProfileController extends Controller
}
$repository->changePassword($user, $request->get('new_password'));
session()->flash('success', (string) trans('firefly.password_changed'));
session()->flash('success', (string)trans('firefly.password_changed'));
return redirect(route('profile.index'));
}
@@ -509,7 +513,7 @@ class ProfileController extends Controller
$secret = session()->get('two-factor-secret');
$repository->setMFACode($user, $secret);
session()->flash('success', (string) trans('firefly.saved_preferences'));
session()->flash('success', (string)trans('firefly.saved_preferences'));
app('preferences')->mark();
// also save the code so replay attack is prevented.
@@ -547,7 +551,7 @@ class ProfileController extends Controller
}
if (!Hash::check($request->get('password'), auth()->user()->password)) {
session()->flash('error', (string) trans('firefly.invalid_password'));
session()->flash('error', (string)trans('firefly.invalid_password'));
return redirect(route('profile.delete-account'));
}
@@ -579,7 +583,7 @@ class ProfileController extends Controller
$user = auth()->user();
$token = $user->generateAccessToken();
app('preferences')->set('access_token', $token);
session()->flash('success', (string) trans('firefly.token_regenerated'));
session()->flash('success', (string)trans('firefly.token_regenerated'));
return redirect(route('profile.index'));
}
@@ -619,7 +623,7 @@ class ProfileController extends Controller
/** @var string $match */
$match = null;
foreach ($set as $entry) {
$hashed = hash('sha256', sprintf('%s%s', (string) config('app.key'), $entry->data));
$hashed = hash('sha256', sprintf('%s%s', (string)config('app.key'), $entry->data));
if ($hashed === $hash) {
$match = $entry->data;
break;
@@ -634,7 +638,7 @@ class ProfileController extends Controller
$repository->unblockUser($user);
// return to login.
session()->flash('success', (string) trans('firefly.login_with_old_email'));
session()->flash('success', (string)trans('firefly.login_with_old_email'));
return redirect(route('login'));
}

3
app/Http/Controllers/Rule/SelectController.php
View File

@@ -29,7 +29,6 @@ use FireflyIII\Http\Requests\SelectTransactionsRequest;
use FireflyIII\Http\Requests\TestRuleFormRequest;
use FireflyIII\Models\Rule;
use FireflyIII\Models\RuleTrigger;
use FireflyIII\Support\Http\Controllers\RequestInformation;
use FireflyIII\Support\Http\Controllers\RuleManagement;
use FireflyIII\TransactionRules\Engine\RuleEngineInterface;
use FireflyIII\TransactionRules\TransactionMatcher;
@@ -48,7 +47,7 @@ use Throwable;
*/
class SelectController extends Controller
{
use RuleManagement, RequestInformation;
use RuleManagement;
/**
* RuleController constructor.

6
app/Http/Controllers/System/InstallController.php
View File

@@ -218,7 +218,7 @@ class InstallController extends Controller
public function keys(): void
{
// switch on PHP version.
$keys = [];
// switch on class existence.
Log::info(sprintf('PHP version is %s', phpversion()));
if (class_exists(LegacyRSA::class)) {
@@ -242,7 +242,7 @@ class InstallController extends Controller
return;
}
file_put_contents($publicKey, Arr::get($keys, 'publickey'));
file_put_contents($privateKey, Arr::get($keys, 'privatekey'));
file_put_contents($publicKey, $keys['publickey']);
file_put_contents($privateKey, $keys['privatekey']);
}
}

3
app/Http/Controllers/Transaction/ConvertController.php
View File

@@ -35,7 +35,6 @@ use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
use FireflyIII\Services\Internal\Update\JournalUpdateService;
use FireflyIII\Support\Http\Controllers\ModelInformation;
use FireflyIII\Support\Http\Controllers\UserNavigation;
use FireflyIII\Transformers\TransactionGroupTransformer;
use FireflyIII\Validation\AccountValidator;
use Illuminate\Contracts\View\Factory;
@@ -52,7 +51,7 @@ use Log;
*/
class ConvertController extends Controller
{
use ModelInformation, UserNavigation;
use ModelInformation;
private AccountRepositoryInterface $accountRepository;
private JournalRepositoryInterface $repository;

3
app/Http/Controllers/Transaction/DeleteController.php
View File

@@ -26,7 +26,6 @@ namespace FireflyIII\Http\Controllers\Transaction;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Models\TransactionGroup;
use FireflyIII\Repositories\TransactionGroup\TransactionGroupRepositoryInterface;
use FireflyIII\Support\Http\Controllers\UserNavigation;
use Illuminate\Http\RedirectResponse;
use Illuminate\Routing\Redirector;
use Log;
@@ -38,8 +37,6 @@ use URL;
*/
class DeleteController extends Controller
{
use UserNavigation;
/** @var TransactionGroupRepositoryInterface */
private $repository;

3
app/Http/Controllers/Transaction/EditController.php
View File

@@ -26,7 +26,6 @@ namespace FireflyIII\Http\Controllers\Transaction;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Models\TransactionGroup;
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Support\Http\Controllers\UserNavigation;
use Illuminate\Contracts\View\Factory;
use Illuminate\Http\RedirectResponse;
use Illuminate\Routing\Redirector;
@@ -37,8 +36,6 @@ use Illuminate\View\View;
*/
class EditController extends Controller
{
use UserNavigation;
/**
* EditController constructor.
*