Update laravel framework from 9 to 11, removed some old packages

app/Http/Controllers/AccountingController.php

@@ -4,8 +4,7 @@ namespace App\Http\Controllers;
 
 use Illuminate\Support\Collection;
 
-use App\Models\ProviderOauth;
-use App\Models\User;
+use App\Models\{ProviderOauth,User};
 
 class AccountingController extends Controller
 {
@@ -32,8 +31,8 @@ class AccountingController extends Controller
 		$api = $to->API();
 
 		return $api->getItems()
-				->pluck('pid','Id')
-				->transform(function($item,$value) { return ['id'=>$value,'value'=>$item]; })
-				->values();
+			->pluck('pid','Id')
+			->transform(function($item,$value) { return ['id'=>$value,'value'=>$item]; })
+			->values();
 	}
 }

app/Http/Controllers/AdminController.php

@@ -13,9 +13,7 @@ use App\Models\{Account,
 	Payment,
 	PaymentItem,
 	Service,
-	SiteDetail,
-	Supplier,
-	SupplierDetail};
+	SiteDetail};
 
 /**
  * The AdminController governs all routes that are prefixed with 'a/'.
@@ -27,7 +25,8 @@ class AdminController extends Controller
 	// @todo Move to reseller
 	public function service(Service $o)
 	{
-		return View('a.service',['o'=>$o]);
+		return view('theme.backend.adminlte.a.service')
+			->with('o',$o);
 	}
 
 	// @todo Move to reseller
@@ -55,18 +54,19 @@ class AdminController extends Controller
 			$o->forceFill($request->only(['account_id','charge_at','service_id','quantity','amount','sweep_type','type','taxable','description']));
 			$o->save();
 
-			return redirect()->back()
+			return redirect()
+				->back()
 				->with('success','Charge recorded: '.$o->id);
 		}
 
-		return view('a.charge.addedit')
+		return view('theme.backend.adminlte.a.charge.addedit')
 			->with('o',$o);
 	}
 
 	// @todo Move to reseller
 	public function charge_pending_account(Request $request,Account $o)
 	{
-		return view('a.charge.widgets.pending')
+		return view('theme.backend.adminlte.a.charge.widgets.pending')
 			->with('list',$o->charges->where('active',TRUE)->where('processed',NULL)->except($request->exclude));
 	}
 
@@ -78,7 +78,7 @@ class AdminController extends Controller
 	// @todo Move to reseller
 	public function charge_unprocessed()
 	{
-		return view('a.charge.unprocessed');
+		return view('theme.backend.adminlte.a.charge.unprocessed');
 	}
 
 	/**
@@ -148,11 +148,12 @@ class AdminController extends Controller
 				$o->items()->save($oo);
 			}
 
-			return redirect()->back()
+			return redirect()
+				->back()
 				->with('success','Payment recorded: '.$o->id);
 		}
 
-		return view('a.payment.addedit')
+		return view('theme.backend.adminlte.a.payment.addedit')
 			->with('o',$o);
 	}
 
@@ -164,7 +165,7 @@ class AdminController extends Controller
 	// @todo Move to reseller
 	public function pay_unapplied()
 	{
-		return view('a.payment.unapplied');
+		return view('theme.backend.adminlte.a.payment.unapplied');
 	}
 
 	/**
@@ -177,7 +178,7 @@ class AdminController extends Controller
 	// @todo Move to reseller
 	public function pay_invoices(Request $request,Account $o)
 	{
-		return view('a.payment.widgets.invoices')
+		return view('theme.backend.adminlte.a.payment.widgets.invoices')
 			->with('pid',$request->pid)
 			->with('o',$o);
 	}
@@ -238,10 +239,11 @@ class AdminController extends Controller
 				$site->details()->save($oo);
 			}
 
-			return redirect()->back()
+			return redirect()
+				->back()
 				->with('success','Settings saved');
 		}
 
-		return view('a.setup');
+		return view('theme.backend.adminlte.theme.backend.adminlte.a.setup');
 	}
 }

app/Http/Controllers/Auth/ForgotPasswordController.php

@@ -4,8 +4,6 @@ namespace App\Http\Controllers\Auth;
 
 use App\Http\Controllers\Controller;
 use Illuminate\Foundation\Auth\SendsPasswordResetEmails;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Password;
 
 class ForgotPasswordController extends Controller
 {
@@ -21,29 +19,4 @@ class ForgotPasswordController extends Controller
     */
 
     use SendsPasswordResetEmails;
