Skip to content

Firefly III: a personal finances manager

Replace magic facades.

James Colee333dedeecf8
diff --git a/app/Api/V1/Controllers/Models/TransactionCurrency/DestroyController.php b/app/Api/V1/Controllers/Models/TransactionCurrency/DestroyController.php
index 263d6bc350..e22212bd46 100644
--- a/app/Api/V1/Controllers/Models/TransactionCurrency/DestroyController.php
+++ b/app/Api/V1/Controllers/Models/TransactionCurrency/DestroyController.php
@@ -24,7 +24,7 @@ declare(strict_types=1);
namespace FireflyIII\Api\V1\Controllers\Models\TransactionCurrency;
-use Validator;
+use Illuminate\Support\Facades\Validator;
use FireflyIII\Api\V1\Controllers\Controller;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Models\TransactionCurrency;
diff --git a/app/Api/V1/Controllers/Models/TransactionLinkType/StoreController.php b/app/Api/V1/Controllers/Models/TransactionLinkType/StoreController.php
index b779934ea6..e9aef4aa2a 100644
--- a/app/Api/V1/Controllers/Models/TransactionLinkType/StoreController.php
+++ b/app/Api/V1/Controllers/Models/TransactionLinkType/StoreController.php
@@ -24,7 +24,7 @@ declare(strict_types=1);
namespace FireflyIII\Api\V1\Controllers\Models\TransactionLinkType;
-use Validator;
+use Illuminate\Support\Facades\Validator;
use FireflyIII\Api\V1\Controllers\Controller;
use FireflyIII\Api\V1\Requests\Models\TransactionLinkType\StoreRequest;
use FireflyIII\Exceptions\FireflyException;
diff --git a/app/Api/V1/Controllers/Models/TransactionLinkType/UpdateController.php b/app/Api/V1/Controllers/Models/TransactionLinkType/UpdateController.php
index b1f06549ce..a530836684 100644
--- a/app/Api/V1/Controllers/Models/TransactionLinkType/UpdateController.php
+++ b/app/Api/V1/Controllers/Models/TransactionLinkType/UpdateController.php
@@ -23,8 +23,8 @@
declare(strict_types=1);
namespace FireflyIII\Api\V1\Controllers\Models\TransactionLinkType;
+use Illuminate\Support\Facades\Validator;
-use Validator;
use FireflyIII\Api\V1\Controllers\Controller;
use FireflyIII\Api\V1\Requests\Models\TransactionLinkType\UpdateRequest;
use FireflyIII\Exceptions\FireflyException;
diff --git a/app/Api/V1/Controllers/System/ConfigurationController.php b/app/Api/V1/Controllers/System/ConfigurationController.php
index 35e84f41b9..281c0712f8 100644
--- a/app/Api/V1/Controllers/System/ConfigurationController.php
+++ b/app/Api/V1/Controllers/System/ConfigurationController.php
@@ -24,7 +24,7 @@ declare(strict_types=1);
namespace FireflyIII\Api\V1\Controllers\System;
-use Validator;
+use Illuminate\Support\Facades\Validator;
use FireflyIII\Api\V1\Controllers\Controller;
use FireflyIII\Api\V1\Requests\System\UpdateRequest;
use FireflyIII\Exceptions\FireflyException;
diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php
index 50fc2118a4..7756ca861b 100644
--- a/app/Http/Controllers/Controller.php
+++ b/app/Http/Controllers/Controller.php
@@ -36,7 +36,7 @@ use Illuminate\Foundation\Validation\ValidatesRequests;
use Illuminate\Routing\Controller as BaseController;
use Illuminate\Support\Facades\Config;
use Illuminate\Support\Facades\View;
-use Route;
+use Illuminate\Support\Facades\Route;
/**
* Class Controller.
diff --git a/app/Http/Controllers/Profile/MfaController.php b/app/Http/Controllers/Profile/MfaController.php
index 5d70a3b3f4..333801c380 100644
--- a/app/Http/Controllers/Profile/MfaController.php
+++ b/app/Http/Controllers/Profile/MfaController.php
@@ -24,8 +24,8 @@ declare(strict_types=1);
namespace FireflyIII\Http\Controllers\Profile;
-use Cookie;
-use Google2FA;
+use Illuminate\Support\Facades\Cookie;
+use PragmaRX\Google2FALaravel\Facade as Google2FA;
use Carbon\Carbon;
use FireflyIII\Events\Security\DisabledMFA;
use FireflyIII\Events\Security\EnabledMFA;
diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.php
index 1437138037..b8645a31ec 100644
--- a/app/Http/Controllers/ProfileController.php
+++ b/app/Http/Controllers/ProfileController.php
@@ -23,8 +23,8 @@ declare(strict_types=1);
namespace FireflyIII\Http\Controllers;
-use Auth;
-use Hash;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Hash;
use Exception;
use FireflyIII\Events\UserChangedEmail;
use FireflyIII\Exceptions\FireflyException;
diff --git a/app/Http/Controllers/System/InstallController.php b/app/Http/Controllers/System/InstallController.php
index b20228becc..e2acfb680f 100644
--- a/app/Http/Controllers/System/InstallController.php
+++ b/app/Http/Controllers/System/InstallController.php
@@ -24,8 +24,8 @@ declare(strict_types=1);
namespace FireflyIII\Http\Controllers\System;
-use Artisan;
-use Cache;
+use Illuminate\Support\Facades\Artisan;
+use Illuminate\Support\Facades\Cache;
use Exception;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Http\Controllers\Controller;
diff --git a/app/Http/Middleware/Range.php b/app/Http/Middleware/Range.php
index 28f261e807..4699a454c0 100644
--- a/app/Http/Middleware/Range.php
+++ b/app/Http/Middleware/Range.php
@@ -24,7 +24,7 @@ declare(strict_types=1);
namespace FireflyIII\Http\Middleware;
use Closure;
-use App;
+use Illuminate\Support\Facades\App;
use Carbon\Carbon;
use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
use FireflyIII\Support\Facades\Amount;
diff --git a/app/Support/ExpandedForm.php b/app/Support/ExpandedForm.php
index f5cbb3b6e1..68e2c07064 100644
--- a/app/Support/ExpandedForm.php
+++ b/app/Support/ExpandedForm.php
@@ -23,7 +23,7 @@ declare(strict_types=1);
namespace FireflyIII\Support;
-use Eloquent;
+use Illuminate\Database\Eloquent\Model;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Support\Form\FormSupport;
use Illuminate\Support\Collection;
@@ -205,7 +205,7 @@ class ExpandedForm
$selectList[0] = '(none)';
$fields = ['title', 'name', 'description'];
- /** @var \Eloquent $entry */
+ /** @var Model $entry */
foreach ($set as $entry) {
// All Eloquent models have an ID
$entryId = $entry->id;
diff --git a/app/Support/Http/Controllers/RequestInformation.php b/app/Support/Http/Controllers/RequestInformation.php
index 7f18f6fe3c..96e6edcfac 100644
--- a/app/Support/Http/Controllers/RequestInformation.php
+++ b/app/Support/Http/Controllers/RequestInformation.php
@@ -33,7 +33,7 @@ use FireflyIII\User;
use Illuminate\Contracts\Validation\Validator as ValidatorContract;
use Illuminate\Routing\Route;
use Illuminate\Support\Facades\Validator;
-use Route as RouteFacade;
+use Illuminate\Support\Facades\Route as RouteFacade;
/**
* Trait RequestInformation
diff --git a/app/Support/Twig/General.php b/app/Support/Twig/General.php
index 96b7475dac..4ae8da0019 100644
--- a/app/Support/Twig/General.php
+++ b/app/Support/Twig/General.php
@@ -33,7 +33,7 @@ use FireflyIII\Support\Facades\Steam;
use FireflyIII\Support\Search\OperatorQuerySearch;
use Illuminate\Support\Facades\Log;
use League\CommonMark\GithubFlavoredMarkdownConverter;
-use Route;
+use Illuminate\Support\Facades\Route;
use Twig\Extension\AbstractExtension;
use Twig\TwigFilter;
use Twig\TwigFunction;
diff --git a/config/app.php b/config/app.php
index dd2a1b6458..27be7859cc 100644
--- a/config/app.php
+++ b/config/app.php
@@ -41,16 +41,6 @@ use FireflyIII\Providers\RuleServiceProvider;
use FireflyIII\Providers\SearchServiceProvider;
use FireflyIII\Providers\SessionServiceProvider;
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\Passwords\PasswordResetServiceProvider;
use Illuminate\Broadcasting\BroadcastServiceProvider;
@@ -58,7 +48,6 @@ use Illuminate\Bus\BusServiceProvider;
use Illuminate\Cache\CacheServiceProvider;
use Illuminate\Cookie\CookieServiceProvider;
use Illuminate\Database\DatabaseServiceProvider;
-use Illuminate\Database\Eloquent\Model;
use Illuminate\Encryption\EncryptionServiceProvider;
use Illuminate\Filesystem\FilesystemServiceProvider;
use Illuminate\Foundation\Providers\ConsoleSupportServiceProvider;
@@ -70,47 +59,9 @@ use Illuminate\Pagination\PaginationServiceProvider;
use Illuminate\Pipeline\PipelineServiceProvider;
use Illuminate\Queue\QueueServiceProvider;
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\Validation\ValidationServiceProvider;
use Illuminate\View\ViewServiceProvider;
-use PragmaRX\Google2FALaravel\Facade;
-use Spatie\Html\Facades\Html;
-use TwigBridge\Facade\Twig;
use TwigBridge\ServiceProvider;
return [
@@ -178,60 +129,9 @@ return [
AdminServiceProvider::class,
RecurringServiceProvider::class,
],
- '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,
+ 'aliases' => [],
- 'Arr' => Arr::class,
- 'Http' => Http::class,
- 'Str' => Str::class,
- ],
-
- 'asset_url' => env('ASSET_URL', null),
+ 'asset_url' => env('ASSET_URL', null),
/*
|--------------------------------------------------------------------------
@@ -244,5 +144,5 @@ return [
|
*/
- 'faker_locale' => 'en_US',
+ 'faker_locale' => 'en_US',
];