Use facades with full import

Author: ivanvermeyen

routes/routes.php

@@ -1,15 +1,17 @@
 <?php
 
 use CodeZero\StageFront\Controllers\StageFrontController;
+use Illuminate\Support\Facades\Config;
+use Illuminate\Support\Facades\Route;
 
-if (config('stagefront.enabled') === true) {
+if (Config::get('stagefront.enabled') === true) {
 
-    Route::group(['middleware' => config('stagefront.middleware')], function () {
+    Route::group(['middleware' => Config::get('stagefront.middleware')], function () {
 
-        $url = config('stagefront.url');
-        $throttle = config('stagefront.throttle');
-        $tries = config('stagefront.throttle_tries');
-        $delay = config('stagefront.throttle_delay');
+        $url = Config::get('stagefront.url');
+        $throttle = Config::get('stagefront.throttle');
+        $tries = Config::get('stagefront.throttle_tries');
+        $delay = Config::get('stagefront.throttle_delay');
         $middleware = $throttle ? "throttle:{$tries},{$delay}" : [];
 
         Route::get($url, StageFrontController::class.'@create');

src/Authenticator.php

@@ -5,6 +5,8 @@
 use CodeZero\StageFront\Authenticators\DatabaseAuthenticator;
 use CodeZero\StageFront\Authenticators\EncryptedAuthenticator;
 use CodeZero\StageFront\Authenticators\PlainTextAuthenticator;
+use Illuminate\Support\Facades\App;
+use Illuminate\Support\Facades\Config;
 
 class Authenticator
 {
@@ -20,14 +22,14 @@ class Authenticator
     public static function checkCredentials($login, $password)
     {
         $checkers = [
-            DatabaseAuthenticator::class => config('stagefront.database') === true,
-            EncryptedAuthenticator::class => config('stagefront.encrypted') === true,
+            DatabaseAuthenticator::class => Config::get('stagefront.database') === true,
+            EncryptedAuthenticator::class => Config::get('stagefront.encrypted') === true,
             PlainTextAuthenticator::class => true, //=> Default
         ];
 
         foreach ($checkers as $checker => $applicable) {
             if ($applicable === true) {
-                return app($checker)->check($login, $password);
+                return App::make($checker)->check($login, $password);
             }
         }
     }

src/Authenticators/DatabaseAuthenticator.php

@@ -2,8 +2,9 @@
 
 namespace CodeZero\StageFront\Authenticators;
 
-use DB;
-use Hash;
+use Illuminate\Support\Facades\Config;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Hash;
 
 class DatabaseAuthenticator implements Authenticator
 {
@@ -32,7 +33,7 @@ public function check($login, $password)
      */
     protected function checkPassword($password, $user)
     {
-        $passwordField = config('stagefront.database_password_field');
+        $passwordField = Config::get('stagefront.database_password_field');
 
         return Hash::check($password, $user->{$passwordField});
     }
@@ -50,8 +51,8 @@ protected function findUser($login)
             return null;
         }
 
-        $table = config('stagefront.database_table');
-        $loginField = config('stagefront.database_login_field');
+        $table = Config::get('stagefront.database_table');
+        $loginField = Config::get('stagefront.database_login_field');
 
         return DB::table($table)->where($loginField, '=', $login)->first();
     }
@@ -77,7 +78,7 @@ protected function loginIsAllowed($login)
      */
     protected function getWhitelist()
     {
-        $whitelist = config('stagefront.database_whitelist', []);
+        $whitelist = Config::get('stagefront.database_whitelist', []);
 
         if ( ! is_array($whitelist)) {
             $whitelist = explode(',', $whitelist) ?: [];

src/Authenticators/EncryptedAuthenticator.php

@@ -2,7 +2,8 @@
 
 namespace CodeZero\StageFront\Authenticators;
 
-use Hash;
+use Illuminate\Support\Facades\Config;
+use Illuminate\Support\Facades\Hash;
 
 class EncryptedAuthenticator implements Authenticator
 {
@@ -28,7 +29,7 @@ public function check($login, $password)
      */
     protected function checkLogin($login)
     {
-        return $login === config('stagefront.login');
+        return $login === Config::get('stagefront.login');
     }
 
     /**
@@ -40,6 +41,6 @@ protected function checkLogin($login)
      */
     protected function checkPassword($password)
     {
-        return Hash::check($password, config('stagefront.password'));
+        return Hash::check($password, Config::get('stagefront.password'));
     }
 }

src/Authenticators/PlainTextAuthenticator.php

@@ -2,6 +2,8 @@
 
 namespace CodeZero\StageFront\Authenticators;
 
+use Illuminate\Support\Facades\Config;
+
 class PlainTextAuthenticator implements Authenticator
 {
     /**
@@ -26,7 +28,7 @@ public function check($login, $password)
      */
     protected function checkLogin($login)
     {
-        return $login === config('stagefront.login');
+        return $login === Config::get('stagefront.login');
     }
 
     /**
@@ -38,6 +40,6 @@ protected function checkLogin($login)
      */
     protected function checkPassword($password)
     {
-        return $password === config('stagefront.password');
+        return $password === Config::get('stagefront.password');
     }
 }

src/Composers/ThrottleTimeRemaining.php

@@ -5,6 +5,9 @@
 use Carbon\Carbon;
 use Illuminate\Cache\RateLimiter;
 use Illuminate\Contracts\View\View;
+use Illuminate\Support\Facades\App;
+use Illuminate\Support\Facades\Lang;
+use Illuminate\Support\Facades\Request;
 
 class ThrottleTimeRemaining
 {
@@ -28,12 +31,12 @@ public function compose(View $view)
     protected function getTimeRemaining()
     {
         if ( ! $key = $this->getCacheKey()) {
-            return trans('stagefront::errors.throttled.moment');
+            return Lang::get('stagefront::errors.throttled.moment');
         }
 
         $secondsRemaining = $this->getSecondsRemaining($key);
 
-        Carbon::setLocale(app()->getLocale());
+        Carbon::setLocale(App::getLocale());
 
         return Carbon::now()
             ->addSeconds($secondsRemaining)
@@ -49,14 +52,12 @@ protected function getTimeRemaining()
      */
     protected function getCacheKey()
     {
-        $request = request();
-
-        if ($user = $request->user()) {
+        if ($user = Request::user()) {
             return sha1($user->getAuthIdentifier());
         }
 
-        if ($route = $request->route()) {
-            return sha1($route->getDomain().'|'.$request->ip());
+        if ($route = Request::route()) {
+            return sha1($route->getDomain().'|'.Request::ip());
         }
 
         return null;
@@ -71,6 +72,6 @@ protected function getCacheKey()
      */
     protected function getSecondsRemaining($key)
     {
-        return app(RateLimiter::class)->availableIn($key);
+        return App::make(RateLimiter::class)->availableIn($key);
     }
 }

src/Controllers/StageFrontController.php

@@ -4,6 +4,10 @@
 
 use CodeZero\StageFront\Rules\LoginAndPasswordMatch;
 use Illuminate\Routing\Controller;
+use Illuminate\Support\Facades\Config;
+use Illuminate\Support\Facades\Lang;
+use Illuminate\Support\Facades\Request;
+use Illuminate\Support\Facades\Session;
 
 class StageFrontController extends Controller
 {
@@ -14,11 +18,11 @@ class StageFrontController extends Controller
      */
     public function create()
     {
-        if (session('stagefront.unlocked') === true) {
+        if (Session::get('stagefront.unlocked') === true) {
             return redirect('/');
         }
 
-        $liveSite = config('stagefront.live_site');
+        $liveSite = Config::get('stagefront.live_site');
 
         if ($liveSite) {
             $liveSite = [
@@ -27,7 +31,7 @@ public function create()
             ];
         }
 
-        session()->flash('url.intended', session()->previousUrl());
+        Session::flash('url.intended', Session::previousUrl());
 
         return view('stagefront::login', compact('liveSite'));
     }
@@ -39,15 +43,15 @@ public function create()
      */
     public function store()
     {
-        request()->validate([
+        Request::validate([
             'login' => ['required'],
             'password' => ['required', new LoginAndPasswordMatch()],
         ], [
-            'login.required' => trans('stagefront::errors.login.required'),
-            'password.required' => trans('stagefront::errors.password.required'),
+            'login.required' => Lang::get('stagefront::errors.login.required'),
+            'password.required' => Lang::get('stagefront::errors.password.required'),
         ]);
 
-        session()->put('stagefront.unlocked', true);
+        Session::put('stagefront.unlocked', true);
 
         return redirect()->intended('/');
     }

src/Middleware/RedirectIfStageFrontIsEnabled.php

@@ -3,6 +3,8 @@
 namespace CodeZero\StageFront\Middleware;
 
 use Closure;
+use Illuminate\Support\Facades\Config;
+use Illuminate\Support\Facades\Session;
 
 class RedirectIfStageFrontIsEnabled
 {
@@ -16,10 +18,10 @@ class RedirectIfStageFrontIsEnabled
      */
     public function handle($request, Closure $next)
     {
-        $disabled = ! config('stagefront.enabled', false);
-        $unlocked = session('stagefront.unlocked', false);
-        $stageFrontUrl = config('stagefront.url');
-        $ignoredUrls = config('stagefront.ignore_urls', []);
+        $disabled = ! Config::get('stagefront.enabled', false);
+        $unlocked = Session::get('stagefront.unlocked', false);
+        $stageFrontUrl = Config::get('stagefront.url');
+        $ignoredUrls = Config::get('stagefront.ignore_urls', []);
         array_push($ignoredUrls, $stageFrontUrl);
 
         if ($unlocked || $disabled || $this->urlIsIgnored($request, $ignoredUrls)) {

src/Rules/LoginAndPasswordMatch.php

@@ -4,6 +4,8 @@
 
 use CodeZero\StageFront\Authenticator;
 use Illuminate\Contracts\Validation\Rule;
+use Illuminate\Support\Facades\Lang;
+use Illuminate\Support\Facades\Request;
 
 class LoginAndPasswordMatch implements Rule
 {
@@ -21,7 +23,7 @@ class LoginAndPasswordMatch implements Rule
      */
     public function __construct($loginField = 'login')
     {
-        $this->login = request($loginField);
+        $this->login = Request::get($loginField);
     }
 
     /**
@@ -44,6 +46,6 @@ public function passes($passwordField, $password)
      */
     public function message()
     {
-        return trans('stagefront::errors.password.match');
+        return Lang::get('stagefront::errors.password.match');
     }
 }