-
-	public function showLinkRequestForm()
-	{
-		return view('adminlte::auth.passwords.email');
-	}
-
-	public function sendResetLinkEmail(Request $request)
-	{
-		$this->validateEmail($request);
-
-		// If the account is not active, or doesnt exist, we'll send a fake "sent" message.
-		if (! ($x=$this->broker()->getUser($this->credentials($request))) || (! $x->active))
-			return $this->sendResetLinkResponse($request, Password::RESET_LINK_SENT);
-
-		// We will send the password reset link to this user. Once we have attempted
-		// to send the link, we will examine the response then see the message we
-		// need to show to the user. Finally, we'll send out a proper response.
-		$response = $this->broker()->sendResetLink(
-			$this->credentials($request)
-		);
-
-		return $response == Password::RESET_LINK_SENT
-			? $this->sendResetLinkResponse($request, $response)
-			: $this->sendResetLinkFailedResponse($request, $response);
-	}
 }

app/Http/Controllers/Auth/LoginController.php

@@ -3,8 +3,6 @@
 namespace App\Http\Controllers\Auth;
 
 use App\Http\Controllers\Controller;
-use App\Providers\RouteServiceProvider;
-use Carbon\Carbon;
 use Illuminate\Foundation\Auth\AuthenticatesUsers;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
@@ -12,35 +10,36 @@ use Illuminate\Support\Facades\Schema;
 
 class LoginController extends Controller
 {
-    /*
-    |--------------------------------------------------------------------------
-    | Login Controller
-    |--------------------------------------------------------------------------
-    |
-    | This controller handles authenticating users for the application and
-    | redirecting them to your home screen. The controller uses a trait
-    | to conveniently provide its functionality to your applications.
-    |
-    */
+	/*
+	|--------------------------------------------------------------------------
+	| Login Controller
+	|--------------------------------------------------------------------------
+	|
+	| This controller handles authenticating users for the application and
+	| redirecting them to your home screen. The controller uses a trait
+	| to conveniently provide its functionality to your applications.
+	|
+	*/
 
-    use AuthenticatesUsers;
+	use AuthenticatesUsers;
 
-    /**
-     * Where to redirect users after login.
-     *
-     * @var string
-     */
-    protected $redirectTo = RouteServiceProvider::HOME;
+	/**
+	 * Where to redirect users after login.
+	 *
+	 * @var string
+	 */
+	protected $redirectTo = '/home';
 
-    /**
-     * Create a new controller instance.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        $this->middleware('guest')->except('logout');
-    }
+	/**
+	 * Create a new controller instance.
+	 *
+	 * @return void
+	 */
+	public function __construct()
+	{
+		$this->middleware('auth')
+			->only('logout');
+	}
 
 	public function login(Request $request)
 	{
@@ -73,6 +72,7 @@ class LoginController extends Controller
 		if (file_exists('login_note.txt'))
 			$login_note = file_get_contents('login_note.txt');
 
-		return view('adminlte::auth.login')->with('login_note',$login_note);
+		return view('adminlte::auth.login')
+			->with('login_note',$login_note);
 	}
 }

app/Http/Controllers/Auth/RegisterController.php

