Fix excess memory being used when building schema

app/Http/Middleware/ApplicationSession.php

@@ -2,9 +2,12 @@
 
 namespace App\Http\Middleware;
 
+use Closure;
+use Config;
+use Illuminate\Http\Request;
+
 use App\Classes\LDAP\Server;
 use App\Ldap\User;
-use Closure;
 
 /**
  * This sets up our application session with any required values, ultimately for cache optimisation reasons
@@ -14,13 +17,13 @@ class ApplicationSession
 	/**
 	 * Handle an incoming request.
 	 *
-	 * @param  \Illuminate\Http\Request  $request
-	 * @param  \Closure  $next
+	 * @param  Request  $request
+	 * @param  Closure  $next
 	 * @return mixed
 	 */
-	public function handle($request,Closure $next)
+	public function handle(Request $request,Closure $next): mixed
 	{
-		\Config::set('server',new Server);
+		Config::set('server',new Server);
 
 		view()->share('user', auth()->user() ?: new User);
 

app/Http/Middleware/CheckUpdate.php

@@ -3,7 +3,9 @@
 namespace App\Http\Middleware;
 
 use Closure;
+use Config;
 use GuzzleHttp\Client;
+use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Log;
 
@@ -15,13 +17,13 @@ class CheckUpdate
 	/**
 	 * Handle an incoming request.
 	 *
-	 * @param  \Illuminate\Http\Request  $request
-	 * @param  \Closure  $next
+	 * @param  Request  $request
+	 * @param  Closure  $next
 	 * @return mixed
 	 */
-	public function handle($request, Closure $next)
+	public function handle(Request $request, Closure $next): mixed
 	{
-		\Config::set('update_available',Cache::get('upstream_version'));
+		Config::set('update_available',Cache::get('upstream_version'));
 
 		return $next($request);
 	}
@@ -31,7 +33,7 @@ class CheckUpdate
 	 *
 	 * @return void
 	 */
-	public function terminate()
+	public function terminate(): void
 	{
 		Cache::remember('upstream_version',self::UPDATE_TIME,function() {
 			// CURL call to URL to see if there is a new version
@@ -40,7 +42,6 @@ class CheckUpdate
 			$client = new Client;
 
 			try {
-
 				$response = $client->request('POST',sprintf('%s/%s',self::UPDATE_SERVER,strtolower(config('app.version'))));
 
 				if ($response->getStatusCode() === 200) {

app/Http/Middleware/SwapinAuthUser.php

@@ -6,24 +6,23 @@ use Closure;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\Cookie;
-// use Illuminate\Support\Facades\Crypt;
 use Illuminate\Support\Facades\Log;
-// use Illuminate\Support\Facades\Session;
 use LdapRecord\Container;
 
 use App\Ldap\Connection;
 
 class SwapinAuthUser
 {
-    /**
-     * Handle an incoming request.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  \Closure(\Illuminate\Http\Request): (\Illuminate\Http\Response|\Illuminate\Http\RedirectResponse)  $next
-     * @return \Illuminate\Http\Response|\Illuminate\Http\RedirectResponse
-     */
-    public function handle(Request $request, Closure $next)
-    {
+	/**
+	 * Handle an incoming request.
+	 *
+	 * @param \Illuminate\Http\Request $request
+	 * @param \Closure(\Illuminate\Http\Request): (\Illuminate\Http\Response|\Illuminate\Http\RedirectResponse) $next
+	 * @return \Illuminate\Http\Response|\Illuminate\Http\RedirectResponse
+	 * @throws \LdapRecord\Configuration\ConfigurationException
+	 */
+	public function handle(Request $request,Closure $next): mixed
+	{
 		$key = config('ldap.default');
 
 		/*
@@ -35,16 +34,17 @@ class SwapinAuthUser
 		} else
 		*/
 
+		// @todo it seems sometimes we have cookies that show the logged in user, but Auth::user() has expired?
 		if (Cookie::has('username_encrypt') && Cookie::has('password_encrypt')) {
 			Config::set('ldap.connections.'.$key.'.username',Cookie::get('username_encrypt'));
 			Config::set('ldap.connections.'.$key.'.password',Cookie::get('password_encrypt'));
 
 			Log::debug('Swapping out configured LDAP credentials with the user\'s cookie.',['key'=>$key,'user'=>Cookie::get('username_encrypt')]);
+
+			// We need to override our Connection object so that we can store and retrieve the logged in user and swap out the credentials to use them.
+			Container::getInstance()->addConnection(new Connection(config('ldap.connections.'.$key)),$key);
 		}
 
-		// We need to override our Connection object so that we can store and retrieve the logged in user and swap out the credentials to use them.
-		Container::getInstance()->addConnection(new Connection(config('ldap.connections.'.$key)),$key);
-
 		return $next($request);
-    }
+	}
 }