Code cleanup.

This commit is contained in:
James Cole
2023-12-20 19:35:52 +01:00
parent c4f6366642
commit 64ec0cf62e
997 changed files with 12908 additions and 28136 deletions

View File

@@ -36,8 +36,6 @@ class AppServiceProvider extends ServiceProvider
{
/**
* Bootstrap any application services.
*
* @return void
*/
public function boot(): void
{
@@ -47,19 +45,19 @@ class AppServiceProvider extends ServiceProvider
'Cache-Control' => 'no-store',
];
$uuid = (string)request()->header('X-Trace-Id');
if ('' !== trim($uuid) && (preg_match('/^[a-f\d]{8}(-[a-f\d]{4}){4}[a-f\d]{8}$/i', trim($uuid)) === 1)) {
if ('' !== trim($uuid) && (1 === preg_match('/^[a-f\d]{8}(-[a-f\d]{4}){4}[a-f\d]{8}$/i', trim($uuid)))) {
$headers['X-Trace-Id'] = $uuid;
}
return response()
->json($value)
->withHeaders($headers);
->withHeaders($headers)
;
});
}
/**
* Register any application services.
*
* @return void
*/
public function register(): void
{

View File

@@ -41,9 +41,8 @@ class AuthServiceProvider extends ServiceProvider
/**
* Register any authentication / authorization services.
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
*
* @return void
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function boot(): void
{

View File

@@ -32,7 +32,6 @@ use FireflyIII\Events\Model\BudgetLimit\Created;
use FireflyIII\Events\Model\BudgetLimit\Deleted;
use FireflyIII\Events\Model\BudgetLimit\Updated;
use FireflyIII\Events\Model\PiggyBank\ChangedAmount;
use FireflyIII\Events\Model\PiggyBank\ChangedPiggyBankAmount;
use FireflyIII\Events\Model\Rule\RuleActionFailedOnArray;
use FireflyIII\Events\Model\Rule\RuleActionFailedOnObject;
use FireflyIII\Events\NewVersionAvailable;
@@ -86,8 +85,6 @@ use Laravel\Passport\Events\AccessTokenCreated;
/**
* Class EventServiceProvider.
*
*/
class EventServiceProvider extends ServiceProvider
{
@@ -206,7 +203,6 @@ class EventServiceProvider extends ServiceProvider
RuleActionFailedOnObject::class => [
'FireflyIII\Handlers\Events\Model\RuleHandler@ruleActionFailedOnObject',
],
];
/**
@@ -217,9 +213,6 @@ class EventServiceProvider extends ServiceProvider
$this->registerObservers();
}
/**
* @return void
*/
private function registerObservers(): void
{
Attachment::observe(new AttachmentObserver());

View File

@@ -72,13 +72,9 @@ use FireflyIII\TransactionRules\Engine\SearchRuleEngine;
use FireflyIII\Validation\FireflyValidator;
use Illuminate\Foundation\Application;
use Illuminate\Support\ServiceProvider;
use Validator;
/**
*
* Class FireflyServiceProvider.
*
*
*/
class FireflyServiceProvider extends ServiceProvider
{
@@ -87,7 +83,7 @@ class FireflyServiceProvider extends ServiceProvider
*/
public function boot(): void
{
Validator::resolver(
\Validator::resolver(
static function ($translator, $data, $rules, $messages) {
return new FireflyValidator($translator, $data, $rules, $messages);
}
@@ -96,7 +92,6 @@ class FireflyServiceProvider extends ServiceProvider
/**
* Register stuff.
*
*/
public function register(): void
{

View File

@@ -137,9 +137,6 @@ class JournalServiceProvider extends ServiceProvider
);
}
/**
*
*/
private function registerGroupCollector(): void
{
$this->app->bind(

View File

@@ -66,6 +66,7 @@ class PiggyBankServiceProvider extends ServiceProvider
if ($app->auth->check()) { // @phpstan-ignore-line (phpstan does not understand the reference to auth)
$repository->setUser(auth()->user());
}
return $repository;
}
);

View File

@@ -41,18 +41,21 @@ class RouteServiceProvider extends ServiceProvider
{
$this->routes(function () {
Route::prefix('api')
->middleware('api')
->namespace($this->namespace)
->group(base_path('routes/api.php'));
->middleware('api')
->namespace($this->namespace)
->group(base_path('routes/api.php'))
;
Route::prefix('api/v1/cron')
->middleware('api_basic')
->namespace($this->namespace)
->group(base_path('routes/api-noauth.php'));
->middleware('api_basic')
->namespace($this->namespace)
->group(base_path('routes/api-noauth.php'))
;
Route::middleware('web')
->namespace($this->namespace)
->group(base_path('routes/web.php'));
->namespace($this->namespace)
->group(base_path('routes/web.php'))
;
});
}
}