@@ -1,89 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Auth;
-
-use App\Http\Controllers\Controller;
-use App\Providers\RouteServiceProvider;
-use App\Models\User;
-use Illuminate\Foundation\Auth\RegistersUsers;
-use Illuminate\Support\Facades\Hash;
-use Illuminate\Support\Facades\Validator;
-
-class RegisterController extends Controller
-{
-    /*
-    |--------------------------------------------------------------------------
-    | Register Controller
-    |--------------------------------------------------------------------------
-    |
-    | This controller handles the registration of new users as well as their
-    | validation and creation. By default this controller uses a trait to
-    | provide this functionality without requiring any additional code.
-    |
-    */
-
-    use RegistersUsers;
-
-    /**
-     * Where to redirect users after registration.
-     *
-     * @var string
-     */
-    protected $redirectTo = RouteServiceProvider::HOME;
-
-    /**
-     * Create a new controller instance.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        $this->middleware('guest');
-    }
-
-    /**
-     * Get a validator for an incoming registration request.
-     *
-     * @param  array  $data
-     * @return \Illuminate\Contracts\Validation\Validator
-     */
-    protected function validator(array $data)
-    {
-        return Validator::make($data, [
-	        'name' => ['required', 'string', 'min:3', 'max:255'],
-	        'email' => ['required', 'string', 'email', 'max:255', 'unique:users'],
-	        'password' => ['required', 'string', 'min:8', 'confirmed'],
-	        'token' => 'required|doorman:email',
-        ]);
-    }
-
-	/**
-	 * Create a new user instance after a valid registration.
-	 *
-	 * @param array $data
-	 * @return User
-	 */
-    protected function create(array $data): User
-    {
-        $fields = [
-            'name' => $data['name'],
-            'email' => $data['email'],
-            'password' => Hash::make($data['password']),
-        ];
-
-        if (config('auth.providers.users.field','email') === 'username' && isset($data['username'])) {
-            $fields['username'] = $data['username'];
-        }
-
-        try {
-            Doorman::redeem($data['token'],$data['email']);
-
-        // @todo Want to direct or display an appropriate error message (although the form validation does it anyway).
-        } catch (DoormanException $e) {
-            redirect('/error');
-            abort(403);
-        }
-
-        return User::create($fields);
-    }
-}

app/Http/Controllers/Auth/ResetPasswordController.php

@@ -3,9 +3,7 @@
 namespace App\Http\Controllers\Auth;
 
 use App\Http\Controllers\Controller;
-use App\Providers\RouteServiceProvider;
 use Illuminate\Foundation\Auth\ResetsPasswords;
-use Illuminate\Http\Request;
 
 class ResetPasswordController extends Controller
 {
@@ -27,22 +25,5 @@ class ResetPasswordController extends Controller
      *
      * @var string
      */
-    protected $redirectTo = RouteServiceProvider::HOME;
-
-	/**
-	 * Create a new controller instance.
-	 *
-	 * @return void
-	 */
-	public function __construct()
-	{
-		$this->middleware('guest');
-	}
-
-	public function showResetForm(Request $request, $token = null)
-	{
-		return view('adminlte::auth.passwords.reset')->with(
-			['token' => $token, 'email' => $request->email]
-		);
-	}
-}
+    protected $redirectTo = '/home';
+}

app/Http/Controllers/Auth/SocialLoginController.php

@@ -12,13 +12,13 @@ use Laravel\Socialite\Facades\Socialite;
 use App\Http\Controllers\Controller;
 use App\Mail\SocialLink;
 use App\Models\{ProviderOauth,ProviderToken,User,UserOauth};
-use App\Providers\RouteServiceProvider;
 
 class SocialLoginController extends Controller
 {
 	public function redirectToProvider($provider)
 	{
-		return Socialite::with($provider)->redirect();
+		return Socialite::with($provider)
+			->redirect();
 	}
 
 	public function handleProviderCallback($provider)
@@ -77,7 +77,8 @@ class SocialLoginController extends Controller
 			}
 		}
 
-		return redirect()->intended(RouteServiceProvider::HOME);
+		return redirect()
+			->intended('/home');
 	}
 
 	public function handleBearerTokenCallback($provider)
@@ -101,7 +102,7 @@ class SocialLoginController extends Controller
 		$po->tokens()->save($uoo);
 
 		return redirect()
-			->intended(RouteServiceProvider::HOME)
+			->intended('/home')
 			->with('success','Token refreshed.');
 	}
 
@@ -141,8 +142,9 @@ class SocialLoginController extends Controller
 
 		$aoo->user_id = $uo->id;
 		$aoo->save();
-		Auth::login($uo,FALSE);
+		Auth::login($uo);
 
