mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2025-10-12 07:34:43 +00:00
Replace magic facades.
This commit is contained in:
@@ -24,7 +24,7 @@ declare(strict_types=1);
|
|||||||
|
|
||||||
namespace FireflyIII\Api\V1\Controllers\Models\TransactionCurrency;
|
namespace FireflyIII\Api\V1\Controllers\Models\TransactionCurrency;
|
||||||
|
|
||||||
use Validator;
|
use Illuminate\Support\Facades\Validator;
|
||||||
use FireflyIII\Api\V1\Controllers\Controller;
|
use FireflyIII\Api\V1\Controllers\Controller;
|
||||||
use FireflyIII\Exceptions\FireflyException;
|
use FireflyIII\Exceptions\FireflyException;
|
||||||
use FireflyIII\Models\TransactionCurrency;
|
use FireflyIII\Models\TransactionCurrency;
|
||||||
|
@@ -24,7 +24,7 @@ declare(strict_types=1);
|
|||||||
|
|
||||||
namespace FireflyIII\Api\V1\Controllers\Models\TransactionLinkType;
|
namespace FireflyIII\Api\V1\Controllers\Models\TransactionLinkType;
|
||||||
|
|
||||||
use Validator;
|
use Illuminate\Support\Facades\Validator;
|
||||||
use FireflyIII\Api\V1\Controllers\Controller;
|
use FireflyIII\Api\V1\Controllers\Controller;
|
||||||
use FireflyIII\Api\V1\Requests\Models\TransactionLinkType\StoreRequest;
|
use FireflyIII\Api\V1\Requests\Models\TransactionLinkType\StoreRequest;
|
||||||
use FireflyIII\Exceptions\FireflyException;
|
use FireflyIII\Exceptions\FireflyException;
|
||||||
|
@@ -23,8 +23,8 @@
|
|||||||
declare(strict_types=1);
|
declare(strict_types=1);
|
||||||
|
|
||||||
namespace FireflyIII\Api\V1\Controllers\Models\TransactionLinkType;
|
namespace FireflyIII\Api\V1\Controllers\Models\TransactionLinkType;
|
||||||
|
use Illuminate\Support\Facades\Validator;
|
||||||
|
|
||||||
use Validator;
|
|
||||||
use FireflyIII\Api\V1\Controllers\Controller;
|
use FireflyIII\Api\V1\Controllers\Controller;
|
||||||
use FireflyIII\Api\V1\Requests\Models\TransactionLinkType\UpdateRequest;
|
use FireflyIII\Api\V1\Requests\Models\TransactionLinkType\UpdateRequest;
|
||||||
use FireflyIII\Exceptions\FireflyException;
|
use FireflyIII\Exceptions\FireflyException;
|
||||||
|
@@ -24,7 +24,7 @@ declare(strict_types=1);
|
|||||||
|
|
||||||
namespace FireflyIII\Api\V1\Controllers\System;
|
namespace FireflyIII\Api\V1\Controllers\System;
|
||||||
|
|
||||||
use Validator;
|
use Illuminate\Support\Facades\Validator;
|
||||||
use FireflyIII\Api\V1\Controllers\Controller;
|
use FireflyIII\Api\V1\Controllers\Controller;
|
||||||
use FireflyIII\Api\V1\Requests\System\UpdateRequest;
|
use FireflyIII\Api\V1\Requests\System\UpdateRequest;
|
||||||
use FireflyIII\Exceptions\FireflyException;
|
use FireflyIII\Exceptions\FireflyException;
|
||||||
|
@@ -36,7 +36,7 @@ use Illuminate\Foundation\Validation\ValidatesRequests;
|
|||||||
use Illuminate\Routing\Controller as BaseController;
|
use Illuminate\Routing\Controller as BaseController;
|
||||||
use Illuminate\Support\Facades\Config;
|
use Illuminate\Support\Facades\Config;
|
||||||
use Illuminate\Support\Facades\View;
|
use Illuminate\Support\Facades\View;
|
||||||
use Route;
|
use Illuminate\Support\Facades\Route;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Class Controller.
|
* Class Controller.
|
||||||
|
@@ -24,8 +24,8 @@ declare(strict_types=1);
|
|||||||
|
|
||||||
namespace FireflyIII\Http\Controllers\Profile;
|
namespace FireflyIII\Http\Controllers\Profile;
|
||||||
|
|
||||||
use Cookie;
|
use Illuminate\Support\Facades\Cookie;
|
||||||
use Google2FA;
|
use PragmaRX\Google2FALaravel\Facade as Google2FA;
|
||||||
use Carbon\Carbon;
|
use Carbon\Carbon;
|
||||||
use FireflyIII\Events\Security\DisabledMFA;
|
use FireflyIII\Events\Security\DisabledMFA;
|
||||||
use FireflyIII\Events\Security\EnabledMFA;
|
use FireflyIII\Events\Security\EnabledMFA;
|
||||||
|
@@ -23,8 +23,8 @@ declare(strict_types=1);
|
|||||||
|
|
||||||
namespace FireflyIII\Http\Controllers;
|
namespace FireflyIII\Http\Controllers;
|
||||||
|
|
||||||
use Auth;
|
use Illuminate\Support\Facades\Auth;
|
||||||
use Hash;
|
use Illuminate\Support\Facades\Hash;
|
||||||
use Exception;
|
use Exception;
|
||||||
use FireflyIII\Events\UserChangedEmail;
|
use FireflyIII\Events\UserChangedEmail;
|
||||||
use FireflyIII\Exceptions\FireflyException;
|
use FireflyIII\Exceptions\FireflyException;
|
||||||
|
@@ -24,8 +24,8 @@ declare(strict_types=1);
|
|||||||
|
|
||||||
namespace FireflyIII\Http\Controllers\System;
|
namespace FireflyIII\Http\Controllers\System;
|
||||||
|
|
||||||
use Artisan;
|
use Illuminate\Support\Facades\Artisan;
|
||||||
use Cache;
|
use Illuminate\Support\Facades\Cache;
|
||||||
use Exception;
|
use Exception;
|
||||||
use FireflyIII\Exceptions\FireflyException;
|
use FireflyIII\Exceptions\FireflyException;
|
||||||
use FireflyIII\Http\Controllers\Controller;
|
use FireflyIII\Http\Controllers\Controller;
|
||||||
|
@@ -24,7 +24,7 @@ declare(strict_types=1);
|
|||||||
namespace FireflyIII\Http\Middleware;
|
namespace FireflyIII\Http\Middleware;
|
||||||
|
|
||||||
use Closure;
|
use Closure;
|
||||||
use App;
|
use Illuminate\Support\Facades\App;
|
||||||
use Carbon\Carbon;
|
use Carbon\Carbon;
|
||||||
use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
|
use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
|
||||||
use FireflyIII\Support\Facades\Amount;
|
use FireflyIII\Support\Facades\Amount;
|
||||||
|
@@ -23,7 +23,7 @@ declare(strict_types=1);
|
|||||||
|
|
||||||
namespace FireflyIII\Support;
|
namespace FireflyIII\Support;
|
||||||
|
|
||||||
use Eloquent;
|
use Illuminate\Database\Eloquent\Model;
|
||||||
use FireflyIII\Exceptions\FireflyException;
|
use FireflyIII\Exceptions\FireflyException;
|
||||||
use FireflyIII\Support\Form\FormSupport;
|
use FireflyIII\Support\Form\FormSupport;
|
||||||
use Illuminate\Support\Collection;
|
use Illuminate\Support\Collection;
|
||||||
@@ -205,7 +205,7 @@ class ExpandedForm
|
|||||||
$selectList[0] = '(none)';
|
$selectList[0] = '(none)';
|
||||||
$fields = ['title', 'name', 'description'];
|
$fields = ['title', 'name', 'description'];
|
||||||
|
|
||||||
/** @var \Eloquent $entry */
|
/** @var Model $entry */
|
||||||
foreach ($set as $entry) {
|
foreach ($set as $entry) {
|
||||||
// All Eloquent models have an ID
|
// All Eloquent models have an ID
|
||||||
$entryId = $entry->id;
|
$entryId = $entry->id;
|
||||||
|
@@ -33,7 +33,7 @@ use FireflyIII\User;
|
|||||||
use Illuminate\Contracts\Validation\Validator as ValidatorContract;
|
use Illuminate\Contracts\Validation\Validator as ValidatorContract;
|
||||||
use Illuminate\Routing\Route;
|
use Illuminate\Routing\Route;
|
||||||
use Illuminate\Support\Facades\Validator;
|
use Illuminate\Support\Facades\Validator;
|
||||||
use Route as RouteFacade;
|
use Illuminate\Support\Facades\Route as RouteFacade;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Trait RequestInformation
|
* Trait RequestInformation
|
||||||
|
@@ -33,7 +33,7 @@ use FireflyIII\Support\Facades\Steam;
|
|||||||
use FireflyIII\Support\Search\OperatorQuerySearch;
|
use FireflyIII\Support\Search\OperatorQuerySearch;
|
||||||
use Illuminate\Support\Facades\Log;
|
use Illuminate\Support\Facades\Log;
|
||||||
use League\CommonMark\GithubFlavoredMarkdownConverter;
|
use League\CommonMark\GithubFlavoredMarkdownConverter;
|
||||||
use Route;
|
use Illuminate\Support\Facades\Route;
|
||||||
use Twig\Extension\AbstractExtension;
|
use Twig\Extension\AbstractExtension;
|
||||||
use Twig\TwigFilter;
|
use Twig\TwigFilter;
|
||||||
use Twig\TwigFunction;
|
use Twig\TwigFunction;
|
||||||
|
106
config/app.php
106
config/app.php
@@ -41,16 +41,6 @@ use FireflyIII\Providers\RuleServiceProvider;
|
|||||||
use FireflyIII\Providers\SearchServiceProvider;
|
use FireflyIII\Providers\SearchServiceProvider;
|
||||||
use FireflyIII\Providers\SessionServiceProvider;
|
use FireflyIII\Providers\SessionServiceProvider;
|
||||||
use FireflyIII\Providers\TagServiceProvider;
|
use FireflyIII\Providers\TagServiceProvider;
|
||||||
use FireflyIII\Support\Facades\AccountForm;
|
|
||||||
use FireflyIII\Support\Facades\Amount;
|
|
||||||
use FireflyIII\Support\Facades\CurrencyForm;
|
|
||||||
use FireflyIII\Support\Facades\ExpandedForm;
|
|
||||||
use FireflyIII\Support\Facades\FireflyConfig;
|
|
||||||
use FireflyIII\Support\Facades\Navigation;
|
|
||||||
use FireflyIII\Support\Facades\PiggyBankForm;
|
|
||||||
use FireflyIII\Support\Facades\Preferences;
|
|
||||||
use FireflyIII\Support\Facades\RuleForm;
|
|
||||||
use FireflyIII\Support\Facades\Steam;
|
|
||||||
use Illuminate\Auth\AuthServiceProvider;
|
use Illuminate\Auth\AuthServiceProvider;
|
||||||
use Illuminate\Auth\Passwords\PasswordResetServiceProvider;
|
use Illuminate\Auth\Passwords\PasswordResetServiceProvider;
|
||||||
use Illuminate\Broadcasting\BroadcastServiceProvider;
|
use Illuminate\Broadcasting\BroadcastServiceProvider;
|
||||||
@@ -58,7 +48,6 @@ use Illuminate\Bus\BusServiceProvider;
|
|||||||
use Illuminate\Cache\CacheServiceProvider;
|
use Illuminate\Cache\CacheServiceProvider;
|
||||||
use Illuminate\Cookie\CookieServiceProvider;
|
use Illuminate\Cookie\CookieServiceProvider;
|
||||||
use Illuminate\Database\DatabaseServiceProvider;
|
use Illuminate\Database\DatabaseServiceProvider;
|
||||||
use Illuminate\Database\Eloquent\Model;
|
|
||||||
use Illuminate\Encryption\EncryptionServiceProvider;
|
use Illuminate\Encryption\EncryptionServiceProvider;
|
||||||
use Illuminate\Filesystem\FilesystemServiceProvider;
|
use Illuminate\Filesystem\FilesystemServiceProvider;
|
||||||
use Illuminate\Foundation\Providers\ConsoleSupportServiceProvider;
|
use Illuminate\Foundation\Providers\ConsoleSupportServiceProvider;
|
||||||
@@ -70,47 +59,9 @@ use Illuminate\Pagination\PaginationServiceProvider;
|
|||||||
use Illuminate\Pipeline\PipelineServiceProvider;
|
use Illuminate\Pipeline\PipelineServiceProvider;
|
||||||
use Illuminate\Queue\QueueServiceProvider;
|
use Illuminate\Queue\QueueServiceProvider;
|
||||||
use Illuminate\Redis\RedisServiceProvider;
|
use Illuminate\Redis\RedisServiceProvider;
|
||||||
use Illuminate\Support\Arr;
|
|
||||||
use Illuminate\Support\Facades\App;
|
|
||||||
use Illuminate\Support\Facades\Artisan;
|
|
||||||
use Illuminate\Support\Facades\Auth;
|
|
||||||
use Illuminate\Support\Facades\Blade;
|
|
||||||
use Illuminate\Support\Facades\Broadcast;
|
|
||||||
use Illuminate\Support\Facades\Bus;
|
|
||||||
use Illuminate\Support\Facades\Cache;
|
|
||||||
use Illuminate\Support\Facades\Config;
|
|
||||||
use Illuminate\Support\Facades\Cookie;
|
|
||||||
use Illuminate\Support\Facades\Crypt;
|
|
||||||
use Illuminate\Support\Facades\DB;
|
|
||||||
use Illuminate\Support\Facades\Event;
|
|
||||||
use Illuminate\Support\Facades\File;
|
|
||||||
use Illuminate\Support\Facades\Gate;
|
|
||||||
use Illuminate\Support\Facades\Hash;
|
|
||||||
use Illuminate\Support\Facades\Http;
|
|
||||||
use Illuminate\Support\Facades\Lang;
|
|
||||||
use Illuminate\Support\Facades\Log;
|
|
||||||
use Illuminate\Support\Facades\Mail;
|
|
||||||
use Illuminate\Support\Facades\Notification;
|
|
||||||
use Illuminate\Support\Facades\Password;
|
|
||||||
use Illuminate\Support\Facades\Queue;
|
|
||||||
use Illuminate\Support\Facades\Redirect;
|
|
||||||
use Illuminate\Support\Facades\Redis;
|
|
||||||
use Illuminate\Support\Facades\Request;
|
|
||||||
use Illuminate\Support\Facades\Response;
|
|
||||||
use Illuminate\Support\Facades\Route;
|
|
||||||
use Illuminate\Support\Facades\Schema;
|
|
||||||
use Illuminate\Support\Facades\Session;
|
|
||||||
use Illuminate\Support\Facades\Storage;
|
|
||||||
use Illuminate\Support\Facades\URL;
|
|
||||||
use Illuminate\Support\Facades\Validator;
|
|
||||||
use Illuminate\Support\Facades\View;
|
|
||||||
use Illuminate\Support\Str;
|
|
||||||
use Illuminate\Translation\TranslationServiceProvider;
|
use Illuminate\Translation\TranslationServiceProvider;
|
||||||
use Illuminate\Validation\ValidationServiceProvider;
|
use Illuminate\Validation\ValidationServiceProvider;
|
||||||
use Illuminate\View\ViewServiceProvider;
|
use Illuminate\View\ViewServiceProvider;
|
||||||
use PragmaRX\Google2FALaravel\Facade;
|
|
||||||
use Spatie\Html\Facades\Html;
|
|
||||||
use TwigBridge\Facade\Twig;
|
|
||||||
use TwigBridge\ServiceProvider;
|
use TwigBridge\ServiceProvider;
|
||||||
|
|
||||||
return [
|
return [
|
||||||
@@ -178,60 +129,9 @@ return [
|
|||||||
AdminServiceProvider::class,
|
AdminServiceProvider::class,
|
||||||
RecurringServiceProvider::class,
|
RecurringServiceProvider::class,
|
||||||
],
|
],
|
||||||
'aliases' => [
|
'aliases' => [],
|
||||||
'App' => App::class,
|
|
||||||
'Artisan' => Artisan::class,
|
|
||||||
'Auth' => Auth::class,
|
|
||||||
'Blade' => Blade::class,
|
|
||||||
'Broadcast' => Broadcast::class,
|
|
||||||
'Bus' => Bus::class,
|
|
||||||
'Cache' => Cache::class,
|
|
||||||
'Config' => Config::class,
|
|
||||||
'Cookie' => Cookie::class,
|
|
||||||
'Crypt' => Crypt::class,
|
|
||||||
'DB' => DB::class,
|
|
||||||
'Eloquent' => Model::class,
|
|
||||||
'Event' => Event::class,
|
|
||||||
'File' => File::class,
|
|
||||||
'Gate' => Gate::class,
|
|
||||||
'Hash' => Hash::class,
|
|
||||||
'Lang' => Lang::class,
|
|
||||||
'Log' => Log::class,
|
|
||||||
'Mail' => Mail::class,
|
|
||||||
'Notification' => Notification::class,
|
|
||||||
'Password' => Password::class,
|
|
||||||
'Queue' => Queue::class,
|
|
||||||
'Redirect' => Redirect::class,
|
|
||||||
'Redis' => Redis::class,
|
|
||||||
'Request' => Request::class,
|
|
||||||
'Response' => Response::class,
|
|
||||||
'Route' => Route::class,
|
|
||||||
'Schema' => Schema::class,
|
|
||||||
'Session' => Session::class,
|
|
||||||
'Storage' => Storage::class,
|
|
||||||
'URL' => URL::class,
|
|
||||||
'Validator' => Validator::class,
|
|
||||||
'View' => View::class,
|
|
||||||
'Html' => Html::class,
|
|
||||||
'Preferences' => Preferences::class,
|
|
||||||
'FireflyConfig' => FireflyConfig::class,
|
|
||||||
'Navigation' => Navigation::class,
|
|
||||||
'Amount' => Amount::class,
|
|
||||||
'Steam' => Steam::class,
|
|
||||||
'ExpandedForm' => ExpandedForm::class,
|
|
||||||
'CurrencyForm' => CurrencyForm::class,
|
|
||||||
'AccountForm' => AccountForm::class,
|
|
||||||
'PiggyBankForm' => PiggyBankForm::class,
|
|
||||||
'RuleForm' => RuleForm::class,
|
|
||||||
'Google2FA' => Facade::class,
|
|
||||||
'Twig' => Twig::class,
|
|
||||||
|
|
||||||
'Arr' => Arr::class,
|
'asset_url' => env('ASSET_URL', null),
|
||||||
'Http' => Http::class,
|
|
||||||
'Str' => Str::class,
|
|
||||||
],
|
|
||||||
|
|
||||||
'asset_url' => env('ASSET_URL', null),
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|--------------------------------------------------------------------------
|
|--------------------------------------------------------------------------
|
||||||
@@ -244,5 +144,5 @@ return [
|
|||||||
|
|
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
'faker_locale' => 'en_US',
|
'faker_locale' => 'en_US',
|
||||||
];
|
];
|
||||||
|
Reference in New Issue
Block a user