-		return redirect()->intended(RouteServiceProvider::HOME);
+		return redirect()
+			->intended('/home');
 	}
 }

app/Http/Controllers/CheckoutController.php

@@ -33,7 +33,8 @@ class CheckoutController extends Controller
 			return redirect()->back()->withErrors($e->getMessage())->withInput();
 		}
 
-		return redirect()->back()
+		return redirect()
+			->back()
 			->with('success','Payment saved');
 	}
 
@@ -44,9 +45,10 @@ class CheckoutController extends Controller
 		}
 
 		if (! $request->session()->get('invoice.cart'))
-			return redirect()->to('u/home');
+			return redirect()
+				->to('u/home');
 
-		return View('u.invoice.cart')
+		return view('theme.backend.adminlte.u.invoice.cart')
 			->with('invoices',Invoice::find(array_values($request->session()->get('invoice.cart'))));
 	}
 
@@ -62,7 +64,7 @@ class CheckoutController extends Controller
 	 */
 	public function home(): View
 	{
-		return View('payment.home');
+		return view('theme.backend.adminlte.payment.home');
 	}
 
 	public function pay(Request $request,Checkout $o)
@@ -78,6 +80,6 @@ class CheckoutController extends Controller
 	 */
 	public function view(Checkout $o): View
 	{
-		return View('payment.view',['o'=>$o]);
+		return view('theme.backend.adminlte.payment.view',['o'=>$o]);
 	}
 }

app/Http/Controllers/Controller.php

@@ -3,11 +3,9 @@
 namespace App\Http\Controllers;
 
 use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
-use Illuminate\Foundation\Bus\DispatchesJobs;
 use Illuminate\Foundation\Validation\ValidatesRequests;
-use Illuminate\Routing\Controller as BaseController;
 
-class Controller extends BaseController
+abstract class Controller extends \Illuminate\Routing\Controller
 {
-    use AuthorizesRequests, DispatchesJobs, ValidatesRequests;
-}
+	use AuthorizesRequests, ValidatesRequests;
+}

app/Http/Controllers/HomeController.php

@@ -31,7 +31,8 @@ class HomeController extends Controller
 		if (! $o->exists)
 			$o = Auth::user();
 
-		return View('home',['o'=>$o]);
+		return view('theme.backend.adminlte.home')
+			->with(['o'=>$o]);
 	}
 
 	/**

app/Http/Controllers/InvoiceController.php

@@ -25,7 +25,8 @@ class InvoiceController extends Controller
 	 */
 	public function pdf(Invoice $o)
 	{
-		return PDF::loadView('u.invoice.home',['o'=>$o])->stream(sprintf('%s.pdf',$o->sid));
+		return PDF::loadView('theme.backend.adminlte.u.invoice.home',['o'=>$o])
+			->stream(sprintf('%s.pdf',$o->sid));
 	}
 
 	/**
@@ -36,6 +37,7 @@ class InvoiceController extends Controller
 	 */
 	public function view(Invoice $o): View
 	{
-		return View('invoice.view',['o'=>$o]);
+		return view('theme.backend.adminlte.invoice.view')
+			->with('o',$o);
 	}
 }

app/Http/Controllers/MediaController.php

@@ -1,27 +0,0 @@
-<?php
-
-namespace App\Http\Controllers;
-
-use Image;
-
-class MediaController extends Controller
-{
-	/**
-	 * Create a generic image
-	 *
-	 * @param        $width
-	 * @param        $height
-	 * @param string $color
-	 * @return mixed
-	 */
-	public function image($width,$height,$color='#ccc') {
-		$io = Image::canvas($width,$height,$color);
-		$io->text(sprintf('IMAGE-%sx%s',$width,$height),$width/2,$height/2,function($font) {
-			$font->file(5);
-			$font->align('center');
-			$font->valign('middle');
-		});
-
-		return $io->response();
-	}
-}

app/Http/Controllers/OrderController.php

@@ -3,7 +3,6 @@
 namespace App\Http\Controllers;
 
 use Illuminate\Http\Request;
-use Igaster\LaravelTheme\Facades\Theme;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Mail;
 use Illuminate\Support\Facades\Validator;
@@ -23,23 +22,21 @@ class OrderController extends Controller
 	// @todo To check
 	public function index()
 	{
-		return view('order.home');
+		return view('theme.backend.adminlte.order.home');
 	}
 
 	// @todo To check
 	public function product_order(Product $o)
 	{
-		Theme::set('metronic-fe');
-
-		return view('order.widget.order',['o'=>$o]);
+		return view('theme.backend.adminlte.order.widget.order')
+			->with('o',$o);
 	}
 
 	// @todo To check
 	public function product_info(Product $o)
 	{
-		Theme::set('metronic-fe');
-
-		return view('order.widget.info',['o'=>$o]);
+		return view('theme.backend.adminlte.order.widget.info')
+			->with('o',$o);
 	}
 
 	// @todo To check
@@ -122,9 +119,11 @@ class OrderController extends Controller
 			$order->save();
 		}
 
+		// @todo Move this email to a config item
 		Mail::to('help@graytech.net.au')
 			->queue((new OrderRequest($so,$request->input('options.notes') ?: ''))->onQueue('email')); //@todo Get email from DB.
 
-		return view('order_received',['o'=>$so]);
+		return view('theme.backend.adminlte.order_received')
+			->with('o',$so);
 	}
 }

app/Http/Controllers/ProductController.php

@@ -85,7 +85,7 @@ class ProductController extends Controller
 		if (! $o->exists && $request->name)
 			$o = Product::where('name',$request->name)->firstOrNew();
 
-		return view('product.details')
+		return view('theme.backend.adminlte.product.details')
 			->with('breadcrumb',collect(['Products'=>url('a/product')]))
 			->with('o',$o);
 	}
@@ -131,7 +131,8 @@ class ProductController extends Controller
 					],
 				]);
 
-		return redirect()->back()
+		return redirect()
+			->back()
 			->with('success','Product saved');
 	}
 
@@ -143,6 +144,6 @@ class ProductController extends Controller
 	 */
 	public function home()
 	{
-		return view('product.home');
+		return view('theme.backend.adminlte.product.home');
 	}
 }

app/Http/Controllers/SearchController.php

@@ -93,6 +93,8 @@ class SearchController extends Controller
 			}
 		}
 
-		return $result->sortBy(function($item) { return $item['category'].$item['name']; })->values();
+		return $result
+			->sortBy(function($item) { return $item['category'].$item['name']; })
+			->values();
 	}
 }

app/Http/Controllers/ServiceController.php

@@ -114,7 +114,7 @@ class ServiceController extends Controller
 			return redirect()->to(url('u/service',[$o->id]));
 		}
 
-		return view('service.change_pending')
+		return view('theme.backend.adminlte.service.change_pending')
 			->with('breadcrumb',collect()->merge($o->account->breadcrumb))
 			->with('o',$o)
 			->with('np',$np);
@@ -149,7 +149,7 @@ class ServiceController extends Controller
 			return redirect('u/service/'.$o->id)->with('success','Cancellation lodged');
 		}
 
-		return view('service.cancel_request')
+		return view('theme.backend.adminlte.service.cancel_request')
 			->with('o',$o);
 	}
 
@@ -258,7 +258,7 @@ class ServiceController extends Controller
 
 		switch (get_class($o->type)) {
 			default:
-				return view('service.change_request')
+				return view('theme.backend.adminlte.service.change_request')
 					->with('breadcrumb',collect()->merge($o->account->breadcrumb))
 					->with('o',$o);
 		}
@@ -279,7 +279,7 @@ class ServiceController extends Controller
 			->with(['service.account','registrar'])
 			->get();
 
-		return view('service.domain.list')
+		return view('theme.backend.adminlte.service.domain.list')
 			->with('o',$o);
 	}
 
@@ -293,7 +293,7 @@ class ServiceController extends Controller
 			->with(['service.account','service.product.type.supplied.supplier_detail.supplier','tld'])
 			->get();
 
-		return view('service.email.list')
+		return view('theme.backend.adminlte.service.email.list')
 			->with('o',$o);
 	}
 
@@ -305,7 +305,7 @@ class ServiceController extends Controller
 	 */
 	public function home(Service $o): View
 	{
-		return View('service.home')
+		return view('theme.backend.adminlte.service.home')
 			->with('breadcrumb',collect()->merge($o->account->breadcrumb))
 			->with('o',$o);
 	}
@@ -320,7 +320,7 @@ class ServiceController extends Controller
 			->with(['service.account','service.product.type.supplied.supplier_detail.supplier','tld'])
 			->get();
 
-		return view('service.host.list')
+		return view('theme.backend.adminlte.service.host.list')
 			->with('o',$o);
 	}
 
@@ -401,7 +401,7 @@ class ServiceController extends Controller
 	 */
 	public function service_change_charges_display(Request $request,Service $o)
 	{
-		return view('a.charge.service_change')
+		return view('theme.backend.adminlte.a.charge.service_change')
 			->with('charges',$this->service_change_charges($request,$o));
 	}
 

app/Http/Controllers/SupplierController.php

@@ -46,7 +46,8 @@ class SupplierController extends Controller
 		])->filter();
 		$o->detail()->save($oo);
 
-		return redirect()->back()
+		return redirect()
+			->back()
 			->with('success','Supplier Saved');
 	}
 
@@ -60,7 +61,7 @@ class SupplierController extends Controller
 	{
 		$this->middleware(['auth','wholesaler']);
 
-		return view('supplier.home');
+		return view('theme.backend.adminlte.supplier.home');
 	}
 
 	/**
@@ -72,12 +73,14 @@ class SupplierController extends Controller
 	public function cost(Cost $o)
 	{
 		// @todo Need to add the services that are active that are not on the bill for the supplier.
-		return view('supplier.cost.view',['o'=>$o]);
+		return view('theme.backend.adminlte.supplier.cost.view')
+			->with('o',$o);
 	}
 
 	public function cost_add(Supplier $o)
 	{
-		return view('supplier.cost.add',['o'=>$o]);
+		return view('theme.backend.adminlte.supplier.cost.add')
+			->with('o',$o);
 	}
 
 	public function cost_submit(Request $request,Supplier $o)
@@ -106,7 +109,7 @@ class SupplierController extends Controller
 	 */
 	public function product_add()
 	{
-		return view('supplier.product.addedit')
+		return view('theme.backend.adminlte.supplier.product.addedit')
 			->with('o',new Supplier)
 			->with('oo',NULL);
 	}
@@ -176,7 +179,7 @@ class SupplierController extends Controller
 		$oo = $o->detail->find($type,$id);
 		$oo->load(['products.product.services.product.type']);
 
-		return view('supplier.product.addedit')
+		return view('theme.backend.adminlte.supplier.product.addedit')
 			->with('o',$o)
 			->with('oo',$oo);
 	}
@@ -199,7 +202,7 @@ class SupplierController extends Controller
 		if ($o)
 			$o->load(['products.product.services']);
 
-		return view('supplier.product.widget.'.$type)
+		return view('theme.backend.adminlte.supplier.product.widget.'.$type)
 			->with('o',$id ? $o : NULL)
 			->withErrors($request->errors);
 	}
@@ -214,7 +217,7 @@ class SupplierController extends Controller
 	{
 		$this->middleware(['auth','wholesaler']);
 
-		return view('supplier.details')
+		return view('theme.backend.adminlte.supplier.details')
 			->with('o',$o);
 	}
 }

app/Http/Controllers/User/AccountController.php

@@ -38,6 +38,7 @@ class AccountController extends Controller
 					$io->items->push($o);
 		}
 
-		return View('u.invoice.home',['o'=>$io]);
+		return view('theme.backend.adminlte.u.invoice.home')
+			->with('o',$io);
 	}
 }

app/Http/Controllers/UserController.php

@@ -35,7 +35,9 @@ class UserController extends Controller
 			]
 		]);
 
-		return redirect()->back()->with('success','Supplier Added');
+		return redirect()
+			->back()
+			->with('success','Supplier Added');
 	}
 
 	/**
@@ -51,6 +53,8 @@ class UserController extends Controller
 
 		$o->suppliers()->detach([$so->id]);
 
-		return redirect()->back()->with('success','Supplier Deleted');
+		return redirect()
+			->back()
+			->with('success','Supplier Deleted');
 	}
 }

app/Http/Controllers/WelcomeController.php

@@ -1,13 +0,0 @@
-<?php
-
-namespace App\Http\Controllers;
-
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Log;
-
-class WelcomeController extends Controller
-{
-	public function home() {
-		return view('welcome.home');
-	}
-}

app/Http/Kernel.php

@@ -1,84 +0,0 @@
-<?php
-
-namespace App\Http;
-
-use Illuminate\Foundation\Http\Kernel as HttpKernel;
-
-class Kernel extends HttpKernel
-{
-    /**
-     * The application's global HTTP middleware stack.
-     *
-     * These middleware are run during every request to your application.
-     *
-     * @var array
-     */
-    protected $middleware = [
-        \App\Http\Middleware\CheckForMaintenanceMode::class,
-        \Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
-        \App\Http\Middleware\TrimStrings::class,
-        \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
-        \App\Http\Middleware\TrustProxies::class,
-        \App\Http\Middleware\SetSite::class,
-    ];
-
-    /**
-     * The application's route middleware groups.
-     *
-     * @var array
-     */
-    protected $middlewareGroups = [
-        'web' => [
-            \App\Http\Middleware\EncryptCookies::class,
-            \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
-            \Illuminate\Session\Middleware\StartSession::class,
-            // \Illuminate\Session\Middleware\AuthenticateSession::class,
-            \Illuminate\View\Middleware\ShareErrorsFromSession::class,
-            \App\Http\Middleware\VerifyCsrfToken::class,
-            \Illuminate\Routing\Middleware\SubstituteBindings::class,
-            \Laravel\Passport\Http\Middleware\CreateFreshApiToken::class,
-        ],
-
-        'api' => [
-            'throttle:60,1',
-            'bindings',
-        ],
-    ];
-
-    /**
-     * The application's route middleware.
-     *
-     * These middleware may be assigned to groups or used individually.
-     *
-     * @var array
-     */
-    protected $routeMiddleware = [
-        'auth' => \App\Http\Middleware\Authenticate::class,
-        'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
-        'bindings' => \Illuminate\Routing\Middleware\SubstituteBindings::class,
-        'cache.headers' => \Illuminate\Http\Middleware\SetCacheHeaders::class,
-        'can' => \Illuminate\Auth\Middleware\Authorize::class,
-        'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class,
-        'role' => \App\Http\Middleware\Role::class,
-        'signed' => \Illuminate\Routing\Middleware\ValidateSignature::class,
-        'theme' => \Igaster\LaravelTheme\Middleware\setTheme::class,
-        'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
-        'verified' => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class,
-    ];
-
-    /**
-     * The priority-sorted list of middleware.
-     *
-     * This forces non-global middleware to always be in the given order.
-     *
-     * @var array
-     */
-    protected $middlewarePriority = [
-        \Illuminate\Session\Middleware\StartSession::class,
-        \Illuminate\View\Middleware\ShareErrorsFromSession::class,
-        \App\Http\Middleware\Authenticate::class,
-        \Illuminate\Session\Middleware\AuthenticateSession::class,
-        \Illuminate\Routing\Middleware\SubstituteBindings::class,
-        \Illuminate\Auth\Middleware\Authorize::class,
-    ];
-}

app/Http/Middleware/Authenticate.php

@@ -1,21 +0,0 @@
-<?php
-
-namespace App\Http\Middleware;
-
-use Illuminate\Auth\Middleware\Authenticate as Middleware;
-
-class Authenticate extends Middleware
-{
-    /**
-     * Get the path the user should be redirected to when they are not authenticated.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return string
-     */
-    protected function redirectTo($request)
-    {
-        if (! $request->expectsJson()) {
-            return route('login');
-        }
-    }
-}

app/Http/Middleware/CheckForMaintenanceMode.php

@@ -1,17 +0,0 @@
-<?php
-
-namespace App\Http\Middleware;
-
-use Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode as Middleware;
-
-class CheckForMaintenanceMode extends Middleware
-{
-    /**
-     * The URIs that should be reachable while maintenance mode is enabled.
-     *
-     * @var array
-     */
-    protected $except = [
-        //
-    ];
-}

app/Http/Middleware/EncryptCookies.php

@@ -1,17 +0,0 @@
-<?php
-
-namespace App\Http\Middleware;
-
-use Illuminate\Cookie\Middleware\EncryptCookies as Middleware;
-
-class EncryptCookies extends Middleware
-{
-    /**
-     * The names of the cookies that should not be encrypted.
-     *
-     * @var array
-     */
-    protected $except = [
-        'toggleState',
-    ];
-}

app/Http/Middleware/RedirectIfAuthenticated.php

@@ -1,26 +0,0 @@
-<?php
-
-namespace App\Http\Middleware;
-
-use Closure;
-use Illuminate\Support\Facades\Auth;
-
-class RedirectIfAuthenticated
-{
-    /**
-     * Handle an incoming request.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  \Closure  $next
-     * @param  string|null  $guard
-     * @return mixed
-     */
-    public function handle($request, Closure $next, $guard = null)
-    {
-        if (Auth::guard($guard)->check()) {
-            return redirect('/home');
-        }
-
-        return $next($request);
-    }
-}

app/Http/Middleware/Role.php

@@ -2,6 +2,7 @@
 
 namespace App\Http\Middleware;
 
+use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Closure;
 
@@ -10,7 +11,7 @@ use Closure;
  */
 class Role
 {
-	public function handle($request, Closure $next, $role)
+	public function handle(Request $request, Closure $next, string $role)
 	{
 		if ($role AND ! Auth::user())
 			abort(403,'Not Authenticated');

app/Http/Middleware/SetSite.php

@@ -2,6 +2,7 @@
 
 namespace App\Http\Middleware;
 
+use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Schema;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\View;
@@ -18,13 +19,11 @@ use App\Models\Site;
 class SetSite
 {
 	/**
-	 * 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)
 	{
 		$so = new Site;
 

app/Http/Middleware/TrimStrings.php

@@ -1,18 +0,0 @@
-<?php
-
-namespace App\Http\Middleware;
-
-use Illuminate\Foundation\Http\Middleware\TrimStrings as Middleware;
-
-class TrimStrings extends Middleware
-{
-    /**
-     * The names of the attributes that should not be trimmed.
-     *
-     * @var array
-     */
-    protected $except = [
-        'password',
-        'password_confirmation',
-    ];
-}

app/Http/Middleware/TrustProxies.php

@@ -1,28 +0,0 @@
-<?php
-
-namespace App\Http\Middleware;
-
-use Illuminate\Http\Request;
-use Illuminate\Http\Middleware\TrustProxies as Middleware;
-
-class TrustProxies extends Middleware
-{
-    /**
-     * The trusted proxies for this application.
-     *
-     * @var array
-     */
-    protected $proxies;
-
-    /**
-     * The headers that should be used to detect proxies.
-     *
-     * @var int
-     */
-	protected $headers =
-		Request::HEADER_X_FORWARDED_FOR |
-		Request::HEADER_X_FORWARDED_HOST |
-		Request::HEADER_X_FORWARDED_PORT |
-		Request::HEADER_X_FORWARDED_PROTO |
-		Request::HEADER_X_FORWARDED_AWS_ELB;
-}

app/Http/Middleware/VerifyCsrfToken.php

@@ -1,24 +0,0 @@
-<?php
-
-namespace App\Http\Middleware;
-
-use Illuminate\Foundation\Http\Middleware\VerifyCsrfToken as Middleware;
-
-class VerifyCsrfToken extends Middleware
-{
-    /**
-     * Indicates whether the XSRF-TOKEN cookie should be set on the response.
-     *
-     * @var bool
-     */
-    protected $addHttpCookie = true;
-
-    /**
-     * The URIs that should be excluded from CSRF verification.
-     *
-     * @var array
-     */
-    protected $except = [
-        //
-    ];
-}